@readme/markdown 7.4.3 → 7.5.1

package/README.md

@@ -50,6 +50,14 @@ A module ([`RMDXModule`](#rmdxmodule)) of renderable components
 
 Compiles an ast to mdx.
 
+###### Parameters
+
+Extends [`remark-stringify` options](https://github.com/remarkjs/remark/tree/main/packages/remark-stringify#options).
+
+###### Returns
+
+An mdx string.
+
 #### `mdast`
 
 Parses mdx to an mdast.

package/dist/lib/mdx.d.ts

@@ -1,4 +1,4 @@
-export declare const mdx: (tree: any, { hast }?: {
+export declare const mdx: (tree: any, { hast, ...opts }?: {
     hast?: boolean;
 }) => string;
 export default mdx;

package/dist/main.js

@@ -47933,6 +47933,9 @@ const getAttrs = (jsx) => jsx.attributes.reduce((memo, attr) => {
         if (typeof attr.value === 'string') {
             memo[attr.name] = attr.value;
         }
+        else if (attr.value === null) {
+            memo[attr.name] = true;
+        }
         else if (attr.value.value !== 'undefined') {
             memo[attr.name] = JSON.parse(attr.value.value);
         }
@@ -48007,15 +48010,15 @@ const reformatHTML = (html, indent = 2) => {
 const toAttributes = (object, keys = []) => {
     let attributes = [];
     Object.entries(object).forEach(([name, v]) => {
-        if ((keys.length > 0 && !keys.includes(name)) || typeof v === 'undefined')
+        if (keys.length > 0 && !keys.includes(name))
             return;
         let value;
-        if (typeof v === 'string') {
-            value = v;
-        }
-        else if (typeof v === 'undefined') {
+        if (typeof v === 'undefined' || v === null || v === '') {
             return;
         }
+        else if (typeof v === 'string') {
+            value = v;
+        }
         else {
             /* values can be null, undefined, string, or a expression, eg:
              *
@@ -48057,18 +48060,21 @@ const imageTransformer = () => (tree) => {
         if (parent.type !== 'root' || ((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) > 1 || node.children[0].type !== 'image')
             return;
         const [{ alt, url, title }] = node.children;
-        const newNode = {
-            type: NodeTypes.imageBlock,
+        const attrs = {
             alt,
             title,
-            url,
             children: [],
+            src: url,
+        };
+        const newNode = Object.assign(Object.assign({ type: NodeTypes.imageBlock }, attrs), { 
+            /*
+             * @note: Using data.hName here means that we don't have to transform
+             * this to an MdxJsxFlowElement, and rehype will transform it correctly
+             */
             data: {
                 hName: 'img',
-                hProperties: Object.assign(Object.assign(Object.assign({}, (alt && { alt })), { src: url }), (title && { title })),
-            },
-            position: node.position,
-        };
+                hProperties: attrs,
+            }, position: node.position });
         parent.children.splice(i, 1, newNode);
     });
     const isImage = (node) => node.name === 'Image';
@@ -65163,20 +65169,12 @@ const coerceJsxToMd = ({ components = {}, html = false } = {}) => (node, index,
     }
     else if (node.name === 'Image') {
         const { position } = node;
-        const { alt = '', url, title = null } = getAttrs(node);
-        const attrs = getAttrs(node);
-        const mdNode = {
-            alt,
-            position,
-            children: attrs.caption ? lib_mdast(attrs.caption).children : node.children,
-            title,
-            type: NodeTypes.imageBlock,
-            url: url || attrs.src,
-            data: {
+        const { alt = '', align, border, caption, title = null, width, src, } = getAttrs(node);
+        const attrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (align && { align })), (border && { border })), (src && { src })), (width && { width })), { alt, children: caption ? lib_mdast(caption).children : node.children, title });
+        const mdNode = Object.assign(Object.assign({}, attrs), { position, type: NodeTypes.imageBlock, data: {
                 hName: 'img',
                 hProperties: attrs,
-            },
-        };
+            } });
         parent.children[index] = mdNode;
     }
     else if (node.name === 'HTMLBlock') {
@@ -65330,15 +65328,23 @@ const readmeToMdx = () => tree => {
             });
         }
         else {
-            parent.children.splice(index, 1, {
-                type: 'image',
-                children: [],
-                url: image.url,
-                title: image.title,
-                alt: image.alt,
-            });
+            parent.children.splice(index, 1, Object.assign(Object.assign(Object.assign({ type: 'image', children: [] }, (image.src && { url: image.src })), (image.title && { title: image.title })), (image.alt && { alt: image.alt })));
         }
     });
