@readme/markdown 13.1.3 → 13.1.4

package/dist/main.js

@@ -70954,13 +70954,15 @@ const scanForClosingTag = (parent, startIndex, tag) => {
             if (isClosingTag(siblingValue, tag)) {
                 return { closingIndex: i, extraClosingChildren: [] };
             }
-            // Embedded closing tag (closing tag at end of HTML block content)
+            // Embedded closing tag (closing tag within HTML block content)
             if (siblingValue.includes(closingTagStr)) {
-                const contentBeforeClose = siblingValue.substring(0, siblingValue.lastIndexOf(closingTagStr)).trim();
+                const closeTagPos = siblingValue.indexOf(closingTagStr);
+                const contentBeforeClose = siblingValue.substring(0, closeTagPos).trim();
+                const contentAfterClose = siblingValue.substring(closeTagPos + closingTagStr.length).trim();
                 const extraChildren = contentBeforeClose
                     ? parseMdChildren(contentBeforeClose)
                     : [];
-                return { closingIndex: i, extraClosingChildren: extraChildren };
+                return { closingIndex: i, extraClosingChildren: extraChildren, contentAfterClose: contentAfterClose || undefined };
             }
         }
         // Check paragraph siblings
@@ -71105,7 +71107,7 @@ const mdxishComponentBlocks = () => tree => {
         const scanResult = scanForClosingTag(parent, index, tag);
         if (!scanResult)
             return;
-        const { closingIndex, extraClosingChildren, strippedParagraph } = scanResult;
+        const { closingIndex, extraClosingChildren, strippedParagraph, contentAfterClose: remainingAfterClose } = scanResult;
         const extraChildren = contentAfterTag ? parseMdChildren(contentAfterTag.trimStart()) : [];
         // Collect all intermediate siblings between opening tag and closing tag
         const intermediateChildren = parent.children.slice(index + 1, closingIndex);
@@ -71128,6 +71130,11 @@ const mdxishComponentBlocks = () => tree => {
         if (componentNode.children.length > 0) {
             stack.push(componentNode);
         }
+        // If the closing tag sibling had content after it (e.g., another component opening tag),
+        // re-insert it as a sibling so it can be processed in subsequent iterations
+        if (remainingAfterClose) {
+            parseSibling(stack, parent, index, remainingAfterClose);
+        }
     };
     // Process the nodes with the components depth-first to maintain the correct order of the nodes
     while (stack.length) {
@@ -93444,7 +93451,7 @@ function isActualHtmlTag(tagName, originalExcerpt) {
     return false;
 }
 /** Parse and replace text children with processed markdown */
-function parseTextChildren(node, processMarkdown) {
+function parseTextChildren(node, processMarkdown, components) {
     if (!node.children?.length)
         return;
     // First pass: Recursively process text children as they may contain stringified markdown / mdx content
@@ -93459,6 +93466,27 @@ function parseTextChildren(node, processMarkdown) {
         }
         return children;
     });
+    // Unwrap <p> elements whose meaningful children are ALL components.
+    // The markdown parser wraps inline content in <p> tags, but when that content
+    // is actually component children (e.g., <Tab> inside <Tabs>), the wrapper
+    // should be removed so components appear as direct children.
+    // Only unwrap when every non-whitespace, non-br child is a known component
+    // to avoid breaking paragraphs with mixed content (text + inline HTML like <code>).
+    node.children = node.children.flatMap(child => {
+        if (child.type !== 'element' || child.tagName !== 'p')
+            return [child];
+        const meaningfulChildren = child.children.filter(gc => {
+            if (gc.type === 'text' && !gc.value.trim())
+                return false;
+            if (gc.type === 'element' && gc.tagName === 'br')
+                return false;
+            return true;
+        });
+        const allComponents = meaningfulChildren.length > 0 && meaningfulChildren.every(gc => gc.type === 'element' && getComponentName(gc.tagName, components));
+        if (!allComponents)
+            return [child];
+        return meaningfulChildren;
+    });
     // Post-processing: remove whitespace-only text nodes if all siblings are components
     // This prevents whitespace between component children from being counted as extra children
     if (areAllChildrenComponents(node.children)) {
@@ -93513,7 +93541,7 @@ const rehypeMdxishComponents = ({ components, processMarkdown }) => {
             }
             node.tagName = componentName;
             normalizeProperties(node);
-            parseTextChildren(node, processMarkdown);
+            parseTextChildren(node, processMarkdown, components);
         });
         // Remove unknown components in reverse order to preserve indices
         for (let i = nodesToRemove.length - 1; i >= 0; i -= 1) {
@@ -93814,8 +93842,10 @@ function escapeUnbalancedBraces(content) {
     const unbalanced = new Set();
     let strDelim = null;
     let strEscaped = false;
-    for (let i = 0; i < content.length; i += 1) {
-        const ch = content[i];
+    // Convert to array of Unicode code points to handle emojis and multi-byte characters correctly
+    const chars = Array.from(content);
+    for (let i = 0; i < chars.length; i += 1) {
+        const ch = chars[i];
         // Track strings inside expressions to ignore braces within them
         if (opens.length > 0) {
             if (strDelim) {
@@ -93837,7 +93867,7 @@ function escapeUnbalancedBraces(content) {
         // Skip already-escaped braces (count preceding backslashes)
         if (ch === '{' || ch === '}') {
             let bs = 0;
-            for (let j = i - 1; j >= 0 && content[j] === '\\'; j -= 1)
+            for (let j = i - 1; j >= 0 && chars[j] === '\\'; j -= 1)
                 bs += 1;
             if (bs % 2 === 1) {
                 // eslint-disable-next-line no-continue
@@ -93856,7 +93886,7 @@ function escapeUnbalancedBraces(content) {
     opens.forEach(pos => unbalanced.add(pos));
     if (unbalanced.size === 0)
         return content;
-    return Array.from(content)
+    return chars
         .map((ch, i) => (unbalanced.has(i) ? `\\${ch}` : ch))
         .join('');
 }

package/dist/main.node.js

@@ -91158,13 +91158,15 @@ const scanForClosingTag = (parent, startIndex, tag) => {
             if (isClosingTag(siblingValue, tag)) {
                 return { closingIndex: i, extraClosingChildren: [] };
             }
-            // Embedded closing tag (closing tag at end of HTML block content)
+            // Embedded closing tag (closing tag within HTML block content)
             if (siblingValue.includes(closingTagStr)) {
-                const contentBeforeClose = siblingValue.substring(0, siblingValue.lastIndexOf(closingTagStr)).trim();
+                const closeTagPos = siblingValue.indexOf(closingTagStr);
+                const contentBeforeClose = siblingValue.substring(0, closeTagPos).trim();
+                const contentAfterClose = siblingValue.substring(closeTagPos + closingTagStr.length).trim();
                 const extraChildren = contentBeforeClose
                     ? parseMdChildren(contentBeforeClose)
                     : [];
-                return { closingIndex: i, extraClosingChildren: extraChildren };
+                return { closingIndex: i, extraClosingChildren: extraChildren, contentAfterClose: contentAfterClose || undefined };
             }
         }
         // Check paragraph siblings
@@ -91309,7 +91311,7 @@ const mdxishComponentBlocks = () => tree => {
         const scanResult = scanForClosingTag(parent, index, tag);
         if (!scanResult)
             return;
-        const { closingIndex, extraClosingChildren, strippedParagraph } = scanResult;
+        const { closingIndex, extraClosingChildren, strippedParagraph, contentAfterClose: remainingAfterClose } = scanResult;
         const extraChildren = contentAfterTag ? parseMdChildren(contentAfterTag.trimStart()) : [];
         // Collect all intermediate siblings between opening tag and closing tag
         const intermediateChildren = parent.children.slice(index + 1, closingIndex);
@@ -91332,6 +91334,11 @@ const mdxishComponentBlocks = () => tree => {
         if (componentNode.children.length > 0) {
             stack.push(componentNode);
         }
+        // If the closing tag sibling had content after it (e.g., another component opening tag),
+        // re-insert it as a sibling so it can be processed in subsequent iterations
+        if (remainingAfterClose) {
+            parseSibling(stack, parent, index, remainingAfterClose);
+        }
     };
     // Process the nodes with the components depth-first to maintain the correct order of the nodes
     while (stack.length) {
@@ -113648,7 +113655,7 @@ function isActualHtmlTag(tagName, originalExcerpt) {
     return false;
 }
 /** Parse and replace text children with processed markdown */
-function parseTextChildren(node, processMarkdown) {
+function parseTextChildren(node, processMarkdown, components) {
     if (!node.children?.length)
         return;
     // First pass: Recursively process text children as they may contain stringified markdown / mdx content
@@ -113663,6 +113670,27 @@ function parseTextChildren(node, processMarkdown) {
         }
         return children;
     });
+    // Unwrap <p> elements whose meaningful children are ALL components.
+    // The markdown parser wraps inline content in <p> tags, but when that content
+    // is actually component children (e.g., <Tab> inside <Tabs>), the wrapper
+    // should be removed so components appear as direct children.
+    // Only unwrap when every non-whitespace, non-br child is a known component
+    // to avoid breaking paragraphs with mixed content (text + inline HTML like <code>).
+    node.children = node.children.flatMap(child => {
+        if (child.type !== 'element' || child.tagName !== 'p')
+            return [child];
+        const meaningfulChildren = child.children.filter(gc => {
+            if (gc.type === 'text' && !gc.value.trim())
+                return false;
+            if (gc.type === 'element' && gc.tagName === 'br')
+                return false;
+            return true;
+        });
+        const allComponents = meaningfulChildren.length > 0 && meaningfulChildren.every(gc => gc.type === 'element' && getComponentName(gc.tagName, components));
+        if (!allComponents)
+            return [child];
+        return meaningfulChildren;
+    });
     // Post-processing: remove whitespace-only text nodes if all siblings are components
     // This prevents whitespace between component children from being counted as extra children
     if (areAllChildrenComponents(node.children)) {
@@ -113717,7 +113745,7 @@ const rehypeMdxishComponents = ({ components, processMarkdown }) => {
             }
             node.tagName = componentName;
             normalizeProperties(node);
-            parseTextChildren(node, processMarkdown);
+            parseTextChildren(node, processMarkdown, components);
         });
         // Remove unknown components in reverse order to preserve indices
         for (let i = nodesToRemove.length - 1; i >= 0; i -= 1) {
@@ -114018,8 +114046,10 @@ function escapeUnbalancedBraces(content) {
     const unbalanced = new Set();
     let strDelim = null;
     let strEscaped = false;
-    for (let i = 0; i < content.length; i += 1) {
-        const ch = content[i];
+    // Convert to array of Unicode code points to handle emojis and multi-byte characters correctly
+    const chars = Array.from(content);
+    for (let i = 0; i < chars.length; i += 1) {
+        const ch = chars[i];
         // Track strings inside expressions to ignore braces within them
         if (opens.length > 0) {
             if (strDelim) {
@@ -114041,7 +114071,7 @@ function escapeUnbalancedBraces(content) {
         // Skip already-escaped braces (count preceding backslashes)
         if (ch === '{' || ch === '}') {
             let bs = 0;
-            for (let j = i - 1; j >= 0 && content[j] === '\\'; j -= 1)
+            for (let j = i - 1; j >= 0 && chars[j] === '\\'; j -= 1)
                 bs += 1;
             if (bs % 2 === 1) {
                 // eslint-disable-next-line no-continue
@@ -114060,7 +114090,7 @@ function escapeUnbalancedBraces(content) {
     opens.forEach(pos => unbalanced.add(pos));
     if (unbalanced.size === 0)
         return content;
-    return Array.from(content)
+    return chars
         .map((ch, i) => (unbalanced.has(i) ? `\\${ch}` : ch))
         .join('');
 }