@tinacms/mdx 2.1.3 → 2.1.5

package/dist/index.browser.js

@@ -26368,6 +26368,9 @@ var hoistAllTemplates = (field, templates = []) => {
 // src/next/stringify/to-markdown.ts
 var toTinaMarkdown = (tree, field) => {
   const patterns = getFieldPatterns(field);
+  const hasJsxTemplates = (field.templates ?? []).some(
+    (t) => typeof t !== "string" && !t.match
+  );
   const handlers = {};
   handlers["text"] = (node2, parent, context, safeOptions) => {
     context.unsafe = context.unsafe.filter((unsafeItem) => {
@@ -26380,7 +26383,7 @@ var toTinaMarkdown = (tree, field) => {
       if (field.parser.skipEscaping === "all") {
         return node2.value;
       }
-      if (field.parser.skipEscaping === "html") {
+      if (field.parser.skipEscaping === "html" || hasJsxTemplates) {
         context.unsafe = context.unsafe.filter((unsafeItem) => {
           if (unsafeItem.character === "<") {
             return false;
@@ -41311,7 +41314,10 @@ var markAttributes = (content3) => {
     {
       type: "mdxJsxAttribute",
       name: "style",
-      value: `background-color: ${content3.highlightColor}`
+      value: {
+        type: "mdxJsxAttributeValueExpression",
+        value: `{ backgroundColor: "${content3.highlightColor}" }`
+      }
     }
   ];
 };
@@ -42153,7 +42159,10 @@ var markAttributes2 = (content3) => {
     {
       type: "mdxJsxAttribute",
       name: "style",
-      value: `background-color: ${content3.highlightColor}`
+      value: {
+        type: "mdxJsxAttributeValueExpression",
+        value: `{ backgroundColor: "${content3.highlightColor}" }`
+      }
     }
   ];
 };
@@ -48718,13 +48727,27 @@ var getHighlightColorFromAttributes = (attributes2 = []) => {
   const styleAttribute = attributes2.find(
     (attribute) => attribute.type === "mdxJsxAttribute" && attribute.name === "style"
   );
-  if (!styleAttribute || typeof styleAttribute.value !== "string") {
+  if (!styleAttribute) {
     return void 0;
   }
-  const backgroundColorMatch = /background-color:\s*([^;]+)/i.exec(
-    styleAttribute.value
-  );
-  return backgroundColorMatch?.[1]?.trim();
+  if (typeof styleAttribute.value === "string") {
+    const backgroundColorMatch = /background-color:\s*([^;]+)/i.exec(
+      styleAttribute.value
+    );
+    return backgroundColorMatch?.[1]?.trim();
+  }
+  if (styleAttribute.value && typeof styleAttribute.value === "object" && styleAttribute.value.type === "mdxJsxAttributeValueExpression") {
+    const expression = styleAttribute.value.value;
+    const camelMatch = /['"]?backgroundColor['"]?\s*:\s*['"]?([^'",}\s]+)['"]?/.exec(expression);
+    if (camelMatch?.[1]) {
+      return camelMatch[1].trim();
+    }
+    const kebabMatch = /['"]?background-color['"]?\s*:\s*['"]?([^'",}\s]+)['"]?/.exec(
+      expression
+    );
+    return kebabMatch?.[1]?.trim();
+  }
+  return void 0;
 };
 var parseMarkMdxText = (content3, extraMarks = {}, parseChild) => {
   if (content3.name !== "mark") {

package/dist/index.js

@@ -28234,6 +28234,9 @@ var hoistAllTemplates = (field, templates = []) => {
 // src/next/stringify/to-markdown.ts
 var toTinaMarkdown = (tree, field) => {
   const patterns = getFieldPatterns(field);
+  const hasJsxTemplates = (field.templates ?? []).some(
+    (t) => typeof t !== "string" && !t.match
+  );
   const handlers = {};
   handlers["text"] = (node2, parent, context, safeOptions) => {
     context.unsafe = context.unsafe.filter((unsafeItem) => {
@@ -28246,7 +28249,7 @@ var toTinaMarkdown = (tree, field) => {
       if (field.parser.skipEscaping === "all") {
         return node2.value;
       }
-      if (field.parser.skipEscaping === "html") {
+      if (field.parser.skipEscaping === "html" || hasJsxTemplates) {
         context.unsafe = context.unsafe.filter((unsafeItem) => {
           if (unsafeItem.character === "<") {
             return false;
@@ -43177,7 +43180,10 @@ var markAttributes = (content3) => {
     {
       type: "mdxJsxAttribute",
       name: "style",
-      value: `background-color: ${content3.highlightColor}`
+      value: {
+        type: "mdxJsxAttributeValueExpression",
+        value: `{ backgroundColor: "${content3.highlightColor}" }`
+      }
     }
   ];
 };
@@ -44019,7 +44025,10 @@ var markAttributes2 = (content3) => {
     {
       type: "mdxJsxAttribute",
       name: "style",
-      value: `background-color: ${content3.highlightColor}`
+      value: {
+        type: "mdxJsxAttributeValueExpression",
+        value: `{ backgroundColor: "${content3.highlightColor}" }`
+      }
     }
   ];
 };
@@ -50584,13 +50593,27 @@ var getHighlightColorFromAttributes = (attributes2 = []) => {
   const styleAttribute = attributes2.find(
     (attribute) => attribute.type === "mdxJsxAttribute" && attribute.name === "style"
   );
-  if (!styleAttribute || typeof styleAttribute.value !== "string") {
+  if (!styleAttribute) {
     return void 0;
   }
-  const backgroundColorMatch = /background-color:\s*([^;]+)/i.exec(
-    styleAttribute.value
-  );
-  return backgroundColorMatch?.[1]?.trim();
+  if (typeof styleAttribute.value === "string") {
+    const backgroundColorMatch = /background-color:\s*([^;]+)/i.exec(
+      styleAttribute.value
+    );
+    return backgroundColorMatch?.[1]?.trim();
+  }
+  if (styleAttribute.value && typeof styleAttribute.value === "object" && styleAttribute.value.type === "mdxJsxAttributeValueExpression") {
+    const expression = styleAttribute.value.value;
+    const camelMatch = /['"]?backgroundColor['"]?\s*:\s*['"]?([^'",}\s]+)['"]?/.exec(expression);
+    if (camelMatch?.[1]) {
+      return camelMatch[1].trim();
+    }
+    const kebabMatch = /['"]?background-color['"]?\s*:\s*['"]?([^'",}\s]+)['"]?/.exec(
+      expression
+    );
+    return kebabMatch?.[1]?.trim();
+  }
+  return void 0;
 };
 var parseMarkMdxText = (content3, extraMarks = {}, parseChild) => {
   if (content3.name !== "mark") {

package/dist/next/tests/markdown-basic-escapes/field.d.ts

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

package/dist/next/tests/markdown-basic-escapes/index.test.d.ts

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

package/dist/next/tests/markdown-basic-tables-escapes/field.d.ts

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

package/dist/next/tests/markdown-basic-tables-escapes/index.test.d.ts

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

package/dist/next/tests/markdown-basic-unicode/field.d.ts

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

package/dist/next/tests/markdown-basic-unicode/index.test.d.ts

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

package/dist/next/tests/mdx-jsx-conditional-expression-attribute/field.d.ts

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

package/dist/next/tests/mdx-jsx-conditional-expression-attribute/index.test.d.ts

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

package/dist/next/tests/mdx-jsx-empty-expression/field.d.ts

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

package/dist/next/tests/mdx-jsx-empty-expression/index.test.d.ts

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

package/dist/next/tests/mdx-jsx-in-blockquote/field.d.ts

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

package/dist/next/tests/mdx-jsx-in-blockquote/index.test.d.ts

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

package/dist/next/tests/mdx-jsx-template-literal-attribute/field.d.ts

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

package/dist/next/tests/mdx-jsx-template-literal-attribute/index.test.d.ts

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

package/dist/next/tests/mdx-jsx-unary-expression-attribute/field.d.ts

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

package/dist/next/tests/mdx-jsx-unary-expression-attribute/index.test.d.ts

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

package/dist/repro-large-file.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,7 +55,7 @@
     "unist-util-visit": "4.1.2",
     "uvu": "0.5.6",
     "vfile-message": "3.1.4",
-    "@tinacms/schema-tools": "2.7.3"
+    "@tinacms/schema-tools": "2.8.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -78,7 +78,7 @@
     "typescript": "^5.7.3",
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
-    "@tinacms/scripts": "1.6.0"
+    "@tinacms/scripts": "1.6.1"
   },
   "scripts": {
     "types": "tsc",