@readme/markdown 9.11.0 → 9.12.0

package/dist/main.js

@@ -11946,11 +11946,11 @@ Anchor.defaultProps = {
 
 
 const themes = {
-    'error': 'error',
-    'default': 'default',
-    'info': 'info',
-    'okay': 'okay',
-    'warn': 'warn',
+    error: 'error',
+    default: 'default',
+    info: 'info',
+    okay: 'okay',
+    warn: 'warn',
     '\uD83D\uDCD8': 'info',
     '\uD83D\uDEA7': 'warn',
     '\u26A0\uFE0F': 'warn',
@@ -11971,17 +11971,18 @@ const defaultIcons = {
     error: '\u2757\uFE0F',
 };
 const Callout = (props) => {
-    const { attributes, children, theme = 'default', empty } = props;
+    const { attributes, theme = 'default', empty } = props;
+    const children = external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(props.children);
     const icon = props.icon || defaultIcons[theme] || '❗';
     const isEmoji = emoji_regex().test(icon);
+    const heading = empty ? external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("p", { className: 'callout-heading empty' }) : children[0];
     return (
     // @ts-expect-error -- theme is not a valid attribute
     // eslint-disable-next-line react/jsx-props-no-spreading, react/no-unknown-property
     external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("blockquote", { ...attributes, className: `callout callout_${theme}`, theme: icon },
-        external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("h3", { className: `callout-heading${empty ? ' empty' : ''}` },
-            isEmoji ? external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: "callout-icon" }, icon) : external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: `callout-icon callout-icon_fa ${icon}` }),
-            empty || external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(children)[0]),
-        external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(children).slice(1)));
+        isEmoji ? (external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: "callout-icon" }, icon)) : (external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: `callout-icon callout-icon_fa ${icon}` })),
+        heading,
+        children.slice(1)));
 };
 /* harmony default export */ const components_Callout = (Callout);
 
@@ -40932,6 +40933,32 @@ var NodeTypes;
 
 
 const callouts_regex = `^(${emoji_regex().source}|⚠)(\\s+|$)`;
