@tinacms/mdx 0.61.16 → 0.61.17

package/dist/index.js

@@ -210126,7 +210126,7 @@ ${fromBody}`;
           const regex = makeRegex(pattern, ignoreCase);
           return new IgnoreRule(origin, pattern, negative, regex);
         };
-        var throwError2 = (message, Ctor) => {
+        var throwError = (message, Ctor) => {
           throw new Ctor(message);
         };
         var checkPath = (path, originalPath, doThrow) => {
@@ -210207,7 +210207,7 @@ ${fromBody}`;
           }
           _test(originalPath, cache, checkUnignored, slices) {
             const path = originalPath && checkPath.convert(originalPath);
-            checkPath(path, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError2);
+            checkPath(path, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError);
             return this._t(path, cache, checkUnignored, slices);
           }
           _t(path, cache, checkUnignored, slices) {
@@ -244207,7 +244207,7 @@ var extractAttribute = (attribute, field, imageCallback) => {
     case "object":
       return extractObject(extractExpression(attribute), field);
     case "rich-text":
-      const JSXString = extractJSXFragment(extractExpression(attribute), attribute, field);
+      const JSXString = extractRaw(attribute);
       if (JSXString) {
         return parseMDX(JSXString, field, imageCallback);
       } else {
@@ -244260,22 +244260,6 @@ var getField = (objectField, name) => {
     return objectField.fields.find((f) => f.name === name);
   }
 };
-var extractJSXFragment = (attribute, baseAttribute, field) => {
-  if (field.list) {
-  } else {
-    if (attribute.expression.type === "JSXFragment") {
-      assertHasType(attribute.expression);
-      if (attribute.expression.children[0]) {
-        const firstChild = attribute.expression.children[0];
-        if (attribute.expression.children[0].type === "JSXText") {
-          const child = firstChild;
-          return child.value.trim();
-        }
-      }
-    }
-  }
-  throwError(field);
-};
 var extractKeyValue = (property, parentField) => {
   assertType(property.key, "Identifier");
   const key = property.key.name;
@@ -244324,6 +244308,13 @@ var extractExpression = (attribute) => {
   assertType(attribute.value, "mdxJsxAttributeValueExpression");
   return extractStatement(attribute.value);
 };
+var extractRaw = (attribute) => {
+  assertType(attribute, "mdxJsxAttribute");
+  assertHasType(attribute.value);
+  assertType(attribute.value, "mdxJsxAttributeValueExpression");
+  const rawValue = attribute.value.value;
+  return trimFragments(rawValue);
+};
 function assertType(val, type) {
   if (val.type !== type) {
     throw new Error(`Expected type to be ${type} but received ${val.type}. ${MDX_PARSE_ERROR_MSG}`);
@@ -244337,8 +244328,27 @@ function assertHasType(val) {
   }
   throw new Error(`Expect value to be an object with property "type"`);
 }
-var throwError = (field) => {
-  throw new Error(`Unexpected expression for field "${field.name}"${field.list ? ' with "list": true' : ""}`);
+var trimFragments = (string3) => {
+  const rawArr = string3.split("\n");
+  let openingFragmentIndex = null;
+  let closingFragmentIndex = null;
+  rawArr.forEach((item, index2) => {
+    if (item.trim() === "<>") {
+      if (!openingFragmentIndex) {
+        openingFragmentIndex = index2 + 1;
+      }
+    }
+  });
+  rawArr.reverse().forEach((item, index2) => {
+    if (item.trim() === "</>") {
+      const length = rawArr.length - 1;
+      if (!closingFragmentIndex) {
+        closingFragmentIndex = length - index2;
+      }
+    }
+  });
+  const value = rawArr.reverse().slice(openingFragmentIndex || 0, closingFragmentIndex || rawArr.length - 1).join("\n");
+  return value;
 };
 
 // src/parse/mdx.ts

package/dist/parse/acorn.d.ts

@@ -18,3 +18,4 @@ limitations under the License.
 import type { MdxJsxAttribute, MdxJsxExpressionAttribute } from 'mdast-util-mdx-jsx';
 import type { TinaFieldBase } from '@tinacms/schema-tools';
 export declare const extractAttributes: (attributes: (MdxJsxAttribute | MdxJsxExpressionAttribute)[], fields: TinaFieldBase[], imageCallback: (image: string) => string) => Record<string, unknown>;
+export declare const trimFragments: (string: string) => string;

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

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

package/dist/tests/autotest/autoformat mdx with deeply nested rich-text elements.test.d.ts

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

package/dist/tests/autotest/mdx with deeply nested rich-text elements.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "0.61.16",
+  "version": "0.61.17",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -19,7 +19,7 @@
     ]
   },
   "dependencies": {
-    "@tinacms/schema-tools": "0.2.1",
+    "@tinacms/schema-tools": "0.2.2",
     "acorn": "^8.7.1",
     "lodash-es": "^4.17.21",
     "mdast-util-mdx-jsx": "^2.0.1",