diff --git a/AGENTS.md b/AGENTS.md
index b94ffe9a..814533cf 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -801,6 +801,15 @@ SPEC coverage: `SPEC/COMARK/component-nested-*-outdented.md`,
`SPEC/COMARK/component-nested-codeblock-indented.md`,
`SPEC/COMARK/codeblock-indented-content.md`.
+**Closing fences.** `comark_block` scans ahead for its closing `::` and skips
+code fences on the way. As in CommonMark, a closing fence may sit at most 3
+spaces right of its container: the innermost component still open at the
+opening fence, but never right of that fence. A deeper fence line is code
+content, so a `::` after it does not close the component. `autoCloseMarkdown`
+follows the same rule. SPEC coverage: `SPEC/COMARK/component-*codeblock-indented-fence.md`,
+`SPEC/COMARK/component-codeblock-closing-fence-indent.md`,
+`SPEC/COMARK/component-codeblock-indented-opener.md`.
+
## Embedded HTML
Contract: `packages/comark/SPEC/HTML/README.md`. HTML nodes carry
diff --git a/packages/comark/SPEC/COMARK/component-codeblock-closing-fence-indent.md b/packages/comark/SPEC/COMARK/component-codeblock-closing-fence-indent.md
new file mode 100644
index 00000000..f52f0bd3
--- /dev/null
+++ b/packages/comark/SPEC/COMARK/component-codeblock-closing-fence-indent.md
@@ -0,0 +1,138 @@
+## Input
+
+```md
+::box
+```js
+a
+ ```
+```js
+b
+ ```
+```js
+c
+ ```
+ :::inner
+ ```js
+ d
+ ```
+ :::
+::
+
+After
+```
+
+## AST
+
+```json
+{
+ "frontmatter": {},
+ "meta": {},
+ "nodes": [
+ [
+ "box",
+ {},
+ [
+ "pre",
+ {
+ "language": "js"
+ },
+ [
+ "code",
+ {
+ "class": "language-js"
+ },
+ "a"
+ ]
+ ],
+ [
+ "pre",
+ {
+ "language": "js"
+ },
+ [
+ "code",
+ {
+ "class": "language-js"
+ },
+ "b"
+ ]
+ ],
+ [
+ "pre",
+ {
+ "language": "js"
+ },
+ [
+ "code",
+ {
+ "class": "language-js"
+ },
+ "c"
+ ]
+ ],
+ [
+ "inner",
+ {},
+ [
+ "pre",
+ {
+ "language": "js"
+ },
+ [
+ "code",
+ {
+ "class": "language-js"
+ },
+ "d"
+ ]
+ ]
+ ]
+ ],
+ [
+ "p",
+ {},
+ "After"
+ ]
+ ]
+}
+```
+
+## HTML
+
+```html
+
+ a
+ b
+ c
+ d
After
+``` + +## Markdown + +```md +::box +```js +a +``` + +```js +b +``` + +```js +c +``` + + :::inner + ```js + d + ``` + ::: +:: + +After +``` diff --git a/packages/comark/SPEC/COMARK/component-codeblock-indented-fence.md b/packages/comark/SPEC/COMARK/component-codeblock-indented-fence.md new file mode 100644 index 00000000..7b4f4f80 --- /dev/null +++ b/packages/comark/SPEC/COMARK/component-codeblock-indented-fence.md @@ -0,0 +1,77 @@ +## Input + +```md +::box +```mdc +::a + ```js + x + ``` +:: +``` +:: + +After +``` + +## AST + +```json +{ + "frontmatter": {}, + "meta": {}, + "nodes": [ + [ + "box", + {}, + [ + "pre", + { + "language": "mdc" + }, + [ + "code", + { + "class": "language-mdc" + }, + "::a\n ```js\n x\n ```\n::" + ] + ] + ], + [ + "p", + {}, + "After" + ] + ] +} +``` + +## HTML + +```html +::a
+ ```js
+ x
+ ```
+ ::
+After
+``` + +## Markdown + +```md +::box +```mdc +::a + ```js + x + ``` +:: +``` +:: + +After +``` diff --git a/packages/comark/SPEC/COMARK/component-codeblock-indented-opener.md b/packages/comark/SPEC/COMARK/component-codeblock-indented-opener.md new file mode 100644 index 00000000..10d8bb85 --- /dev/null +++ b/packages/comark/SPEC/COMARK/component-codeblock-indented-opener.md @@ -0,0 +1,74 @@ +## Input + +```md +::box + ```md + - item + ```js + x + ``` + ``` +:: + +After +``` + +## AST + +```json +{ + "frontmatter": {}, + "meta": {}, + "nodes": [ + [ + "box", + {}, + [ + "pre", + { + "language": "md" + }, + [ + "code", + { + "class": "language-md" + }, + "- item\n ```js\n x\n ```" + ] + ] + ], + [ + "p", + {}, + "After" + ] + ] +} +``` + +## HTML + +```html +- item
+ ```js
+ x
+ ```
+After
+``` + +## Markdown + +```md +::box +~~~md +- item + ```js + x + ``` +~~~ +:: + +After +``` diff --git a/packages/comark/SPEC/COMARK/component-nested-codeblock-indented-fence.md b/packages/comark/SPEC/COMARK/component-nested-codeblock-indented-fence.md new file mode 100644 index 00000000..4735aeb4 --- /dev/null +++ b/packages/comark/SPEC/COMARK/component-nested-codeblock-indented-fence.md @@ -0,0 +1,99 @@ +## Input + +```md +::code-preview + :::tabs + ::::tabs-item{label="Code"} + ```mdc + ::a + ```js + x + ``` + :: + ``` + :::: + ::: +:: + +After +``` + +## AST + +```json +{ + "frontmatter": {}, + "meta": {}, + "nodes": [ + [ + "code-preview", + {}, + [ + "tabs", + {}, + [ + "tabs-item", + { + "label": "Code" + }, + [ + "pre", + { + "language": "mdc" + }, + [ + "code", + { + "class": "language-mdc" + }, + "::a\n ```js\n x\n ```\n::" + ] + ] + ] + ] + ], + [ + "p", + {}, + "After" + ] + ] +} +``` + +## HTML + +```html +::a
+ ```js
+ x
+ ```
+ ::
+ After
+``` + +## Markdown + +```md +::code-preview + :::tabs + ::::tabs-item{label="Code"} + ```mdc + ::a + ```js + x + ``` + :: + ``` + :::: + ::: +:: + +After +``` diff --git a/packages/comark/SPEC/COMARK/component-slot-codeblock-indented-fence.md b/packages/comark/SPEC/COMARK/component-slot-codeblock-indented-fence.md new file mode 100644 index 00000000..2cc70494 --- /dev/null +++ b/packages/comark/SPEC/COMARK/component-slot-codeblock-indented-fence.md @@ -0,0 +1,87 @@ +## Input + +```md +::component +#code +```mdc +::a + ```js + x + ``` +:: +``` +:: + +After +``` + +## AST + +```json +{ + "frontmatter": {}, + "meta": {}, + "nodes": [ + [ + "component", + {}, + [ + "template", + { + "name": "code" + }, + [ + "pre", + { + "language": "mdc" + }, + [ + "code", + { + "class": "language-mdc" + }, + "::a\n ```js\n x\n ```\n::" + ] + ] + ] + ], + [ + "p", + {}, + "After" + ] + ] +} +``` + +## HTML + +```html +::a
+ ```js
+ x
+ ```
+ ::
+
+After
+``` + +## Markdown + +```md +::component +#code +```mdc +::a + ```js + x + ``` +:: +``` +:: + +After +``` diff --git a/packages/comark/SPEC/auto-close.md b/packages/comark/SPEC/auto-close.md index 156e0254..3a149797 100644 --- a/packages/comark/SPEC/auto-close.md +++ b/packages/comark/SPEC/auto-close.md @@ -2337,6 +2337,18 @@ A shorter or different marker is not a closer either: + ```\ncode\n~~~\n**bold ``` +A closer indented 4 or more spaces is code content; up to 3 spaces still closes: + +```diff +- ```\ncode\n ```\n**bold ++ ```\ncode\n ```\n**bold +``` + +```diff +- ```\ncode\n ```\n**bold ++ ```\ncode\n ```\n**bold** +``` + --- ## Leave horizontal rules alone diff --git a/packages/comark/src/auto-close.ts b/packages/comark/src/auto-close.ts index c4cd74f5..8791fd57 100644 --- a/packages/comark/src/auto-close.ts +++ b/packages/comark/src/auto-close.ts @@ -204,6 +204,7 @@ function scanBlocks(src: string, o: Opts): DocState { const comps: Component[] = [] let fenceLen = 0 let fenceCh = 0 + let fenceIndent = 0 // a closer must stay within 3 spaces of this column (its container's) let raw: RawTag | null = null let fmOpen = false let fmContent = false @@ -242,10 +243,12 @@ function scanBlocks(src: string, o: Opts): DocState { if (!(c0 === 96 && isIncompleteInlineFence(src, st, en))) { fenceLen = run fenceCh = c0 + // The container is the innermost open component, never right of the fence itself. + fenceIndent = Math.min(comps.length > 0 ? comps[comps.length - 1].indent.length : 0, st - ls) shielded = i continue } - } else if (c0 === fenceCh && run >= fenceLen && st + run === en) { + } else if (c0 === fenceCh && run >= fenceLen && st + run === en && st - ls - fenceIndent < 4) { // A closer is the same character, at least as long, and followed only by // whitespace. `` ```js `` inside an open block is code content, not a closer. fenceLen = 0 diff --git a/packages/comark/src/plugins/components.ts b/packages/comark/src/plugins/components.ts index f57df3db..589b73e6 100644 --- a/packages/comark/src/plugins/components.ts +++ b/packages/comark/src/plugins/components.ts @@ -105,9 +105,11 @@ const markdownItComarkBlock: PluginSimple = (md) => { let inCodeFence = false let codeFenceCharCode = 0 let codeFenceCount = 0 + // A closing fence must sit within 3 spaces of this column (CommonMark container indent). + let codeFenceIndent = 0 - // Track nesting depth for blocks with the same marker count - let nestingDepth = 0 + // Nested components still open, as `[markerCount, indent]`. + const openComponents: Array<[number, number]> = [] if (state.src[start] !== ':') return false @@ -155,7 +157,7 @@ const markdownItComarkBlock: PluginSimple = (md) => { // Detect closing code fence (``` or ~~~) if (inCodeFence) { - if (lineCharCode === codeFenceCharCode) { + if (lineCharCode === codeFenceCharCode && state.sCount[nextLine] - codeFenceIndent < 4) { let fencePos = start + 1 while (fencePos < max && state.src.charCodeAt(fencePos) === codeFenceCharCode) fencePos++ if (fencePos - start >= codeFenceCount) { @@ -175,6 +177,9 @@ const markdownItComarkBlock: PluginSimple = (md) => { codeFenceCharCode = lineCharCode codeFenceCount = fencePos - start codeFenceShift = childShifts[childShifts.length - 1] + // The fence's container is the innermost open component, never right of the fence itself. + const containerIndent = openComponents.length ? openComponents[openComponents.length - 1][1] : indent + codeFenceIndent = Math.min(containerIndent, state.sCount[nextLine]) continue } } @@ -185,22 +190,26 @@ const markdownItComarkBlock: PluginSimple = (md) => { if (marker_str !== state.src[pos]) break } - // Closing fence must match the opening fence length - if (pos - start !== marker_count) continue - + const count = pos - start pos = state.skipSpaces(pos) if (pos < max) { - // A new nested block opens with same marker count - nestingDepth++ + // A nested block opens + if (count >= min_markers) openComponents.push([count, state.sCount[nextLine]]) continue } - if (nestingDepth > 0) { - nestingDepth-- + // A bare marker closes the innermost open nested block with the same length, and any left open inside it + let open = openComponents.length - 1 + while (open >= 0 && openComponents[open][0] !== count) open-- + if (open >= 0) { + openComponents.length = open continue } + // Closing fence must match the opening fence length + if (count !== marker_count) continue + auto_closed = true break } diff --git a/packages/comark/test/auto-close.test.ts b/packages/comark/test/auto-close.test.ts index af46be61..8da58d4a 100644 --- a/packages/comark/test/auto-close.test.ts +++ b/packages/comark/test/auto-close.test.ts @@ -220,6 +220,18 @@ describe('autoCloseMarkdown - Comark Components', () => { expect(autoCloseMarkdown(input)).toBe(expected) }) + it('measures a closing code fence against its innermost component', () => { + // 4+ spaces past the component is code content: `**bold` stays code and only `::box` gets closed. + expect(autoCloseMarkdown('::box\n```\n::a\n ```\n::\n**bold')).toBe('::box\n```\n::a\n ```\n::\n**bold\n::') + // The children of `::box` sit at column 0, even when the fence itself is indented. + const indentedFence = '::box\n ```md\n ```js\n ```\n ```\n::' + expect(autoCloseMarkdown(indentedFence)).toBe(indentedFence) + // Within 3 spaces of `:::inner` still closes. + expect(autoCloseMarkdown('::box\n :::inner\n ```\n x\n ```\n :::\n::\n**bold')).toBe( + '::box\n :::inner\n ```\n x\n ```\n :::\n::\n**bold**' + ) + }) + it('should not add closing markers to empty content', () => { const input = '' expect(autoCloseMarkdown(input)).toBe(input) diff --git a/test/bundle.test.ts b/test/bundle.test.ts index aac8fcb8..5dfaa94e 100644 --- a/test/bundle.test.ts +++ b/test/bundle.test.ts @@ -77,7 +77,7 @@ describe('package bundle size', { timeout: 60_000 }, () => { "@comark/react": "42.9k (83 files)", "@comark/svelte": "50.3k (91 files)", "@comark/vue": "62.6k (89 files)", - "comark": "440k (171 files)", + "comark": "441k (171 files)", } `) })