+const findFirst = (node) => {
+    if ('children' in node)
+        return findFirst(node.children[0]);
+    if (node.type === 'text')
+        return node;
+    return null;
+};
+const findLast = (node) => {
+    if ('children' in node && Array.isArray(node.children))
+        return findFirst(node.children[node.children.length - 1]);
+    if (node.type === 'text')
+        return node;
+    return null;
+};
+const wrapHeading = (node) => {
+    const firstChild = node.children[0];
+    return {
+        type: 'heading',
+        depth: 3,
+        children: ('children' in firstChild ? firstChild.children : []),
+        position: {
+            start: findFirst(firstChild).position.start,
+            end: findLast(firstChild).position.end,
+        },
+    };
+};
 const calloutTransformer = () => {
     return (tree) => {
         visit(tree, 'blockquote', (node) => {
@@ -40944,6 +40971,9 @@ const calloutTransformer = () => {
                 const empty = !heading.length && node.children[0].children.length === 1;
                 const theme = themes[icon] || 'default';
                 node.children[0].children[0].value = heading;
+                if (heading) {
+                    node.children[0] = wrapHeading(node);
+                }
                 Object.assign(node, {
                     type: NodeTypes.callout,
                     data: {
@@ -58738,14 +58768,21 @@ const readmeToMdx = () => tree => {
     visit(tree, 'rdme-callout', (node, index, parent) => {
         const isEmoji = emoji_regex().test(node.data.hProperties.icon);
         const isEmpty = node.data.hProperties?.empty;
+        const isH3 = node.children[0].type === 'heading' && node.children[0].depth === 3;
         // return the usual markdown if there is an emoji and the icon theme matches our default theme
-        if (isEmoji && themes[node.data.hProperties.icon] === node.data.hProperties.theme) {
+        if ((isEmpty || isH3) && isEmoji && themes[node.data.hProperties.icon] === node.data.hProperties.theme) {
+            if (isH3) {
+                node.children[0] = {
+                    type: 'paragraph',
+                    children: 'children' in node.children[0] ? node.children[0].children : [],
+                };
+            }
             return;
         }
         parent.children.splice(index, 1, {
             type: 'mdxJsxFlowElement',
             name: 'Callout',
-            attributes: toAttributes(node.data.hProperties, ['icon', (isEmpty && 'empty'), 'theme'].filter(Boolean)),
+            attributes: toAttributes(node.data.hProperties, ['icon', isEmpty && 'empty', 'theme'].filter(Boolean)),
             children: node.children,
         });
     });
@@ -90042,11 +90079,12 @@ function compilers() {
 
 
 
-const mdx_mdx = (tree, { hast = false, ...opts } = {}) => {
+const mdx_mdx = (tree, { hast = false, remarkTransformers = [], ...opts } = {}) => {
     const processor = unified()
         .use(hast ? rehypeRemark : undefined)
         .use(remarkMdx)
         .use(remarkGfm)
+        .use(remarkTransformers)
         .use(div)
         .use(readme_to_mdx)
         .use(tables_to_jsx)
@@ -90059,11 +90097,23 @@ const mdx_mdx = (tree, { hast = false, ...opts } = {}) => {
 };
 /* harmony default export */ const lib_mdx = (mdx_mdx);
 
+;// ./processor/transform/migrate-callouts.ts
+
+
+const migrateCallouts = () => (tree) => {
+    visit(tree, 'rdme-callout', callout => {
+        callout.children[0] = wrapHeading(callout);
+    });
+    return tree;
+};
+/* harmony default export */ const migrate_callouts = (migrateCallouts);
+
 ;// ./lib/migrate.ts
 
 
+
 const migrate = (doc, { rdmd }) => {
-    return (lib_mdx(lib_mdastV6(doc, { rdmd }))
+    return (lib_mdx(lib_mdastV6(doc, { rdmd }), { remarkTransformers: [migrate_callouts] })
         .replaceAll(/ /g, ' ')
         // @note: I'm not sure what's happening, but I think mdx is converting an
         // 'a' to 'a' as a means of escaping it. I think this helps with

package/dist/main.node.js

@@ -16315,11 +16315,11 @@ Anchor.defaultProps = {
 
 
 const themes = {
-    'error': 'error',
-    'default': 'default',
-    'info': 'info',
-    'okay': 'okay',
-    'warn': 'warn',
+    error: 'error',
+    default: 'default',
+    info: 'info',
+    okay: 'okay',
+    warn: 'warn',
     '\uD83D\uDCD8': 'info',
     '\uD83D\uDEA7': 'warn',
     '\u26A0\uFE0F': 'warn',
@@ -16340,17 +16340,18 @@ const defaultIcons = {
     error: '\u2757\uFE0F',
 };
 const Callout = (props) => {
-    const { attributes, children, theme = 'default', empty } = props;
+    const { attributes, theme = 'default', empty } = props;
+    const children = external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(props.children);
     const icon = props.icon || defaultIcons[theme] || '❗';
     const isEmoji = emoji_regex().test(icon);
+    const heading = empty ? external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("p", { className: 'callout-heading empty' }) : children[0];
     return (
     // @ts-expect-error -- theme is not a valid attribute
     // eslint-disable-next-line react/jsx-props-no-spreading, react/no-unknown-property
     external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("blockquote", { ...attributes, className: `callout callout_${theme}`, theme: icon },
-        external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("h3", { className: `callout-heading${empty ? ' empty' : ''}` },
-            isEmoji ? external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: "callout-icon" }, icon) : external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: `callout-icon callout-icon_fa ${icon}` }),
-            empty || external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(children)[0]),
-        external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.Children.toArray(children).slice(1)));
+        isEmoji ? (external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: "callout-icon" }, icon)) : (external_amd_react_commonjs_react_commonjs2_react_root_React_umd_react_.createElement("span", { className: `callout-icon callout-icon_fa ${icon}` })),
+        heading,
+        children.slice(1)));
 };
 /* harmony default export */ const components_Callout = (Callout);
 
@@ -57842,6 +57843,32 @@ var NodeTypes;
 
 
 const callouts_regex = `^(${emoji_regex().source}|⚠)(\\s+|$)`;
+const findFirst = (node) => {
+    if ('children' in node)
+        return findFirst(node.children[0]);
+    if (node.type === 'text')
+        return node;
+    return null;
+};
+const findLast = (node) => {
+    if ('children' in node && Array.isArray(node.children))
+        return findFirst(node.children[node.children.length - 1]);
+    if (node.type === 'text')
+        return node;
+    return null;
+};
+const wrapHeading = (node) => {
+    const firstChild = node.children[0];
+    return {
+        type: 'heading',
+        depth: 3,
+        children: ('children' in firstChild ? firstChild.children : []),
+        position: {
+            start: findFirst(firstChild).position.start,
+            end: findLast(firstChild).position.end,
+        },
+    };
+};
 const calloutTransformer = () => {
     return (tree) => {
         visit(tree, 'blockquote', (node) => {
@@ -57854,6 +57881,9 @@ const calloutTransformer = () => {
                 const empty = !heading.length && node.children[0].children.length === 1;
                 const theme = themes[icon] || 'default';
                 node.children[0].children[0].value = heading;
+                if (heading) {
+                    node.children[0] = wrapHeading(node);
+                }
                 Object.assign(node, {
                     type: NodeTypes.callout,
                     data: {
@@ -75648,14 +75678,21 @@ const readmeToMdx = () => tree => {
     visit(tree, 'rdme-callout', (node, index, parent) => {
         const isEmoji = emoji_regex().test(node.data.hProperties.icon);
         const isEmpty = node.data.hProperties?.empty;
+        const isH3 = node.children[0].type === 'heading' && node.children[0].depth === 3;
         // return the usual markdown if there is an emoji and the icon theme matches our default theme
-        if (isEmoji && themes[node.data.hProperties.icon] === node.data.hProperties.theme) {
+        if ((isEmpty || isH3) && isEmoji && themes[node.data.hProperties.icon] === node.data.hProperties.theme) {
+            if (isH3) {
+                node.children[0] = {
+                    type: 'paragraph',
+                    children: 'children' in node.children[0] ? node.children[0].children : [],
+                };
+            }
             return;
         }
         parent.children.splice(index, 1, {
             type: 'mdxJsxFlowElement',
             name: 'Callout',
-            attributes: toAttributes(node.data.hProperties, ['icon', (isEmpty && 'empty'), 'theme'].filter(Boolean)),
+            attributes: toAttributes(node.data.hProperties, ['icon', isEmpty && 'empty', 'theme'].filter(Boolean)),
             children: node.children,
         });
     });
@@ -106952,11 +106989,12 @@ function compilers() {
 
 
 
-const mdx_mdx = (tree, { hast = false, ...opts } = {}) => {
+const mdx_mdx = (tree, { hast = false, remarkTransformers = [], ...opts } = {}) => {
     const processor = unified()
         .use(hast ? rehypeRemark : undefined)
         .use(remarkMdx)
         .use(remarkGfm)
+        .use(remarkTransformers)
         .use(transform_div)
         .use(readme_to_mdx)
         .use(tables_to_jsx)
@@ -106969,11 +107007,23 @@ const mdx_mdx = (tree, { hast = false, ...opts } = {}) => {
 };
 /* harmony default export */ const lib_mdx = (mdx_mdx);
 
+;// ./processor/transform/migrate-callouts.ts
+
+
+const migrateCallouts = () => (tree) => {
+    visit(tree, 'rdme-callout', callout => {
+        callout.children[0] = wrapHeading(callout);
+    });
+    return tree;
+};
+/* harmony default export */ const migrate_callouts = (migrateCallouts);
+
 ;// ./lib/migrate.ts
 
 
+
 const migrate = (doc, { rdmd }) => {
-    return (lib_mdx(lib_mdastV6(doc, { rdmd }))
+    return (lib_mdx(lib_mdastV6(doc, { rdmd }), { remarkTransformers: [migrate_callouts] })
         .replaceAll(/ /g, ' ')
         // @note: I'm not sure what's happening, but I think mdx is converting an
         // 'a' to 'a' as a means of escaping it. I think this helps with