+    visit(tree, 'html', (node, index, parent) => {
+        const html = node.value;
+        const isScriptOrStyleTag = [!!html.match(/^<(?:style|script)/i), !!html.match(/<\/(?:style|script)>$/i)];
+        if (!isScriptOrStyleTag.includes(true))
+            return;
+        parent.children.splice(index, 1, {
+            type: 'html-block',
+            children: [{ type: 'text', value: html }],
+            data: {
+                hName: 'html-block',
+                hProperties: { html },
+            },
+        });
+    });
     return tree;
 };
 /* harmony default export */ const readme_to_mdx = (readmeToMdx);
@@ -93982,6 +93988,17 @@ function compilers() {
 /* harmony default export */ const processor_compile = (compilers);
 
 ;// CONCATENATED MODULE: ./lib/mdx.ts
+var mdx_rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 
 
 
@@ -93989,7 +94006,8 @@ function compilers() {
 
 
 
-const mdx_mdx = (tree, { hast = false } = {}) => {
+const mdx_mdx = (tree, _a = {}) => {
+    var { hast = false } = _a, opts = mdx_rest(_a, ["hast"]);
     const processor = unified()
         .use(hast ? rehypeRemark : undefined)
         .use(remarkMdx)
@@ -93998,7 +94016,7 @@ const mdx_mdx = (tree, { hast = false } = {}) => {
         .use(readme_to_mdx)
         .use(tables_to_jsx)
         .use(processor_compile)
-        .use(remarkStringify);
+        .use(remarkStringify, opts);
     return processor.stringify(processor.runSync(tree));
 };
 /* harmony default export */ const lib_mdx = (mdx_mdx);

package/dist/main.node.js

@@ -48920,6 +48920,9 @@ const getAttrs = (jsx) => jsx.attributes.reduce((memo, attr) => {
         if (typeof attr.value === 'string') {
             memo[attr.name] = attr.value;
         }
+        else if (attr.value === null) {
+            memo[attr.name] = true;
+        }
         else if (attr.value.value !== 'undefined') {
             memo[attr.name] = JSON.parse(attr.value.value);
         }
@@ -48994,15 +48997,15 @@ const reformatHTML = (html, indent = 2) => {
 const toAttributes = (object, keys = []) => {
     let attributes = [];
     Object.entries(object).forEach(([name, v]) => {
-        if ((keys.length > 0 && !keys.includes(name)) || typeof v === 'undefined')
+        if (keys.length > 0 && !keys.includes(name))
             return;
         let value;
-        if (typeof v === 'string') {
-            value = v;
-        }
-        else if (typeof v === 'undefined') {
+        if (typeof v === 'undefined' || v === null || v === '') {
             return;
         }
+        else if (typeof v === 'string') {
+            value = v;
+        }
         else {
             /* values can be null, undefined, string, or a expression, eg:
              *
@@ -49044,18 +49047,21 @@ const imageTransformer = () => (tree) => {
         if (parent.type !== 'root' || ((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) > 1 || node.children[0].type !== 'image')
             return;
         const [{ alt, url, title }] = node.children;
-        const newNode = {
-            type: NodeTypes.imageBlock,
+        const attrs = {
             alt,
             title,
-            url,
             children: [],
+            src: url,
+        };
+        const newNode = Object.assign(Object.assign({ type: NodeTypes.imageBlock }, attrs), { 
+            /*
+             * @note: Using data.hName here means that we don't have to transform
+             * this to an MdxJsxFlowElement, and rehype will transform it correctly
+             */
             data: {
                 hName: 'img',
-                hProperties: Object.assign(Object.assign(Object.assign({}, (alt && { alt })), { src: url }), (title && { title })),
-            },
-            position: node.position,
-        };
+                hProperties: attrs,
+            }, position: node.position });
         parent.children.splice(i, 1, newNode);
     });
     const isImage = (node) => node.name === 'Image';
@@ -66150,20 +66156,12 @@ const coerceJsxToMd = ({ components = {}, html = false } = {}) => (node, index,
     }
     else if (node.name === 'Image') {
         const { position } = node;
-        const { alt = '', url, title = null } = getAttrs(node);
-        const attrs = getAttrs(node);
-        const mdNode = {
-            alt,
-            position,
-            children: attrs.caption ? lib_mdast(attrs.caption).children : node.children,
-            title,
-            type: NodeTypes.imageBlock,
-            url: url || attrs.src,
-            data: {
+        const { alt = '', align, border, caption, title = null, width, src, } = getAttrs(node);
+        const attrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (align && { align })), (border && { border })), (src && { src })), (width && { width })), { alt, children: caption ? lib_mdast(caption).children : node.children, title });
+        const mdNode = Object.assign(Object.assign({}, attrs), { position, type: NodeTypes.imageBlock, data: {
                 hName: 'img',
                 hProperties: attrs,
-            },
-        };
+            } });
         parent.children[index] = mdNode;
     }
     else if (node.name === 'HTMLBlock') {
@@ -66317,15 +66315,23 @@ const readmeToMdx = () => tree => {
             });
         }
         else {
-            parent.children.splice(index, 1, {
-                type: 'image',
-                children: [],
-                url: image.url,
-                title: image.title,
-                alt: image.alt,
-            });
+            parent.children.splice(index, 1, Object.assign(Object.assign(Object.assign({ type: 'image', children: [] }, (image.src && { url: image.src })), (image.title && { title: image.title })), (image.alt && { alt: image.alt })));
         }
     });
