@tinacms/mdx 0.61.15 → 0.61.17

package/dist/index.js

@@ -6670,7 +6670,7 @@ var require_doc = __commonJS({
                         if (parts.length === 0) {
                           break;
                         }
-                        const [content3, whitespace] = parts;
+                        const [content3, whitespace2] = parts;
                         const contentFlatCmd = [ind, MODE_FLAT, content3];
                         const contentBreakCmd = [ind, MODE_BREAK, content3];
                         const contentFits = fits(contentFlatCmd, [], rem, options, lineSuffix.length > 0, true);
@@ -6682,8 +6682,8 @@ var require_doc = __commonJS({
                           }
                           break;
                         }
-                        const whitespaceFlatCmd = [ind, MODE_FLAT, whitespace];
-                        const whitespaceBreakCmd = [ind, MODE_BREAK, whitespace];
+                        const whitespaceFlatCmd = [ind, MODE_FLAT, whitespace2];
+                        const whitespaceBreakCmd = [ind, MODE_BREAK, whitespace2];
                         if (parts.length === 2) {
                           if (contentFits) {
                             cmds.push(whitespaceFlatCmd, contentFlatCmd);
@@ -6695,7 +6695,7 @@ var require_doc = __commonJS({
                         parts.splice(0, 2);
                         const remainingCmd = [ind, mode, fill(parts)];
                         const secondContent = parts[0];
-                        const firstAndSecondContentFlatCmd = [ind, MODE_FLAT, [content3, whitespace, secondContent]];
+                        const firstAndSecondContentFlatCmd = [ind, MODE_FLAT, [content3, whitespace2, secondContent]];
                         const firstAndSecondContentFits = fits(firstAndSecondContentFlatCmd, [], rem, options, lineSuffix.length > 0, true);
                         if (firstAndSecondContentFits) {
                           cmds.push(remainingCmd, whitespaceFlatCmd, contentFlatCmd);
@@ -197710,7 +197710,7 @@ var require_prettier = __commonJS({
             const {
               logger = console,
               descriptor = defaults_1.defaultDescriptor,
-              unknown: unknown2 = defaults_1.defaultUnknownHandler,
+              unknown: unknown3 = defaults_1.defaultUnknownHandler,
               invalid: invalid2 = defaults_1.defaultInvalidHandler,
               deprecated = defaults_1.defaultDeprecatedHandler
             } = opts || {};
@@ -197727,7 +197727,7 @@ var require_prettier = __commonJS({
               normalizeRedirectResult: utils_1.normalizeRedirectResult,
               normalizeValidateResult: utils_1.normalizeValidateResult
             };
-            this._unknownHandler = unknown2;
+            this._unknownHandler = unknown3;
             this._invalidHandler = invalid2;
             this._deprecatedHandler = deprecated;
             this.cleanHistory();
@@ -197926,7 +197926,7 @@ var require_prettier = __commonJS({
           colorsModule = null,
           levenshteinDistance = null
         } = {}) {
-          const unknown2 = !passThrough ? (key, value, options2) => {
+          const unknown3 = !passThrough ? (key, value, options2) => {
             const _options2$schemas = options2.schemas, {
               _
             } = _options2$schemas, schemas2 = _objectWithoutProperties(_options2$schemas, _excluded2);
@@ -197946,7 +197946,7 @@ var require_prettier = __commonJS({
           });
           const normalizer = new vnopts.Normalizer(schemas, {
             logger,
-            unknown: unknown2,
+            unknown: unknown3,
             descriptor
           });
           const shouldSuppressDuplicateDeprecationWarnings = logger !== false;
@@ -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) {
@@ -243985,6 +243985,49 @@ function remarkMdx(options = {}) {
   }
 }
 
+// ../../../node_modules/.pnpm/hast-util-whitespace@2.0.0/node_modules/hast-util-whitespace/index.js
+function whitespace(thing) {
+  var value = thing && typeof thing === "object" && thing.type === "text" ? thing.value || "" : thing;
+  return typeof value === "string" && value.replace(/[ \t\n\f\r]/g, "") === "";
+}
+
+// ../../../node_modules/.pnpm/remark-unwrap-images@3.0.1/node_modules/remark-unwrap-images/index.js
+var unknown2 = 1;
+var containsImage = 2;
+var containsOther = 3;
+function remarkUnwrapImages() {
+  return (tree) => {
+    visit(tree, "paragraph", (node, index2, parent) => {
+      if (parent && typeof index2 === "number" && applicable(node) === containsImage) {
+        parent.children.splice(index2, 1, ...node.children);
+        return [SKIP, index2];
+      }
+    });
+  };
+}
+function applicable(node, inLink) {
+  let image2 = unknown2;
+  let index2 = -1;
+  while (++index2 < node.children.length) {
+    const child = node.children[index2];
+    if (whitespace(child)) {
+    } else if (child.type === "image" || child.type === "imageReference") {
+      image2 = containsImage;
+    } else if (!inLink && (child.type === "link" || child.type === "linkReference")) {
+      const linkResult = applicable(child, true);
+      if (linkResult === containsOther) {
+        return containsOther;
+      }
+      if (linkResult === containsImage) {
+        image2 = containsImage;
+      }
+    } else {
+      return containsOther;
+    }
+  }
+  return image2;
+}
+
 // ../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_freeGlobal.js
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 var freeGlobal_default = freeGlobal;
@@ -244164,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 {
@@ -244217,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;
@@ -244281,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}`);
@@ -244294,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
@@ -244386,6 +244439,8 @@ var remarkToSlate = (root3, field, imageCallback) => {
         return code2(content4);
       case "paragraph":
         return paragraph2(content4);
+      case "image":
+        return image2(content4);
       case "mdxJsxFlowElement":
         return mdxJsxElement(content4, field, imageCallback);
       case "thematicBreak":
@@ -244690,6 +244745,7 @@ var markdownToAst = (value, field) => {
     if (!tree) {
       throw new Error("Error parsing markdown");
     }
+    remarkUnwrapImages({})(tree);
     return tree;
   } catch (e) {
     throw new RichTextParseError(e, e.position);

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.15",
+  "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.0",
+    "@tinacms/schema-tools": "0.2.2",
     "acorn": "^8.7.1",
     "lodash-es": "^4.17.21",
     "mdast-util-mdx-jsx": "^2.0.1",
@@ -27,6 +27,7 @@
     "prettier": "^2.7.1",
     "remark": "^14.0.2",
     "remark-mdx": "^2.1.2",
+    "remark-unwrap-images": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^4.2.0"
   },