@readme/markdown 13.1.4 → 13.2.0

package/dist/main.js

@@ -94031,9 +94031,12 @@ const evaluateExpressions = ({ context = {} } = {}) => tree => {
         }
         catch (_error) {
             // If evaluation fails, leave the expression as-is (fallback to text)
+            // we still need to manually escape escaped characters because the expression
+            // parser treats the contents as code instead of text, skipping the backslash escapes
+            const processed = expression.replace(/\\([!-/:-@[-`{-~])/g, '$1');
             parent.children.splice(index, 1, {
                 type: 'text',
-                value: `{${expression}}`,
+                value: `{${processed}}`,
                 position: node.position,
             });
         }
@@ -94126,11 +94129,11 @@ const MARKER_PATTERNS = [
 // trailingSpace1 is for "** text **" pattern, trailingSpace2 is for "**text **" pattern
 const asteriskBoldRegex = /([^*\s]+)?\s*(\*\*)(?:\s+((?:[^*\n]|\*(?!\*))+?)(\s*)\2|((?:[^*\n]|\*(?!\*))+?)(\s+)\2)(\S|$)?/g;
 // Pattern for __ bold __
-const underscoreBoldRegex = /([^_\s]+)?\s*(__)(?:\s+((?:[^_\n]|_(?!_))+?)(\s*)\2|((?:[^_\n]|_(?!_))+?)(\s+)\2)(\S|$)?/g;
+const underscoreBoldRegex = /([^_\s]+)?\s*(__)(?:\s+((?:__(?! )|_(?!_)|[^_\n])+?)(\s*)\2|((?:__(?! )|_(?!_)|[^_\n])+?)(\s+)\2)(\S|$)?/g;
 // Pattern for * italic *
 const asteriskItalicRegex = /([^*\s]+)?\s*(\*)(?!\*)(?:\s+([^*\n]+?)(\s*)\2|([^*\n]+?)(\s+)\2)(\S|$)?/g;
 // Pattern for _ italic _
-const underscoreItalicRegex = /([^_\s]+)?\s*(_)(?!_)(?:\s+([^_\n]+?)(\s*)\2|([^_\n]+?)(\s+)\2)(\S|$)?/g;
+const underscoreItalicRegex = /([^_\s]+)?\s*(_)(?!_)(?:\s+((?:[^_\n]|_(?! ))+?)(\s*)\2|((?:[^_\n]|_(?! ))+?)(\s+)\2)(\S|$)?/g;
 // CommonMark ignores intraword underscores or asteriks, but we want to italicize/bold the inner part
 // Pattern for intraword _word_ in words like hello_world_
 const intrawordUnderscoreItalicRegex = /(\w)_(?!_)([a-zA-Z0-9]+)_(?![\w_])/g;
@@ -95854,6 +95857,9 @@ const restoreBooleanProperties = () => tree => {
 
 const STANDALONE_HTML_LINE_REGEX = /^(<[a-z][^<>]*>|<\/[a-z][^<>]*>)+\s*$/;
 const HTML_LINE_WITH_CONTENT_REGEX = /^<[a-z][^<>]*>.*<\/[a-z][^<>]*>(?:[^<]*)$/;
+function isLineHtml(line) {
+    return STANDALONE_HTML_LINE_REGEX.test(line) || HTML_LINE_WITH_CONTENT_REGEX.test(line);
+}
 /**
  * Preprocessor to terminate HTML flow blocks.
  *
@@ -95865,14 +95871,14 @@ const HTML_LINE_WITH_CONTENT_REGEX = /^<[a-z][^<>]*>.*<\/[a-z][^<>]*>(?:[^<]*)$/
  * @link https://spec.commonmark.org/0.29/#html-blocks
  *
  * This preprocessor inserts a blank line after standalone HTML lines when the
- * next line is non-blank, ensuring micromark's HTML flow tokenizer terminates
- * and subsequent content is parsed independently.
+ * next line is non-blank and not an HTML construct (because they still might be part of the HTML flow),
+ * ensuring micromark's HTML flow tokenizer terminates and subsequent content is parsed independently.
  *
- * Only targets non-indented lines with lowercase tag names. Uppercase tags
+ * Conditions:
+ * 1. Only targets non-indented lines with lowercase tag names. Uppercase tags
  * (e.g., `<Table>`, `<MyComponent>`) are JSX custom components and don't
  * trigger CommonMark HTML blocks, so they are left untouched.
- *
- * Lines inside fenced code blocks are skipped entirely.
+ * 2. Lines inside protected blocks (e.g., code blocks) should be left untouched.
  */
 function terminateHtmlFlowBlocks(content) {
     const { protectedContent, protectedCode } = protectCodeBlocks(content);
@@ -95880,9 +95886,14 @@ function terminateHtmlFlowBlocks(content) {
     const result = [];
     for (let i = 0; i < lines.length; i += 1) {
         result.push(lines[i]);
-        if (i < lines.length - 1 &&
-            (STANDALONE_HTML_LINE_REGEX.test(lines[i]) || HTML_LINE_WITH_CONTENT_REGEX.test(lines[i])) &&
-            lines[i + 1].trim().length > 0) {
+        // Skip blank & indented lines
+        if (i >= lines.length - 1 || lines[i + 1].trim().length === 0 || lines[i + 1].startsWith(' ') || lines[i + 1].startsWith('\t')) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+        const isCurrentLineHtml = isLineHtml(lines[i]);
+        const isNextLineHtml = isLineHtml(lines[i + 1]);
+        if (isCurrentLineHtml && !isNextLineHtml) {
             result.push('');
         }
     }
@@ -97866,7 +97877,8 @@ async function stripComments(doc, { mdx, mdxish } = {}) {
     if (mdxish) {
         processor
             .data('micromarkExtensions', [mdxExpression({ allowEmpty: true })])
-            .data('fromMarkdownExtensions', [mdxExpressionFromMarkdown()]);
+            .data('fromMarkdownExtensions', [mdxExpressionFromMarkdown()])
+            .data('toMarkdownExtensions', [mdxExpressionToMarkdown()]);
     }
     processor
         .use(remarkParse)
@@ -97891,9 +97903,7 @@ async function stripComments(doc, { mdx, mdxish } = {}) {
                 // Our markdown renderer uses this to group these code blocks into a tabbed interface.
                 (left, right) => {
                     if (left.type === 'code' && right.type === 'code') {
-                        const isTight = left.position &&
-                            right.position &&
-                            right.position.start.line - left.position.end.line === 1; // Are the blocks on adjacent lines?
+                        const isTight = left.position && right.position && right.position.start.line - left.position.end.line === 1; // Are the blocks on adjacent lines?
                         // 0 = no newline between blocks
                         return isTight ? 0 : undefined;
                     }

package/dist/main.node.js

@@ -114235,9 +114235,12 @@ const evaluateExpressions = ({ context = {} } = {}) => tree => {
         }
         catch (_error) {
             // If evaluation fails, leave the expression as-is (fallback to text)
+            // we still need to manually escape escaped characters because the expression
+            // parser treats the contents as code instead of text, skipping the backslash escapes
+            const processed = expression.replace(/\\([!-/:-@[-`{-~])/g, '$1');
             parent.children.splice(index, 1, {
                 type: 'text',
-                value: `{${expression}}`,
+                value: `{${processed}}`,
                 position: node.position,
             });
         }
@@ -114330,11 +114333,11 @@ const MARKER_PATTERNS = [
 // trailingSpace1 is for "** text **" pattern, trailingSpace2 is for "**text **" pattern
 const asteriskBoldRegex = /([^*\s]+)?\s*(\*\*)(?:\s+((?:[^*\n]|\*(?!\*))+?)(\s*)\2|((?:[^*\n]|\*(?!\*))+?)(\s+)\2)(\S|$)?/g;
 // Pattern for __ bold __
-const underscoreBoldRegex = /([^_\s]+)?\s*(__)(?:\s+((?:[^_\n]|_(?!_))+?)(\s*)\2|((?:[^_\n]|_(?!_))+?)(\s+)\2)(\S|$)?/g;
+const underscoreBoldRegex = /([^_\s]+)?\s*(__)(?:\s+((?:__(?! )|_(?!_)|[^_\n])+?)(\s*)\2|((?:__(?! )|_(?!_)|[^_\n])+?)(\s+)\2)(\S|$)?/g;
 // Pattern for * italic *
 const asteriskItalicRegex = /([^*\s]+)?\s*(\*)(?!\*)(?:\s+([^*\n]+?)(\s*)\2|([^*\n]+?)(\s+)\2)(\S|$)?/g;
 // Pattern for _ italic _
-const underscoreItalicRegex = /([^_\s]+)?\s*(_)(?!_)(?:\s+([^_\n]+?)(\s*)\2|([^_\n]+?)(\s+)\2)(\S|$)?/g;
+const underscoreItalicRegex = /([^_\s]+)?\s*(_)(?!_)(?:\s+((?:[^_\n]|_(?! ))+?)(\s*)\2|((?:[^_\n]|_(?! ))+?)(\s+)\2)(\S|$)?/g;
 // CommonMark ignores intraword underscores or asteriks, but we want to italicize/bold the inner part
 // Pattern for intraword _word_ in words like hello_world_
 const intrawordUnderscoreItalicRegex = /(\w)_(?!_)([a-zA-Z0-9]+)_(?![\w_])/g;
@@ -116058,6 +116061,9 @@ const restoreBooleanProperties = () => tree => {
 
 const STANDALONE_HTML_LINE_REGEX = /^(<[a-z][^<>]*>|<\/[a-z][^<>]*>)+\s*$/;
 const HTML_LINE_WITH_CONTENT_REGEX = /^<[a-z][^<>]*>.*<\/[a-z][^<>]*>(?:[^<]*)$/;
+function isLineHtml(line) {
+    return STANDALONE_HTML_LINE_REGEX.test(line) || HTML_LINE_WITH_CONTENT_REGEX.test(line);
+}
 /**
  * Preprocessor to terminate HTML flow blocks.
  *
@@ -116069,14 +116075,14 @@ const HTML_LINE_WITH_CONTENT_REGEX = /^<[a-z][^<>]*>.*<\/[a-z][^<>]*>(?:[^<]*)$/
  * @link https://spec.commonmark.org/0.29/#html-blocks
  *
  * This preprocessor inserts a blank line after standalone HTML lines when the
- * next line is non-blank, ensuring micromark's HTML flow tokenizer terminates
- * and subsequent content is parsed independently.
+ * next line is non-blank and not an HTML construct (because they still might be part of the HTML flow),
+ * ensuring micromark's HTML flow tokenizer terminates and subsequent content is parsed independently.
  *
- * Only targets non-indented lines with lowercase tag names. Uppercase tags
+ * Conditions:
+ * 1. Only targets non-indented lines with lowercase tag names. Uppercase tags
  * (e.g., `<Table>`, `<MyComponent>`) are JSX custom components and don't
  * trigger CommonMark HTML blocks, so they are left untouched.
- *
- * Lines inside fenced code blocks are skipped entirely.
+ * 2. Lines inside protected blocks (e.g., code blocks) should be left untouched.
  */
 function terminateHtmlFlowBlocks(content) {
     const { protectedContent, protectedCode } = protectCodeBlocks(content);
@@ -116084,9 +116090,14 @@ function terminateHtmlFlowBlocks(content) {
     const result = [];
     for (let i = 0; i < lines.length; i += 1) {
         result.push(lines[i]);
-        if (i < lines.length - 1 &&
-            (STANDALONE_HTML_LINE_REGEX.test(lines[i]) || HTML_LINE_WITH_CONTENT_REGEX.test(lines[i])) &&
-            lines[i + 1].trim().length > 0) {
+        // Skip blank & indented lines
+        if (i >= lines.length - 1 || lines[i + 1].trim().length === 0 || lines[i + 1].startsWith(' ') || lines[i + 1].startsWith('\t')) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+        const isCurrentLineHtml = isLineHtml(lines[i]);
+        const isNextLineHtml = isLineHtml(lines[i + 1]);
+        if (isCurrentLineHtml && !isNextLineHtml) {
             result.push('');
         }
     }
@@ -118070,7 +118081,8 @@ async function stripComments(doc, { mdx, mdxish } = {}) {
     if (mdxish) {
         processor
             .data('micromarkExtensions', [mdxExpression({ allowEmpty: true })])
-            .data('fromMarkdownExtensions', [mdxExpressionFromMarkdown()]);
+            .data('fromMarkdownExtensions', [mdxExpressionFromMarkdown()])
+            .data('toMarkdownExtensions', [mdxExpressionToMarkdown()]);
     }
     processor
         .use(remarkParse)
@@ -118095,9 +118107,7 @@ async function stripComments(doc, { mdx, mdxish } = {}) {
                 // Our markdown renderer uses this to group these code blocks into a tabbed interface.
                 (left, right) => {
                     if (left.type === 'code' && right.type === 'code') {
-                        const isTight = left.position &&
-                            right.position &&
-                            right.position.start.line - left.position.end.line === 1; // Are the blocks on adjacent lines?
+                        const isTight = left.position && right.position && right.position.start.line - left.position.end.line === 1; // Are the blocks on adjacent lines?
                         // 0 = no newline between blocks
                         return isTight ? 0 : undefined;
                     }