+    visit(tree, 'html', (node, index, parent) => {
+        const html = node.value;
+        const isScriptOrStyleTag = [!!html.match(/^<(?:style|script)/i), !!html.match(/<\/(?:style|script)>$/i)];
+        if (!isScriptOrStyleTag.includes(true))
+            return;
+        parent.children.splice(index, 1, {
+            type: 'html-block',
+            children: [{ type: 'text', value: html }],
+            data: {
+                hName: 'html-block',
+                hProperties: { html },
+            },
+        });
+    });
     return tree;
 };
 /* harmony default export */ const readme_to_mdx = (readmeToMdx);
@@ -94969,6 +94975,17 @@ function compilers() {
 /* harmony default export */ const processor_compile = (compilers);
 
 ;// CONCATENATED MODULE: ./lib/mdx.ts
+var mdx_rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 
 
 
@@ -94976,7 +94993,8 @@ function compilers() {
 
 
 
-const mdx_mdx = (tree, { hast = false } = {}) => {
+const mdx_mdx = (tree, _a = {}) => {
+    var { hast = false } = _a, opts = mdx_rest(_a, ["hast"]);
     const processor = unified()
         .use(hast ? rehypeRemark : undefined)
         .use(remarkMdx)
@@ -94985,7 +95003,7 @@ const mdx_mdx = (tree, { hast = false } = {}) => {
         .use(readme_to_mdx)
         .use(tables_to_jsx)
         .use(processor_compile)
-        .use(remarkStringify);
+        .use(remarkStringify, opts);
     return processor.stringify(processor.runSync(tree));
 };
 /* harmony default export */ const lib_mdx = (mdx_mdx);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <rafe@readme.io>",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "main": "dist/main.node.js",
   "types": "dist/index.d.ts",
   "browser": "dist/main.js",