@tinacms/mdx 1.0.3 → 1.1.0

package/dist/index.js

@@ -244330,29 +244330,6 @@ function mdxJsxElement(node, field, imageCallback) {
         children: [{ type: "text", text: "" }]
       };
     }
-    if (template.match) {
-      const firstChild = node == null ? void 0 : node.children[0];
-      if ((firstChild == null ? void 0 : firstChild.type) === "inlineCode") {
-        const value = firstChild.value;
-        if (node.type === "mdxJsxFlowElement") {
-          return {
-            type: node.type,
-            name: node.name,
-            children: [{ type: "text", text: "" }],
-            props: { text: value }
-          };
-        } else {
-          return {
-            type: node.type,
-            name: node.name,
-            children: [{ type: "text", text: "" }],
-            props: { text: value }
-          };
-        }
-      } else {
-        throw new Error(`Unable to parse value for template match pattern -  start: ${template.match.start}, end: ${template.match.end}`);
-      }
-    }
     const props = extractAttributes(node.attributes, template.fields, imageCallback);
     const childField = template.fields.find((field2) => field2.name === "children");
     if (childField) {
@@ -244679,6 +244656,17 @@ var RichTextParseError = class extends Error {
   }
 };
 
+// src/parse/parseShortcode.ts
+function parseShortcode(preprocessedString, template) {
+  const match = template.match;
+  const unkeyedAttributes = !!template.fields.find((t) => t.name === "_value");
+  const hasChildren = !!template.fields.find((t) => t.name == "children");
+  const replacement = `<${template.name} ${unkeyedAttributes ? '_value="$1"' : "$1"}>${hasChildren ? "$2" : "\n"}</${template.name}>`;
+  const endRegex = `((?:.|\\n)*)${match.start}\\s/\\s*${match.name || template.name}[\\s]*${match.end}`;
+  const regex = `${match.start}\\s*${match.name || template.name}[\\s]+${unkeyedAttributes ? `['"]?(.*?)['"]?` : "(.*?)"}[\\s]*${match.end}${hasChildren ? endRegex : ""}`;
+  return replaceAll(preprocessedString, regex, replacement);
+}
+
 // src/parse/index.ts
 var markdownToAst = (value, field) => {
   var _a;
@@ -244690,8 +244678,7 @@ var markdownToAst = (value, field) => {
     }
     if (template.match) {
       if (preprocessedString) {
-        preprocessedString = replaceAll(preprocessedString, template.match.start, `<${template.name}>\``);
-        preprocessedString = replaceAll(preprocessedString, template.match.end, `\`</${template.name}>`);
+        preprocessedString = parseShortcode(preprocessedString, template);
       }
     }
   });
@@ -244702,6 +244689,7 @@ var markdownToAst = (value, field) => {
     }
     return tree;
   } catch (e) {
+    console.error("error parsing file: ", e);
     throw new RichTextParseError(e, e.position);
   }
 };
@@ -244922,12 +244910,20 @@ ${val}
     }
   });
   if (template.match) {
-    if (attributes[0] && typeof attributes[0].value === "string") {
-      return {
-        attributes: [],
-        children: [{ type: "inlineCode", value: attributes[0].value }]
-      };
-    }
+    return {
+      attributes,
+      children: children && children.length ? children : [
+        {
+          type: "paragraph",
+          children: [
+            {
+              type: "text",
+              value: ""
+            }
+          ]
+        }
+      ]
+    };
   }
   return { attributes, children };
 }
@@ -245141,6 +245137,19 @@ var cleanNode = (node, mark) => {
   return cleanedNode;
 };
 
+// src/stringify/stringifyShortcode.ts
+function stringifyShortcode(preprocessedString, template) {
+  const match = template.match;
+  const unkeyedAttributes = !!template.fields.find((t) => t.name == "_value");
+  const regex = `<[\\s]*${template.name}[\\s]*${unkeyedAttributes ? "(?:_value=(.*?))?" : "(.+?)?"}[\\s]*>[\\s]*((?:.|
+)*?)[\\s]*</[\\s]*${template.name}[\\s]*>`;
+  const closingRegex = `
+$2
+${match.start} /${match.name || template.name} ${match.end}`;
+  const replace = `${match.start} ${match.name || template.name} $1 ${match.end}${template.fields.find((t) => t.name == "children") ? closingRegex : ""}`;
+  return replaceAll(preprocessedString, regex, replace);
+}
+
 // src/stringify/index.ts
 var stringifyMDX = (value, field, imageCallback) => {
   var _a;
@@ -245166,10 +245175,7 @@ var stringifyMDX = (value, field, imageCallback) => {
       throw new Error("Global templates are not supported");
     }
     if (template.match) {
-      preprocessedString = replaceAll(preprocessedString, `<${template.name}>[
-\r\\s]*\``, `${template.match.start} `);
-      preprocessedString = replaceAll(preprocessedString, `\`[
-\r\\s]*</${template.name}>`, ` ${template.match.end}`);
+      preprocessedString = stringifyShortcode(preprocessedString, template);
     }
   });
   return preprocessedString;

package/dist/parse/parseShortcode.d.ts

@@ -0,0 +1,21 @@
+/**
+
+Copyright 2021 Forestry.io Holdings, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+import { Template } from '@tinacms/schema-tools';
+export declare function parseShortcode(preprocessedString: string, template: Template<false> & {
+    inline?: boolean;
+}): string;

package/dist/parse/parseShortcode.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/stringify/stringifyShortcode.d.ts

@@ -0,0 +1,21 @@
+/**
+
+Copyright 2021 Forestry.io Holdings, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+import { Template } from '@tinacms/schema-tools';
+export declare function stringifyShortcode(preprocessedString: string, template: Template<false> & {
+    inline?: boolean;
+}): string;

package/dist/stringify/stringifyShortcode.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -19,7 +19,7 @@
     ]
   },
   "dependencies": {
-    "@tinacms/schema-tools": "1.0.3",
+    "@tinacms/schema-tools": "1.2.0",
     "acorn": "^8.7.1",
     "concat-md": "^0.5.0",
     "lodash-es": "^4.17.21",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@swc/core": "^1.2.210",
     "@swc/jest": "^0.2.21",
-    "@tinacms/scripts": "1.0.0",
+    "@tinacms/scripts": "1.0.1",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/estree-jsx": "^1.0.0",