@tanstack/markdown 0.0.13 → 0.0.14

package/dist/inline.js

@@ -1,7 +1,6 @@
-import { footnoteId, normalizeReferenceLabel, sanitizeUrl } from './utils.js';
+import { footnoteId, normalizeReferenceLabel, parseDestination, plainText, sanitizeUrl } from './utils.js';
 export function parseInline(value, options = {}) {
-    const nodes = parseInlineRaw(value, options);
-    let result = mergeText(nodes);
+    let result = parseInlineRaw(value, options);
     for (const extension of options.extensions ?? []) {
         result = extension.transformInline?.(result, { options }) ?? result;
     }
@@ -9,7 +8,8 @@ export function parseInline(value, options = {}) {
 }
 const maxInlineDepth = 32;
 const scansPerCharacter = 16;
-function parseInlineRaw(value, options, budget = { scans: Math.max(value.length * scansPerCharacter, 1024), depth: 0 }) {
+const inlineMarker = /[\\`!\[_*~<]/g;
+function parseInlineRaw(value, options, budget = { scans: Math.max(value.length * scansPerCharacter, 1024), depth: 0, links: 0 }) {
     if (budget.depth >= maxInlineDepth)
         return value ? [{ type: 'text', value }] : [];
     budget.depth++;
@@ -32,7 +32,7 @@ function parseInlineRaw(value, options, budget = { scans: Math.max(value.length
                 index += 2;
                 continue;
             }
-            if (next && /[\\`*_[\]{}()#+\-.!|~<>]/.test(next)) {
+            if (next && /[!-/:-@\[-`{-~]/.test(next)) {
                 text += next;
                 index += 2;
                 continue;
@@ -45,7 +45,8 @@ function parseInlineRaw(value, options, budget = { scans: Math.max(value.length
                 pushText();
                 nodes.push({
                     type: 'inlineCode',
-                    value: value.slice(index + tickCount, close).replace(/\s+/g, ' ').trim(),
+                    // Strip one padding space at each end, except in an all-space span.
+                    value: value.slice(index + tickCount, close).replace(/\n/g, ' ').replace(/^ (?! *$)(.*) $/s, '$1'),
                 });
                 index = close + tickCount;
                 continue;
@@ -54,44 +55,44 @@ function parseInlineRaw(value, options, budget = { scans: Math.max(value.length
             index += tickCount;
             continue;
         }
-        if (char === '!' && next === '[') {
-            const parsed = parseLinkish(value, index + 1, options, budget);
-            if (parsed) {
-                pushText();
-                nodes.push({
-                    type: 'image',
-                    src: sanitizeUrl(parsed.href),
-                    alt: textFromMarkdown(parsed.label, budget),
-                    ...(parsed.title ? { title: parsed.title } : {}),
-                });
-                index = parsed.end;
-                continue;
-            }
-        }
-        if (char === '[') {
-            const footnote = parseFootnoteReference(value, index, options, budget);
+        if (char === '[' || (char === '!' && next === '[')) {
+            const image = char === '!';
+            const footnote = next === '^' && parseFootnoteReference(value, index, options, budget);
             if (footnote) {
                 pushText();
                 nodes.push(footnote.node);
+                budget.links++;
                 index = footnote.end;
                 continue;
             }
-            const parsed = parseLinkish(value, index, options, budget);
+            const parsed = parseLinkish(value, index + Number(image), options, budget);
             if (parsed) {
+                const links = budget.links;
+                const children = parseInlineRaw(parsed.label, image ? (options.references ? { references: options.references } : {}) : options, budget);
+                const nested = !image && budget.links !== links;
                 const href = sanitizeUrl(parsed.href);
-                pushText();
-                if (href) {
+                if (image || (!nested && (href || !parsed.href))) {
+                    pushText();
                     nodes.push({
-                        type: 'link',
-                        href,
+                        ...(image ? { type: 'image', src: href, alt: plainText(children) } : { type: 'link', href, children }),
                         ...(parsed.title ? { title: parsed.title } : {}),
-                        children: parseInlineRaw(parsed.label, options, budget),
                     });
                 }
                 else {
-                    nodes.push(...parseInlineRaw(parsed.label, options, budget));
+                    if (nested)
+                        text += '[';
+                    for (const child of children) {
+                        if (child.type === 'text')
+                            text += child.value;
+                        else {
+                            pushText();
+                            nodes.push(child);
+                        }
+                    }
                 }
-                index = parsed.end;
+                // An inner link disables its outer opener, but not the trailing markup.
+                budget.links = image ? links : budget.links + 1;
+                index = nested ? index + parsed.label.length + 1 : parsed.end;
                 continue;
             }
         }
@@ -107,65 +108,28 @@ function parseInlineRaw(value, options, budget = { scans: Math.max(value.length
                 continue;
             }
         }
-        if ((char === '*' && next === '*') || (char === '_' && next === '_')) {
-            const close = char === '_' && !canUseUnderscore(value, index, 2, true) ? -1 : findDelimiter(value, index + 2, char + char, budget);
-            if (close !== -1) {
-                pushText();
-                nodes.push({
-                    type: 'strong',
-                    children: parseInlineRaw(value.slice(index + 2, close), options, budget),
-                });
-                index = close + 2;
-                continue;
-            }
-            text += char + next;
-            index += 2;
-            continue;
-        }
         if (char === '~' && next === '~' && value[index + 2] === '~') {
             const run = countRun(value, index, '~');
             text += value.slice(index, index + run);
             index += run;
             continue;
         }
-        if (char === '~' && next === '~') {
-            const close = findDelimiter(value, index + 2, '~~', budget);
-            if (close !== -1) {
-                pushText();
-                nodes.push({
-                    type: 'strike',
-                    children: parseInlineRaw(value.slice(index + 2, close), options, budget),
-                });
-                index = close + 2;
-                continue;
-            }
-            text += '~~';
-            index += 2;
-            continue;
-        }
-        if (char === '~') {
-            const close = findSingleTildeDelimiter(value, index + 1, budget);
+        if (char === '*' || char === '_' || char === '~') {
+            const size = next === char ? 2 : 1;
+            const close = char === '_' && !canUseUnderscore(value, index, size, true) ? -1 : findDelimiter(value, index + size, char.repeat(size), budget);
             if (close !== -1) {
                 pushText();
                 nodes.push({
-                    type: 'strike',
-                    children: parseInlineRaw(value.slice(index + 1, close), options, budget),
+                    type: char === '~' ? 'strike' : size === 2 ? 'strong' : 'emphasis',
+                    children: parseInlineRaw(value.slice(index + size, close), options, budget),
                 });
-                index = close + 1;
-                continue;
+                index = close + size;
             }
-        }
-        if (char === '*' || char === '_') {
-            const close = char === '_' && !canUseUnderscore(value, index, 1, true) ? -1 : findDelimiter(value, index + 1, char, budget);
-            if (close !== -1) {
-                pushText();
-                nodes.push({
-                    type: 'emphasis',
-                    children: parseInlineRaw(value.slice(index + 1, close), options, budget),
-                });
-                index = close + 1;
-                continue;
+            else {
+                text += char.repeat(size);
+                index += size;
             }
+            continue;
         }
         if (char === '<' && options.allowHtml) {
             const close = findCharacter(value, index + 1, '>', budget);
@@ -176,16 +140,17 @@ function parseInlineRaw(value, options, budget = { scans: Math.max(value.length
                 continue;
             }
         }
-        text += char;
-        index++;
+        // Reset after recursive parsing; exhausted budgets still allow escapes.
+        inlineMarker.lastIndex = index + 1;
+        const end = budget.scans > 0 ? inlineMarker.exec(value)?.index ?? value.length : value.indexOf('\\', index + 1);
+        text += value.slice(index, end < 0 ? value.length : end);
+        index = end < 0 ? value.length : end;
     }
     pushText();
     budget.depth--;
     return nodes;
 }
 function parseFootnoteReference(value, open, options, budget) {
-    if (value[open + 1] !== '^')
-        return undefined;
     const close = findCharacter(value, open + 2, ']', budget);
     if (close === -1)
         return undefined;
@@ -194,19 +159,17 @@ function parseFootnoteReference(value, open, options, budget) {
     const definition = options.footnotes?.[key];
     if (!definition || !options.footnoteOrder)
         return undefined;
-    let orderIndex = options.footnoteOrder.indexOf(key);
-    if (orderIndex === -1) {
-        options.footnoteOrder.push(key);
-        orderIndex = options.footnoteOrder.length - 1;
-    }
+    let number = options.footnoteOrder.indexOf(key) + 1;
+    if (!number)
+        number = options.footnoteOrder.push(key);
     const referenceIndex = (options.footnoteCounts?.[key] ?? 0) + 1;
     if (options.footnoteCounts)
         options.footnoteCounts[key] = referenceIndex;
     return {
         node: {
             type: 'footnoteReference',
-            id: definition.id ?? (footnoteId(definition.label) || 'footnote'),
-            number: orderIndex + 1,
+            id: definition.id ?? footnoteId(definition.label),
+            number,
             ...(referenceIndex > 1 ? { referenceIndex } : {}),
         },
         end: close + 1,
@@ -217,72 +180,49 @@ function parseLinkish(value, open, options, budget) {
     if (closeBracket === -1)
         return undefined;
     const label = value.slice(open + 1, closeBracket);
-    if (value[closeBracket + 1] === '(') {
-        const closeParen = findBalanced(value, closeBracket + 1, '(', ')', budget);
+    let end = closeBracket + 1;
+    let definition;
+    if (value[end] === '(') {
+        const closeParen = findBalanced(value, end, '(', ')', budget);
         if (closeParen === -1)
             return undefined;
-        const destination = value.slice(closeBracket + 2, closeParen).trim();
-        const parsed = parseDestination(destination);
-        if (!parsed)
-            return undefined;
-        return {
-            label,
-            href: parsed.href,
-            ...(parsed.title ? { title: parsed.title } : {}),
-            end: closeParen + 1,
-        };
+        definition = parseDestination(value.slice(end + 1, closeParen).trim());
+        end = closeParen + 1;
     }
-    if (value[closeBracket + 1] === '[') {
-        const closeReference = findBalanced(value, closeBracket + 1, '[', ']', budget);
+    else if (value[end] === '[') {
+        const closeReference = findBalanced(value, end, '[', ']', budget);
         if (closeReference === -1)
             return undefined;
-        const referenceLabel = value.slice(closeBracket + 2, closeReference);
-        const definition = options.references?.[normalizeReferenceLabel(referenceLabel || label)];
-        if (!definition)
-            return undefined;
-        return {
-            label,
-            href: definition.href,
-            ...(definition.title ? { title: definition.title } : {}),
-            end: closeReference + 1,
-        };
+        definition = options.references?.[normalizeReferenceLabel(value.slice(end + 1, closeReference) || label)];
+        end = closeReference + 1;
+    }
+    else {
+        definition = options.references?.[normalizeReferenceLabel(label)];
     }
-    const definition = options.references?.[normalizeReferenceLabel(label)];
     if (definition) {
         return {
+            ...definition,
             label,
-            href: definition.href,
-            ...(definition.title ? { title: definition.title } : {}),
-            end: closeBracket + 1,
+            end,
         };
     }
     return undefined;
 }
 function isInlineHtml(value) {
-    if (/^<!--(?:[\s\S]*--|-?)>$/.test(value))
-        return true;
-    if (/^<\?[\s\S]*\?>$/.test(value) || /^<![A-Z][\s\S]*>$/.test(value) || /^<!\[CDATA\[[\s\S]*\]\]>$/.test(value))
-        return true;
-    if (/^<\/[A-Za-z][\w:-]*\s*>$/.test(value))
-        return true;
-    return /^<[A-Za-z][\w:-]*(?:\s+[A-Za-z_:][\w:.-]*(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?)*\s*\/?>$/.test(value);
-}
-function parseDestination(value) {
-    const match = value.match(/^(\S+)(?:\s+["']([^"']*)["'])?$/);
-    if (!match)
-        return { href: value };
-    return {
-        href: match[1].replace(/^<|>$/g, ''),
-        ...(match[2] ? { title: match[2] } : {}),
-    };
+    return /^<(?:!--(?:[\s\S]*--|-?)|\?[\s\S]*\?|![A-Z][\s\S]*|!\[CDATA\[[\s\S]*\]\]|\/[A-Za-z][\w:-]*\s*|[A-Za-z][\w:-]*(?:\s+[A-Za-z_:][\w:.-]*(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?)*\s*\/?)>$/.test(value);
 }
 function findBalanced(value, openIndex, open, close, budget) {
+    // Reject missing closers with a native search, charging the same shared budget.
+    if (findCharacter(value, openIndex + 1, close, budget) === -1)
+        return -1;
     let depth = 0;
     for (let index = openIndex; index < value.length; index++) {
-        if (!takeScan(budget))
+        if (--budget.scans < 0)
             return -1;
-        if (value[index - 1] === '\\')
+        if (value[index] === '\\') {
+            index++;
             continue;
+        }
         if (value[index] === open)
             depth++;
         if (value[index] === close) {
@@ -296,110 +236,63 @@ function findBalanced(value, openIndex, open, close, budget) {
 function countRun(value, index, char, budget) {
     let count = 0;
     while (value[index + count] === char) {
-        if (budget && !takeScan(budget))
+        if (budget && --budget.scans < 0)
             break;
         count++;
     }
     return count;
 }
 function findClosingRun(value, start, char, count, budget) {
-    for (let index = start; index < value.length; index++) {
-        if (!takeScan(budget))
-            return -1;
-        if (value[index] !== char)
-            continue;
-        if (countRun(value, index, char, budget) >= count)
+    let index = start;
+    while ((index = findCharacter(value, index, char, budget)) !== -1) {
+        const size = countRun(value, index, char, budget);
+        if (size === count)
             return index;
+        index += size;
     }
     return -1;
 }
 function findDelimiter(value, start, delimiter, budget) {
+    if (delimiter === '~' && /[\s\d]/.test(value[start] ?? ''))
+        return -1;
     for (let index = start; index < value.length; index++) {
-        if (!takeScan(budget))
+        if (--budget.scans < 0)
             return -1;
-        if (value[index - 1] === '\\')
+        if (value[index] === '\\') {
+            index++;
             continue;
+        }
         if (!value.startsWith(delimiter, index))
             continue;
-        if (value[index + 1] === delimiter) {
-            const close = findDelimiter(value, index + 2, delimiter + delimiter, budget);
-            if (close > index + 2) {
-                index = close + 1;
+        if (delimiter[0] === '~') {
+            if (value[index - 1] === '~' || value[index + delimiter.length] === '~')
+                continue;
+            if (delimiter === '~' && /\s/.test(value[index - 1] ?? ''))
+                return -1;
+        }
+        else if (value[index + 1] === delimiter) {
+            const size = countRun(value, index, delimiter, budget);
+            const close = findDelimiter(value, index + size, delimiter.repeat(size), budget);
+            if (close > index + size) {
+                index = close + size - 1;
                 continue;
             }
         }
-        if (delimiter === '~~' && (value[index - 1] === '~' || value[index + 2] === '~'))
-            continue;
         if (delimiter[0] === '_' && !canUseUnderscore(value, index, delimiter.length, false))
             continue;
         return index;
     }
     return -1;
 }
-function findSingleTildeDelimiter(value, start, budget) {
-    if (isWhitespace(value[start] ?? '') || /\d/.test(value[start] ?? ''))
-        return -1;
-    for (let index = start; index < value.length; index++) {
-        if (!takeScan(budget))
-            return -1;
-        if (value[index - 1] === '\\')
-            continue;
-        if (value[index] !== '~')
-            continue;
-        if (value[index - 1] === '~')
-            continue;
-        if (value[index + 1] === '~')
-            continue;
-        if (isWhitespace(value[index - 1] ?? ''))
-            return -1;
-        return index;
-    }
-    return -1;
-}
 function findCharacter(value, start, character, budget) {
-    for (let index = start; index < value.length; index++) {
-        if (!takeScan(budget))
-            return -1;
-        if (value[index] === character)
-            return index;
-    }
-    return -1;
-}
-function takeScan(budget) {
     if (budget.scans <= 0)
-        return false;
-    budget.scans--;
-    return true;
+        return -1;
+    const index = value.indexOf(character, start);
+    budget.scans -= (index < 0 ? value.length : index + 1) - start;
+    return budget.scans < 0 ? -1 : index;
 }
 function canUseUnderscore(value, index, size, opening) {
-    const before = value[index - 1];
-    const after = value[index + size];
-    const leftFlanking = !isDelimiterWhitespace(after) && (!isPunctuation(after) || isDelimiterWhitespace(before) || isPunctuation(before));
-    const rightFlanking = !isDelimiterWhitespace(before) && (!isPunctuation(before) || isDelimiterWhitespace(after) || isPunctuation(after));
-    return opening ? leftFlanking && (!rightFlanking || isPunctuation(before)) : rightFlanking && (!leftFlanking || isPunctuation(after));
-}
-function isDelimiterWhitespace(value) {
-    return value === undefined || /\s/.test(value);
-}
-function isPunctuation(value) {
-    return value !== undefined && /[^\p{L}\p{N}\s]/u.test(value);
-}
-function isWhitespace(value) {
-    return /\s/.test(value);
-}
-function textFromMarkdown(value, budget) {
-    return parseInlineRaw(value, {}, budget).map(node => (node.type === 'text' || node.type === 'inlineCode' ? node.value : '')).join('');
-}
-function mergeText(nodes) {
-    const result = [];
-    for (const node of nodes) {
-        const previous = result.at(-1);
-        if (previous?.type === 'text' && node.type === 'text') {
-            previous.value += node.value;
-        }
-        else {
-            result.push(node);
-        }
-    }
-    return result;
+    const inside = value[opening ? index + size : index - 1];
+    const outside = value[opening ? index - 1 : index + size];
+    return inside !== undefined && !/\s/.test(inside) && (outside === undefined || /[^\p{L}\p{N}]/u.test(outside));
 }

package/dist/octane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"octane.d.ts","sourceRoot":"","sources":["../src/octane.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAmC,UAAU,EAAE,aAAa,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAA;AAErI,KAAK,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAExE,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,UAAU,CAAC,EAAE,YAAY,CAAA;CAC1B;AAED,MAAM,WAAW,aAAc,SAAQ,qBAAqB;IAC1D,QAAQ,EAAE,aAAa,CAAA;CACxB;AAED,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,aAAa,GAAG,iBAAiB,CAEnF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,GAAE,qBAA0B,GAAG,UAAU,EAAE,CAG5G;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,qBAA0B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,iBAAiB,CA+DvH;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,qBAA0B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAwClH"}
+{"version":3,"file":"octane.d.ts","sourceRoot":"","sources":["../src/octane.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAG1E,OAAO,KAAK,EAAE,SAAS,EAAmC,UAAU,EAAE,aAAa,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAA;AAErI,KAAK,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAExE,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,UAAU,CAAC,EAAE,YAAY,CAAA;CAC1B;AAED,MAAM,WAAW,aAAc,SAAQ,qBAAqB;IAC1D,QAAQ,EAAE,aAAa,CAAA;CACxB;AAED,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,aAAa,GAAG,iBAAiB,CAEnF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,GAAE,qBAA0B,GAAG,UAAU,EAAE,CAG5G;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,qBAA0B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,iBAAiB,CA+DvH;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,qBAA0B,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAwClH"}

package/dist/octane.js

@@ -1,5 +1,6 @@
 import { Fragment, createElement } from 'octane';
 import { parseMarkdown } from './parser.js';
+import { footnoteReferenceId } from './utils.js';
 export function Markdown({ children, ...options }) {
     return createElement(Fragment, null, ...renderMarkdownOctane(children, options));
 }
@@ -17,7 +18,7 @@ export function renderBlockOctane(node, options = {}, key) {
             return renderCodeBlockOctane(node, options, key);
         case 'list': {
             const tag = node.ordered ? 'ol' : 'ul';
-            return h(options, tag, { key, ...(node.ordered && node.start && node.start !== 1 ? { start: node.start } : {}) }, node.items.map((item, index) => h(options, 'li', { key: index }, renderListItemChildrenOctane(item.children, item.checked, node.loose, options, `${index}`))));
+            return h(options, tag, { key, ...(node.ordered && node.start !== undefined && node.start !== 1 ? { start: node.start } : {}) }, node.items.map((item, index) => h(options, 'li', { key: index }, renderListItemChildrenOctane(item.children, item.checked, node.loose, options, `${index}`))));
         }
         case 'blockquote':
             return h(options, 'blockquote', { key }, node.children.map((child, index) => renderBlockOctane(child, options, `${key}:${index}`)));
@@ -53,7 +54,7 @@ export function renderInlineOctane(node, options = {}, key) {
             return h(options, 'del', { key }, renderInlines(node.children, options));
         case 'footnoteReference':
             return h(options, 'sup', { key }, h(options, 'a', {
-                id: `user-content-fnref-${footnoteReferenceId(node)}`,
+                id: `user-content-fnref-${footnoteReferenceId(node.id, node.referenceIndex)}`,
                 'data-footnote-ref': '',
                 'aria-describedby': 'footnote-label',
                 href: `#user-content-fn-${node.id}`,
@@ -99,8 +100,7 @@ function renderCodeBlockOctane(node, options, key) {
     return h(options, 'figure', { key, className: 'tm-code-frame', 'data-lang': lang }, h(options, 'figcaption', null, node.title), pre);
 }
 function renderListItemChildrenOctane(children, checked, loose, options, key) {
-    const [first, ...rest] = children;
-    const task = checked === undefined
+    let result = checked === undefined
         ? []
         : [
             h(options, 'input', {
@@ -112,17 +112,18 @@ function renderListItemChildrenOctane(children, checked, loose, options, key) {
             }),
             ' ',
         ];
-    if (first?.type === 'paragraph') {
-        const content = [...task, ...renderInlines(first.children, options)];
-        return [
-            ...(loose ? [h(options, 'p', { key: `${key}:paragraph` }, content)] : content),
-            ...rest.flatMap((child, childIndex) => renderListChildOctane(child, loose, options, `${key}:${childIndex + 1}`)),
-        ];
+    for (let index = 0; index < children.length; index++) {
+        const child = children[index];
+        if (child.type === 'paragraph' && (!loose || index === 0)) {
+            for (const inline of renderInlines(child.children, options))
+                result.push(inline);
+            if (loose)
+                result = [h(options, 'p', { key: `${key}:paragraph` }, result)];
+        }
+        else
+            result.push(renderBlockOctane(child, options, `${key}:${index}`));
     }
-    return [...task, ...children.flatMap((child, childIndex) => renderListChildOctane(child, loose, options, `${key}:${childIndex}`))];
-}
-function renderListChildOctane(child, loose, options, key) {
-    return !loose && child.type === 'paragraph' ? renderInlines(child.children, options) : [renderBlockOctane(child, options, key)];
+    return result;
 }
 function renderTableCellOctane(tag, cell, align, options, key) {
     return h(options, tag, { key, ...(align ? { style: { textAlign: align } } : {}) }, renderInlines(cell.children, options));
@@ -133,19 +134,20 @@ function renderFootnotesOctane(items, options, key) {
 function renderFootnoteItemOctane(item, options) {
     const lastIndex = item.children.length - 1;
     const backrefs = renderFootnoteBackrefsOctane(item, options);
-    if (lastIndex < 0)
-        return [h(options, 'p', { key: 'backref-wrapper' }, backrefs.slice(1))];
-    return item.children.map((child, index) => {
+    const result = item.children.map((child, index) => {
         if (index === lastIndex && child.type === 'paragraph') {
             return h(options, 'p', { key: index }, renderInlines(child.children, options), backrefs);
         }
         return renderBlockOctane(child, options, `${index}`);
     });
+    if (item.children[lastIndex]?.type !== 'paragraph')
+        result.push(h(options, 'p', { key: 'backref-wrapper' }, backrefs.slice(1)));
+    return result;
 }
 function renderFootnoteBackrefsOctane(item, options) {
     const result = [];
     for (let index = 1; index <= (item.referenceCount ?? 1); index++) {
-        const referenceId = index === 1 ? item.id : `${item.id}-${index}`;
+        const referenceId = footnoteReferenceId(item.id, index);
         const label = index === 1 ? `${item.number}` : `${item.number}-${index}`;
         result.push(' ', h(options, 'a', {
             key: index,
@@ -157,9 +159,6 @@ function renderFootnoteBackrefsOctane(item, options) {
     }
     return result;
 }
-function footnoteReferenceId(node) {
-    return node.referenceIndex && node.referenceIndex > 1 ? `${node.id}-${node.referenceIndex}` : node.id;
-}
 function h(options, tag, props, ...children) {
     const component = typeof tag === 'string' ? options.components?.[tag] ?? tag : tag;
     return createElement(component, props ?? undefined, ...children);

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAQV,gBAAgB,EAChB,YAAY,EAGb,MAAM,YAAY,CAAA;AAWnB,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,gBAAgB,CAyC5F"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAQV,gBAAgB,EAChB,YAAY,EAGb,MAAM,YAAY,CAAA;AAWnB,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,gBAAgB,CA0C5F"}