@tinacms/mdx 1.3.23 → 1.3.24

package/dist/index.browser.mjs

@@ -38352,12 +38352,17 @@ function stringifyProps(element2, parentField, flatten2, imageCallback) {
         }
         break;
       case "object":
+        const result = findAndTransformNestedRichText(
+          field,
+          value,
+          imageCallback
+        );
         attributes2.push({
           type: "mdxJsxAttribute",
           name: name2,
           value: {
             type: "mdxJsxAttributeValueExpression",
-            value: stringifyObj(value, flatten2)
+            value: stringifyObj(result, flatten2)
           }
         });
         break;
@@ -38463,6 +38468,61 @@ function assertShape(value, callback, errorMessage) {
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+var findAndTransformNestedRichText = (field, value, imageCallback, parentValue = {}) => {
+  switch (field.type) {
+    case "rich-text": {
+      assertShape(
+        value,
+        (value2) => value2.type === "root" && Array.isArray(value2.children),
+        `Nested rich-text element is not a valid shape for field ${field.name}`
+      );
+      parentValue[field.name] = stringifyMDX(value, field, imageCallback);
+      break;
+    }
+    case "object": {
+      if (field.list) {
+        if (Array.isArray(value)) {
+          value.forEach((item) => {
+            Object.entries(item).forEach(([key, subValue]) => {
+              if (field.fields) {
+                const subField = field.fields.find(({ name: name2 }) => name2 === key);
+                if (subField) {
+                  findAndTransformNestedRichText(
+                    subField,
+                    subValue,
+                    imageCallback,
+                    item
+                  );
+                }
+              }
+            });
+          });
+        }
+      } else {
+        if (isObject(value)) {
+          Object.entries(value).forEach(([key, subValue]) => {
+            if (field.fields) {
+              const subField = field.fields.find(({ name: name2 }) => name2 === key);
+              if (subField) {
+                findAndTransformNestedRichText(
+                  subField,
+                  subValue,
+                  imageCallback,
+                  value
+                );
+              }
+            }
+          });
+        }
+      }
+      break;
+    }
+  }
+  return value;
+};
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -46649,7 +46709,7 @@ var extractAttribute = (attribute, field, imageCallback) => {
         return extractString(attribute, field);
       }
     case "object":
-      return extractObject(extractExpression(attribute), field);
+      return extractObject(extractExpression(attribute), field, imageCallback);
     case "rich-text":
       const JSXString = extractRaw(attribute);
       if (JSXString) {
@@ -46674,24 +46734,24 @@ var extractScalar = (attribute, field) => {
     return attribute.expression.value;
   }
 };
-var extractObject = (attribute, field) => {
+var extractObject = (attribute, field, imageCallback) => {
   if (field.list) {
     assertType(attribute.expression, "ArrayExpression");
     return attribute.expression.elements.map((element2) => {
       assertHasType(element2);
       assertType(element2, "ObjectExpression");
-      return extractObjectExpression(element2, field);
+      return extractObjectExpression(element2, field, imageCallback);
     });
   } else {
     assertType(attribute.expression, "ObjectExpression");
-    return extractObjectExpression(attribute.expression, field);
+    return extractObjectExpression(attribute.expression, field, imageCallback);
   }
 };
-var extractObjectExpression = (expression, field) => {
+var extractObjectExpression = (expression, field, imageCallback) => {
   const properties = {};
   expression.properties?.forEach((property) => {
     assertType(property, "Property");
-    const { key, value } = extractKeyValue(property, field);
+    const { key, value } = extractKeyValue(property, field, imageCallback);
     properties[key] = value;
   });
   return properties;
@@ -46704,7 +46764,7 @@ var getField = (objectField, name2) => {
     return objectField.fields.find((f) => f.name === name2);
   }
 };
-var extractKeyValue = (property, parentField) => {
+var extractKeyValue = (property, parentField, imageCallback) => {
   assertType(property.key, "Identifier");
   const key = property.key.name;
   const field = getField(parentField, key);
@@ -46714,12 +46774,16 @@ var extractKeyValue = (property, parentField) => {
       const value = property.value.elements.map((element2) => {
         assertHasType(element2);
         assertType(element2, "ObjectExpression");
-        return extractObjectExpression(element2, field);
+        return extractObjectExpression(element2, field, imageCallback);
       });
       return { key, value };
     } else {
       assertType(property.value, "ObjectExpression");
-      const value = extractObjectExpression(property.value, field);
+      const value = extractObjectExpression(
+        property.value,
+        field,
+        imageCallback
+      );
       return { key, value };
     }
   } else if (field?.list) {
@@ -46730,6 +46794,13 @@ var extractKeyValue = (property, parentField) => {
       return element2.value;
     });
     return { key, value };
+  } else if (field?.type === "rich-text") {
+    assertType(property.value, "Literal");
+    const raw = property.value.value;
+    if (typeof raw === "string") {
+      return { key, value: parseMDX(raw, field, imageCallback) };
+    }
+    throw new Error(`Unable to parse rich-text`);
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };

package/dist/index.js

@@ -40236,12 +40236,17 @@ function stringifyProps(element, parentField, flatten2, imageCallback) {
         }
         break;
       case "object":
+        const result = findAndTransformNestedRichText(
+          field,
+          value,
+          imageCallback
+        );
         attributes2.push({
           type: "mdxJsxAttribute",
           name: name2,
           value: {
             type: "mdxJsxAttributeValueExpression",
-            value: stringifyObj(value, flatten2)
+            value: stringifyObj(result, flatten2)
           }
         });
         break;
@@ -40347,6 +40352,61 @@ function assertShape(value, callback, errorMessage) {
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+var findAndTransformNestedRichText = (field, value, imageCallback, parentValue = {}) => {
+  switch (field.type) {
+    case "rich-text": {
+      assertShape(
+        value,
+        (value2) => value2.type === "root" && Array.isArray(value2.children),
+        `Nested rich-text element is not a valid shape for field ${field.name}`
+      );
+      parentValue[field.name] = stringifyMDX(value, field, imageCallback);
+      break;
+    }
+    case "object": {
+      if (field.list) {
+        if (Array.isArray(value)) {
+          value.forEach((item) => {
+            Object.entries(item).forEach(([key, subValue]) => {
+              if (field.fields) {
+                const subField = field.fields.find(({ name: name2 }) => name2 === key);
+                if (subField) {
+                  findAndTransformNestedRichText(
+                    subField,
+                    subValue,
+                    imageCallback,
+                    item
+                  );
+                }
+              }
+            });
+          });
+        }
+      } else {
+        if (isObject(value)) {
+          Object.entries(value).forEach(([key, subValue]) => {
+            if (field.fields) {
+              const subField = field.fields.find(({ name: name2 }) => name2 === key);
+              if (subField) {
+                findAndTransformNestedRichText(
+                  subField,
+                  subValue,
+                  imageCallback,
+                  value
+                );
+              }
+            }
+          });
+        }
+      }
+      break;
+    }
+  }
+  return value;
+};
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -48546,7 +48606,7 @@ var extractAttribute = (attribute, field, imageCallback) => {
         return extractString(attribute, field);
       }
     case "object":
-      return extractObject(extractExpression(attribute), field);
+      return extractObject(extractExpression(attribute), field, imageCallback);
     case "rich-text":
       const JSXString = extractRaw(attribute);
       if (JSXString) {
@@ -48571,25 +48631,25 @@ var extractScalar = (attribute, field) => {
     return attribute.expression.value;
   }
 };
-var extractObject = (attribute, field) => {
+var extractObject = (attribute, field, imageCallback) => {
   if (field.list) {
     assertType(attribute.expression, "ArrayExpression");
     return attribute.expression.elements.map((element) => {
       assertHasType(element);
       assertType(element, "ObjectExpression");
-      return extractObjectExpression(element, field);
+      return extractObjectExpression(element, field, imageCallback);
     });
   } else {
     assertType(attribute.expression, "ObjectExpression");
-    return extractObjectExpression(attribute.expression, field);
+    return extractObjectExpression(attribute.expression, field, imageCallback);
   }
 };
-var extractObjectExpression = (expression, field) => {
+var extractObjectExpression = (expression, field, imageCallback) => {
   var _a3;
   const properties = {};
   (_a3 = expression.properties) == null ? void 0 : _a3.forEach((property) => {
     assertType(property, "Property");
-    const { key, value } = extractKeyValue(property, field);
+    const { key, value } = extractKeyValue(property, field, imageCallback);
     properties[key] = value;
   });
   return properties;
@@ -48602,7 +48662,7 @@ var getField = (objectField, name2) => {
     return objectField.fields.find((f) => f.name === name2);
   }
 };
-var extractKeyValue = (property, parentField) => {
+var extractKeyValue = (property, parentField, imageCallback) => {
   assertType(property.key, "Identifier");
   const key = property.key.name;
   const field = getField(parentField, key);
@@ -48612,12 +48672,16 @@ var extractKeyValue = (property, parentField) => {
       const value = property.value.elements.map((element) => {
         assertHasType(element);
         assertType(element, "ObjectExpression");
-        return extractObjectExpression(element, field);
+        return extractObjectExpression(element, field, imageCallback);
       });
       return { key, value };
     } else {
       assertType(property.value, "ObjectExpression");
-      const value = extractObjectExpression(property.value, field);
+      const value = extractObjectExpression(
+        property.value,
+        field,
+        imageCallback
+      );
       return { key, value };
     }
   } else if (field == null ? void 0 : field.list) {
@@ -48628,6 +48692,13 @@ var extractKeyValue = (property, parentField) => {
       return element.value;
     });
     return { key, value };
+  } else if ((field == null ? void 0 : field.type) === "rich-text") {
+    assertType(property.value, "Literal");
+    const raw = property.value.value;
+    if (typeof raw === "string") {
+      return { key, value: parseMDX(raw, field, imageCallback) };
+    }
+    throw new Error(`Unable to parse rich-text`);
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };

package/dist/index.mjs

@@ -40224,12 +40224,17 @@ function stringifyProps(element, parentField, flatten2, imageCallback) {
         }
         break;
       case "object":
+        const result = findAndTransformNestedRichText(
+          field,
+          value,
+          imageCallback
+        );
         attributes2.push({
           type: "mdxJsxAttribute",
           name: name2,
           value: {
             type: "mdxJsxAttributeValueExpression",
-            value: stringifyObj(value, flatten2)
+            value: stringifyObj(result, flatten2)
           }
         });
         break;
@@ -40335,6 +40340,61 @@ function assertShape(value, callback, errorMessage) {
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+var findAndTransformNestedRichText = (field, value, imageCallback, parentValue = {}) => {
+  switch (field.type) {
+    case "rich-text": {
+      assertShape(
+        value,
+        (value2) => value2.type === "root" && Array.isArray(value2.children),
+        `Nested rich-text element is not a valid shape for field ${field.name}`
+      );
+      parentValue[field.name] = stringifyMDX(value, field, imageCallback);
+      break;
+    }
+    case "object": {
+      if (field.list) {
+        if (Array.isArray(value)) {
+          value.forEach((item) => {
+            Object.entries(item).forEach(([key, subValue]) => {
+              if (field.fields) {
+                const subField = field.fields.find(({ name: name2 }) => name2 === key);
+                if (subField) {
+                  findAndTransformNestedRichText(
+                    subField,
+                    subValue,
+                    imageCallback,
+                    item
+                  );
+                }
+              }
+            });
+          });
+        }
+      } else {
+        if (isObject(value)) {
+          Object.entries(value).forEach(([key, subValue]) => {
+            if (field.fields) {
+              const subField = field.fields.find(({ name: name2 }) => name2 === key);
+              if (subField) {
+                findAndTransformNestedRichText(
+                  subField,
+                  subValue,
+                  imageCallback,
+                  value
+                );
+              }
+            }
+          });
+        }
+      }
+      break;
+    }
+  }
+  return value;
+};
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -48521,7 +48581,7 @@ var extractAttribute = (attribute, field, imageCallback) => {
         return extractString(attribute, field);
       }
     case "object":
-      return extractObject(extractExpression(attribute), field);
+      return extractObject(extractExpression(attribute), field, imageCallback);
     case "rich-text":
       const JSXString = extractRaw(attribute);
       if (JSXString) {
@@ -48546,24 +48606,24 @@ var extractScalar = (attribute, field) => {
     return attribute.expression.value;
   }
 };
-var extractObject = (attribute, field) => {
+var extractObject = (attribute, field, imageCallback) => {
   if (field.list) {
     assertType(attribute.expression, "ArrayExpression");
     return attribute.expression.elements.map((element) => {
       assertHasType(element);
       assertType(element, "ObjectExpression");
-      return extractObjectExpression(element, field);
+      return extractObjectExpression(element, field, imageCallback);
     });
   } else {
     assertType(attribute.expression, "ObjectExpression");
-    return extractObjectExpression(attribute.expression, field);
+    return extractObjectExpression(attribute.expression, field, imageCallback);
   }
 };
-var extractObjectExpression = (expression, field) => {
+var extractObjectExpression = (expression, field, imageCallback) => {
   const properties = {};
   expression.properties?.forEach((property) => {
     assertType(property, "Property");
-    const { key, value } = extractKeyValue(property, field);
+    const { key, value } = extractKeyValue(property, field, imageCallback);
     properties[key] = value;
   });
   return properties;
@@ -48576,7 +48636,7 @@ var getField = (objectField, name2) => {
     return objectField.fields.find((f) => f.name === name2);
   }
 };
-var extractKeyValue = (property, parentField) => {
+var extractKeyValue = (property, parentField, imageCallback) => {
   assertType(property.key, "Identifier");
   const key = property.key.name;
   const field = getField(parentField, key);
@@ -48586,12 +48646,16 @@ var extractKeyValue = (property, parentField) => {
       const value = property.value.elements.map((element) => {
         assertHasType(element);
         assertType(element, "ObjectExpression");
-        return extractObjectExpression(element, field);
+        return extractObjectExpression(element, field, imageCallback);
       });
       return { key, value };
     } else {
       assertType(property.value, "ObjectExpression");
-      const value = extractObjectExpression(property.value, field);
+      const value = extractObjectExpression(
+        property.value,
+        field,
+        imageCallback
+      );
       return { key, value };
     }
   } else if (field?.list) {
@@ -48602,6 +48666,13 @@ var extractKeyValue = (property, parentField) => {
       return element.value;
     });
     return { key, value };
+  } else if (field?.type === "rich-text") {
+    assertType(property.value, "Literal");
+    const raw = property.value.value;
+    if (typeof raw === "string") {
+      return { key, value: parseMDX(raw, field, imageCallback) };
+    }
+    throw new Error(`Unable to parse rich-text`);
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };

package/dist/next/tests/mdx-basic-nested-objects/field.d.ts

@@ -0,0 +1,2 @@
+import { RichTextField } from '@tinacms/schema-tools';
+export declare const field: RichTextField;

package/dist/next/tests/mdx-basic-nested-objects/index.test.d.ts

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

package/dist/next/tests/mdx-basic-nested-objects-2/field.d.ts

@@ -0,0 +1,2 @@
+import { RichTextField } from '@tinacms/schema-tools';
+export declare const field: RichTextField;

package/dist/next/tests/mdx-basic-nested-objects-2/index.test.d.ts

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

package/dist/next/tests/mdx-basic-nested-objects-3/field.d.ts

@@ -0,0 +1,2 @@
+import { RichTextField } from '@tinacms/schema-tools';
+export declare const field: RichTextField;

package/dist/next/tests/mdx-basic-nested-objects-3/index.test.d.ts

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

package/dist/stringify/acorn.d.ts

@@ -1,18 +1,18 @@
-import type { RichTextType } from '@tinacms/schema-tools';
+import type { RichTextField } from '@tinacms/schema-tools';
 import type { MdxJsxAttribute } from 'mdast-util-mdx-jsx';
 import * as Plate from '../parse/plate';
 import type * as Md from 'mdast';
-export declare const stringifyPropsInline: (element: Plate.MdxInlineElement, field: RichTextType, imageCallback: (url: string) => string) => {
+export declare const stringifyPropsInline: (element: Plate.MdxInlineElement, field: RichTextField, imageCallback: (url: string) => string) => {
     attributes: MdxJsxAttribute[];
     children: Md.PhrasingContent[];
 };
-export declare function stringifyProps(element: Plate.MdxInlineElement, parentField: RichTextType, flatten: boolean, imageCallback: (url: string) => string): {
+export declare function stringifyProps(element: Plate.MdxInlineElement, parentField: RichTextField, flatten: boolean, imageCallback: (url: string) => string): {
     attributes: MdxJsxAttribute[];
     children: Md.PhrasingContent[];
     useDirective: boolean;
     directiveType: string;
 };
-export declare function stringifyProps(element: Plate.MdxBlockElement, parentField: RichTextType, flatten: boolean, imageCallback: (url: string) => string): {
+export declare function stringifyProps(element: Plate.MdxBlockElement, parentField: RichTextField, flatten: boolean, imageCallback: (url: string) => string): {
     attributes: MdxJsxAttribute[];
     children: Md.BlockContent[];
     useDirective: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "1.3.23",
+  "version": "1.3.24",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",
   "browser": "dist/index.browser.mjs",