@tinacms/mdx 1.3.15 → 1.3.17

package/dist/index.browser.mjs

@@ -52,7 +52,7 @@ var require_extend = __commonJS({
       }
       return toStr.call(arr) === "[object Array]";
     };
-    var isPlainObject2 = function isPlainObject3(obj) {
+    var isPlainObject3 = function isPlainObject4(obj) {
       if (!obj || toStr.call(obj) !== "[object Object]") {
         return false;
       }
@@ -109,12 +109,12 @@ var require_extend = __commonJS({
             src = getProperty(target, name2);
             copy = getProperty(options, name2);
             if (target !== copy) {
-              if (deep && copy && (isPlainObject2(copy) || (copyIsArray = isArray4(copy)))) {
+              if (deep && copy && (isPlainObject3(copy) || (copyIsArray = isArray4(copy)))) {
                 if (copyIsArray) {
                   copyIsArray = false;
                   clone = src && isArray4(src) ? src : [];
                 } else {
-                  clone = src && isPlainObject2(src) ? src : {};
+                  clone = src && isPlainObject3(src) ? src : {};
                 }
                 setProperty(target, { name: name2, newValue: extend4(deep, clone, copy) });
               } else if (typeof copy !== "undefined") {
@@ -35419,6 +35419,9 @@ function stringifyProps(element2, parentField, flatten2, imageCallback) {
         } else {
           const joiner = flatten2 ? " " : "\n";
           let val = "";
+          if (isPlainObject2(value) && Object.keys(value).length === 0) {
+            return;
+          }
           assertShape(
             value,
             (value2) => value2.type === "root" && Array.isArray(value2.children),
@@ -35504,6 +35507,9 @@ function assertShape(value, callback, errorMessage) {
     throw new Error(errorMessage || `Failed to assert shape`);
   }
 }
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -45363,6 +45369,14 @@ var extractKeyValue = (property, parentField) => {
       const value = extractObjectExpression(property.value, field);
       return { key, value };
     }
+  } else if (field?.list) {
+    assertType(property.value, "ArrayExpression");
+    const value = property.value.elements.map((element2) => {
+      assertHasType(element2);
+      assertType(element2, "Literal");
+      return element2.value;
+    });
+    return { key, value };
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };
@@ -45735,7 +45749,7 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
   const link2 = (content5) => {
     return {
       type: "a",
-      url: content5.url,
+      url: sanitizeUrl(content5.url),
       title: content5.title,
       children: flatten_default(
         content5.children.map((child) => staticPhrasingContent(child))
@@ -45849,7 +45863,12 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
         const children = flatten_default(
           node.children.map((child) => phrashingMark(child, marks))
         );
-        accum.push({ type: "a", url: node.url, title: node.title, children });
+        accum.push({
+          type: "a",
+          url: sanitizeUrl(node.url),
+          title: node.title,
+          children
+        });
         break;
       }
       case "text":
@@ -45931,6 +45950,30 @@ var RichTextParseError = class extends Error {
     this.position = position2;
   }
 };
+var sanitizeUrl = (url) => {
+  const allowedSchemes = ["http", "https", "mailto", "tel"];
+  if (!url)
+    return "";
+  let parsedUrl = null;
+  try {
+    parsedUrl = new URL(url);
+  } catch (error) {
+    return url;
+  }
+  const scheme = parsedUrl.protocol.slice(0, -1);
+  if (allowedSchemes && !allowedSchemes.includes(scheme)) {
+    console.warn(`Invalid URL scheme detected ${scheme}`);
+    return "";
+  }
+  if (parsedUrl.pathname === "/") {
+    if (url.endsWith("/")) {
+      return parsedUrl.href;
+    }
+    return parsedUrl.origin;
+  } else {
+    return parsedUrl.href;
+  }
+};
 
 // src/next/parse/post-processing.ts
 var postProcessor = (tree, field, imageCallback) => {

package/dist/index.js

@@ -49,7 +49,7 @@ var require_extend = __commonJS({
       }
       return toStr.call(arr) === "[object Array]";
     };
-    var isPlainObject2 = function isPlainObject3(obj) {
+    var isPlainObject3 = function isPlainObject4(obj) {
       if (!obj || toStr.call(obj) !== "[object Object]") {
         return false;
       }
@@ -106,12 +106,12 @@ var require_extend = __commonJS({
             src = getProperty(target, name2);
             copy = getProperty(options, name2);
             if (target !== copy) {
-              if (deep && copy && (isPlainObject2(copy) || (copyIsArray = isArray4(copy)))) {
+              if (deep && copy && (isPlainObject3(copy) || (copyIsArray = isArray4(copy)))) {
                 if (copyIsArray) {
                   copyIsArray = false;
                   clone = src && isArray4(src) ? src : [];
                 } else {
-                  clone = src && isPlainObject2(src) ? src : {};
+                  clone = src && isPlainObject3(src) ? src : {};
                 }
                 setProperty(target, { name: name2, newValue: extend4(deep, clone, copy) });
               } else if (typeof copy !== "undefined") {
@@ -37303,6 +37303,9 @@ function stringifyProps(element, parentField, flatten2, imageCallback) {
         } else {
           const joiner = flatten2 ? " " : "\n";
           let val = "";
+          if (isPlainObject2(value) && Object.keys(value).length === 0) {
+            return;
+          }
           assertShape(
             value,
             (value2) => value2.type === "root" && Array.isArray(value2.children),
@@ -37388,6 +37391,9 @@ function assertShape(value, callback, errorMessage) {
     throw new Error(errorMessage || `Failed to assert shape`);
   }
 }
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -47259,6 +47265,14 @@ var extractKeyValue = (property, parentField) => {
       const value = extractObjectExpression(property.value, field);
       return { key, value };
     }
+  } else if (field == null ? void 0 : field.list) {
+    assertType(property.value, "ArrayExpression");
+    const value = property.value.elements.map((element) => {
+      assertHasType(element);
+      assertType(element, "Literal");
+      return element.value;
+    });
+    return { key, value };
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };
@@ -47635,7 +47649,7 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
   const link2 = (content5) => {
     return {
       type: "a",
-      url: content5.url,
+      url: sanitizeUrl(content5.url),
       title: content5.title,
       children: flatten_default(
         content5.children.map((child) => staticPhrasingContent(child))
@@ -47749,7 +47763,12 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
         const children = flatten_default(
           node.children.map((child) => phrashingMark(child, marks))
         );
-        accum.push({ type: "a", url: node.url, title: node.title, children });
+        accum.push({
+          type: "a",
+          url: sanitizeUrl(node.url),
+          title: node.title,
+          children
+        });
         break;
       }
       case "text":
@@ -47831,6 +47850,30 @@ var RichTextParseError = class extends Error {
     this.position = position2;
   }
 };
+var sanitizeUrl = (url) => {
+  const allowedSchemes = ["http", "https", "mailto", "tel"];
+  if (!url)
+    return "";
+  let parsedUrl = null;
+  try {
+    parsedUrl = new URL(url);
+  } catch (error) {
+    return url;
+  }
+  const scheme = parsedUrl.protocol.slice(0, -1);
+  if (allowedSchemes && !allowedSchemes.includes(scheme)) {
+    console.warn(`Invalid URL scheme detected ${scheme}`);
+    return "";
+  }
+  if (parsedUrl.pathname === "/") {
+    if (url.endsWith("/")) {
+      return parsedUrl.href;
+    }
+    return parsedUrl.origin;
+  } else {
+    return parsedUrl.href;
+  }
+};
 
 // src/next/parse/post-processing.ts
 var postProcessor = (tree, field, imageCallback) => {

package/dist/index.mjs

@@ -52,7 +52,7 @@ var require_extend = __commonJS({
       }
       return toStr.call(arr) === "[object Array]";
     };
-    var isPlainObject2 = function isPlainObject3(obj) {
+    var isPlainObject3 = function isPlainObject4(obj) {
       if (!obj || toStr.call(obj) !== "[object Object]") {
         return false;
       }
@@ -109,12 +109,12 @@ var require_extend = __commonJS({
             src = getProperty(target, name2);
             copy = getProperty(options, name2);
             if (target !== copy) {
-              if (deep && copy && (isPlainObject2(copy) || (copyIsArray = isArray4(copy)))) {
+              if (deep && copy && (isPlainObject3(copy) || (copyIsArray = isArray4(copy)))) {
                 if (copyIsArray) {
                   copyIsArray = false;
                   clone = src && isArray4(src) ? src : [];
                 } else {
-                  clone = src && isPlainObject2(src) ? src : {};
+                  clone = src && isPlainObject3(src) ? src : {};
                 }
                 setProperty(target, { name: name2, newValue: extend4(deep, clone, copy) });
               } else if (typeof copy !== "undefined") {
@@ -37291,6 +37291,9 @@ function stringifyProps(element, parentField, flatten2, imageCallback) {
         } else {
           const joiner = flatten2 ? " " : "\n";
           let val = "";
+          if (isPlainObject2(value) && Object.keys(value).length === 0) {
+            return;
+          }
           assertShape(
             value,
             (value2) => value2.type === "root" && Array.isArray(value2.children),
@@ -37376,6 +37379,9 @@ function assertShape(value, callback, errorMessage) {
     throw new Error(errorMessage || `Failed to assert shape`);
   }
 }
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/stringify/marks.ts
 var matches = (a, b) => {
@@ -47235,6 +47241,14 @@ var extractKeyValue = (property, parentField) => {
       const value = extractObjectExpression(property.value, field);
       return { key, value };
     }
+  } else if (field?.list) {
+    assertType(property.value, "ArrayExpression");
+    const value = property.value.elements.map((element) => {
+      assertHasType(element);
+      assertType(element, "Literal");
+      return element.value;
+    });
+    return { key, value };
   } else {
     assertType(property.value, "Literal");
     return { key, value: property.value.value };
@@ -47607,7 +47621,7 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
   const link2 = (content5) => {
     return {
       type: "a",
-      url: content5.url,
+      url: sanitizeUrl(content5.url),
       title: content5.title,
       children: flatten_default(
         content5.children.map((child) => staticPhrasingContent(child))
@@ -47721,7 +47735,12 @@ var remarkToSlate = (root3, field, imageCallback, raw, skipMDXProcess) => {
         const children = flatten_default(
           node.children.map((child) => phrashingMark(child, marks))
         );
-        accum.push({ type: "a", url: node.url, title: node.title, children });
+        accum.push({
+          type: "a",
+          url: sanitizeUrl(node.url),
+          title: node.title,
+          children
+        });
         break;
       }
       case "text":
@@ -47803,6 +47822,30 @@ var RichTextParseError = class extends Error {
     this.position = position2;
   }
 };
+var sanitizeUrl = (url) => {
+  const allowedSchemes = ["http", "https", "mailto", "tel"];
+  if (!url)
+    return "";
+  let parsedUrl = null;
+  try {
+    parsedUrl = new URL(url);
+  } catch (error) {
+    return url;
+  }
+  const scheme = parsedUrl.protocol.slice(0, -1);
+  if (allowedSchemes && !allowedSchemes.includes(scheme)) {
+    console.warn(`Invalid URL scheme detected ${scheme}`);
+    return "";
+  }
+  if (parsedUrl.pathname === "/") {
+    if (url.endsWith("/")) {
+      return parsedUrl.href;
+    }
+    return parsedUrl.origin;
+  } else {
+    return parsedUrl.href;
+  }
+};
 
 // src/next/parse/post-processing.ts
 var postProcessor = (tree, field, imageCallback) => {

package/dist/next/tests/mdx-blocks-rich-text-children-with-an-empty-object-value/field.d.ts

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

package/dist/next/tests/mdx-blocks-rich-text-children-with-an-empty-object-value/index.test.d.ts

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

package/dist/next/tests/mdx-table-like-field/field.d.ts

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

package/dist/next/tests/mdx-table-like-field/index.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",
   "browser": "dist/index.browser.mjs",
@@ -27,7 +27,7 @@
     ]
   },
   "dependencies": {
-    "@tinacms/schema-tools": "1.4.9",
+    "@tinacms/schema-tools": "1.4.11",
     "acorn": "8.8.2",
     "ccount": "2.0.1",
     "estree-util-is-identifier-name": "2.1.0",
@@ -63,7 +63,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/scripts": "1.1.1",
+    "@tinacms/scripts": "1.1.2",
     "@types/mdast": "^3.0.10",
     "@types/unist": "^2.0.6",
     "@types/estree": "1.0.0",