@tinacms/mdx 2.2.1 → 2.2.2

package/dist/break-neighbours.test.d.ts

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

package/dist/break-representability/index.test.d.ts

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

package/dist/break-serialization.d.ts

@@ -0,0 +1,12 @@
+import type * as Md from 'mdast';
+/**
+ * Reshape the tree so every hard break left in it is one markdown can express.
+ * Acts in place.
+ *
+ * Two ordered passes, not one. Splitting a heading that still holds a trailing
+ * break yields a second heading containing only what followed it — for
+ * `### [one⏎](/x)` that is an empty link, written out as `### [](/x)`. Trimming
+ * the whole tree first means the split only ever sees breaks with content on
+ * both sides.
+ */
+export declare const serializeBreaks: <T extends Md.Root>(tree: T) => T;

package/dist/break-serialization.test.d.ts

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

package/dist/index.browser.js

@@ -1225,7 +1225,7 @@ var init_acorn = __esm({
       }
     };
     pp$8.parseBreakContinueStatement = function(node2, keyword) {
-      var isBreak = keyword === "break";
+      var isBreak2 = keyword === "break";
       this.next();
       if (this.eat(types$1.semi) || this.insertSemicolon()) {
         node2.label = null;
@@ -1239,10 +1239,10 @@ var init_acorn = __esm({
       for (; i2 < this.labels.length; ++i2) {
         var lab = this.labels[i2];
         if (node2.label == null || lab.name === node2.label.name) {
-          if (lab.kind != null && (isBreak || lab.kind === "loop")) {
+          if (lab.kind != null && (isBreak2 || lab.kind === "loop")) {
             break;
           }
-          if (node2.label && isBreak) {
+          if (node2.label && isBreak2) {
             break;
           }
         }
@@ -1250,7 +1250,7 @@ var init_acorn = __esm({
       if (i2 === this.labels.length) {
         this.raise(node2.start, "Unsyntactic " + keyword);
       }
-      return this.finishNode(node2, isBreak ? "BreakStatement" : "ContinueStatement");
+      return this.finishNode(node2, isBreak2 ? "BreakStatement" : "ContinueStatement");
     };
     pp$8.parseDebuggerStatement = function(node2) {
       this.next();
@@ -34302,6 +34302,112 @@ function assertShape(value, callback, errorMessage) {
   }
 }
 
+// src/break-serialization.ts
+var serializeBreaks = (tree) => {
+  trimTree(tree);
+  splitTree(tree);
+  return tree;
+};
+var isParent = (node2) => Array.isArray(node2?.children);
+var PHRASING_BLOCKS = /* @__PURE__ */ new Set(["paragraph", "heading", "tableCell"]);
+var trimTree = (node2) => {
+  dropBreaksBeforeLineStartSensitive(node2.children);
+  if (PHRASING_BLOCKS.has(node2.type ?? "")) {
+    trimTrailingBreaks(node2);
+  }
+  for (const child of node2.children) {
+    if (isParent(child)) {
+      trimTree(child);
+    }
+  }
+};
+var splitTree = (node2) => {
+  node2.children = node2.children.flatMap(
+    (child) => isHeading(child) && child.depth > DEEPEST_SETEXT ? splitOnBreaks(child) : [child]
+  );
+  for (const child of node2.children) {
+    if (isParent(child)) {
+      splitTree(child);
+    }
+  }
+};
+var trimTrailingBreaks = ({ children }) => {
+  let index2 = children.length;
+  const trailing = [];
+  while (index2 > 0) {
+    const child = children[index2 - 1];
+    if (isBreak(child)) {
+      trailing.push(index2 - 1);
+    } else if (!writesNothing(child)) {
+      break;
+    }
+    index2--;
+  }
+  for (const at3 of trailing) {
+    children.splice(at3, 1);
+  }
+  const last = children[index2 - 1];
+  if (isParent(last)) {
+    trimTrailingBreaks(last);
+  }
+};
+var isBreak = (node2) => node2?.type === "break";
+var writesNothing = (node2) => node2?.type === "text" && node2.value === "";
+var dropBreaksBeforeLineStartSensitive = (children) => {
+  for (let index2 = children.length - 1; index2 >= 0; index2--) {
+    if (!isBreak(children[index2])) {
+      continue;
+    }
+    const next = children.slice(index2 + 1).find((sibling2) => !writesNothing(sibling2));
+    const type = next?.type;
+    if (type === "html") {
+      const before = children[index2 - 1];
+      const spaced = before?.type === "text" && /[ \t]$/.test(before.value);
+      children.splice(
+        index2,
+        1,
+        ...spaced ? [] : [{ type: "text", value: " " }]
+      );
+    } else if (type === "mdxJsxTextElement") {
+      children.splice(index2, 1);
+    }
+  }
+};
+var isHeading = (node2) => isParent(node2) && node2.type === "heading";
+var DEEPEST_SETEXT = 2;
+var splitOnBreaks = (heading2) => splitInlines(heading2.children).map((children) => children.filter((child) => !writesNothingDeep(child))).filter((children) => children.length).map((children) => ({ ...heading2, children }));
+var writesNothingDeep = (node2) => {
+  if (isBreak(node2)) {
+    return false;
+  }
+  if (isParent(node2)) {
+    return node2.children.length > 0 && node2.children.every(writesNothingDeep);
+  }
+  return writesNothing(node2);
+};
+var splitInlines = (nodes) => {
+  const segments = [[]];
+  const push2 = (node2) => segments[segments.length - 1]?.push(node2);
+  for (const node2 of nodes) {
+    if (isBreak(node2)) {
+      segments.push([]);
+      continue;
+    }
+    if (!isParent(node2)) {
+      push2(node2);
+      continue;
+    }
+    const inner = splitInlines(node2.children);
+    inner.forEach((children, index2) => {
+      if (index2 > 0) {
+        segments.push([]);
+      }
+      push2({ ...node2, children });
+    });
+  }
+  return segments;
+};
+
 // src/extensions/tina-shortcodes/to-markdown.ts
 var own6 = {}.hasOwnProperty;
 var directiveToMarkdown = (patterns) => ({
@@ -35059,7 +35165,7 @@ var toTinaMarkdown = (tree, field) => {
     }
     return text4(node2, parent, context, safeOptions);
   };
-  return toMarkdown(tree, {
+  return toMarkdown(serializeBreaks(tree), {
     extensions: [
       directiveToMarkdown(patterns),
       mdxJsxToMarkdown(),
@@ -36288,7 +36394,7 @@ var toTinaMarkdown2 = (tree, field) => {
     }
     return text4(node2, parent, context, safeOptions);
   };
-  return toMarkdown(tree, {
+  return toMarkdown(serializeBreaks(tree), {
     extensions: [mdxJsxToMarkdown2({ patterns }), gfmToMarkdown()],
     listItemIndent: "one",
     handlers
@@ -37807,10 +37913,13 @@ var remarkToSlate = (root2, field, imageCallback, raw, skipMDXProcess) => {
         ) ?? mdxJsxElement2(content4, field, imageCallback);
       case "text":
         return text7(content4);
+      case "break":
+        return breakContent();
       case "inlineCode":
       case "emphasis":
       case "image":
       case "strong":
+      case "delete":
         return phrashingMark(content4);
       case "html":
         return html_inline(content4);

package/dist/index.js

@@ -1225,7 +1225,7 @@ var init_acorn = __esm({
       }
     };
     pp$8.parseBreakContinueStatement = function(node2, keyword) {
-      var isBreak = keyword === "break";
+      var isBreak2 = keyword === "break";
       this.next();
       if (this.eat(types$1.semi) || this.insertSemicolon()) {
         node2.label = null;
@@ -1239,10 +1239,10 @@ var init_acorn = __esm({
       for (; i2 < this.labels.length; ++i2) {
         var lab = this.labels[i2];
         if (node2.label == null || lab.name === node2.label.name) {
-          if (lab.kind != null && (isBreak || lab.kind === "loop")) {
+          if (lab.kind != null && (isBreak2 || lab.kind === "loop")) {
             break;
           }
-          if (node2.label && isBreak) {
+          if (node2.label && isBreak2) {
             break;
           }
         }
@@ -1250,7 +1250,7 @@ var init_acorn = __esm({
       if (i2 === this.labels.length) {
         this.raise(node2.start, "Unsyntactic " + keyword);
       }
-      return this.finishNode(node2, isBreak ? "BreakStatement" : "ContinueStatement");
+      return this.finishNode(node2, isBreak2 ? "BreakStatement" : "ContinueStatement");
     };
     pp$8.parseDebuggerStatement = function(node2) {
       this.next();
@@ -36168,6 +36168,112 @@ function assertShape(value, callback, errorMessage) {
   }
 }
 
+// src/break-serialization.ts
+var serializeBreaks = (tree) => {
+  trimTree(tree);
+  splitTree(tree);
+  return tree;
+};
+var isParent = (node2) => Array.isArray(node2?.children);
+var PHRASING_BLOCKS = /* @__PURE__ */ new Set(["paragraph", "heading", "tableCell"]);
+var trimTree = (node2) => {
+  dropBreaksBeforeLineStartSensitive(node2.children);
+  if (PHRASING_BLOCKS.has(node2.type ?? "")) {
+    trimTrailingBreaks(node2);
+  }
+  for (const child of node2.children) {
+    if (isParent(child)) {
+      trimTree(child);
+    }
+  }
+};
+var splitTree = (node2) => {
+  node2.children = node2.children.flatMap(
+    (child) => isHeading(child) && child.depth > DEEPEST_SETEXT ? splitOnBreaks(child) : [child]
+  );
+  for (const child of node2.children) {
+    if (isParent(child)) {
+      splitTree(child);
+    }
+  }
+};
+var trimTrailingBreaks = ({ children }) => {
+  let index2 = children.length;
+  const trailing = [];
+  while (index2 > 0) {
+    const child = children[index2 - 1];
+    if (isBreak(child)) {
+      trailing.push(index2 - 1);
+    } else if (!writesNothing(child)) {
+      break;
+    }
+    index2--;
+  }
+  for (const at3 of trailing) {
+    children.splice(at3, 1);
+  }
+  const last = children[index2 - 1];
+  if (isParent(last)) {
+    trimTrailingBreaks(last);
+  }
+};
+var isBreak = (node2) => node2?.type === "break";
+var writesNothing = (node2) => node2?.type === "text" && node2.value === "";
+var dropBreaksBeforeLineStartSensitive = (children) => {
+  for (let index2 = children.length - 1; index2 >= 0; index2--) {
+    if (!isBreak(children[index2])) {
+      continue;
+    }
+    const next = children.slice(index2 + 1).find((sibling2) => !writesNothing(sibling2));
+    const type = next?.type;
+    if (type === "html") {
+      const before = children[index2 - 1];
+      const spaced = before?.type === "text" && /[ \t]$/.test(before.value);
+      children.splice(
+        index2,
+        1,
+        ...spaced ? [] : [{ type: "text", value: " " }]
+      );
+    } else if (type === "mdxJsxTextElement") {
+      children.splice(index2, 1);
+    }
+  }
+};
+var isHeading = (node2) => isParent(node2) && node2.type === "heading";
+var DEEPEST_SETEXT = 2;
+var splitOnBreaks = (heading2) => splitInlines(heading2.children).map((children) => children.filter((child) => !writesNothingDeep(child))).filter((children) => children.length).map((children) => ({ ...heading2, children }));
+var writesNothingDeep = (node2) => {
+  if (isBreak(node2)) {
+    return false;
+  }
+  if (isParent(node2)) {
+    return node2.children.length > 0 && node2.children.every(writesNothingDeep);
+  }
+  return writesNothing(node2);
+};
+var splitInlines = (nodes) => {
+  const segments = [[]];
+  const push2 = (node2) => segments[segments.length - 1]?.push(node2);
+  for (const node2 of nodes) {
+    if (isBreak(node2)) {
+      segments.push([]);
+      continue;
+    }
+    if (!isParent(node2)) {
+      push2(node2);
+      continue;
+    }
+    const inner = splitInlines(node2.children);
+    inner.forEach((children, index2) => {
+      if (index2 > 0) {
+        segments.push([]);
+      }
+      push2({ ...node2, children });
+    });
+  }
+  return segments;
+};
+
 // src/extensions/tina-shortcodes/to-markdown.ts
 var own7 = {}.hasOwnProperty;
 var directiveToMarkdown = (patterns) => ({
@@ -36925,7 +37031,7 @@ var toTinaMarkdown = (tree, field) => {
     }
     return text4(node2, parent, context, safeOptions);
   };
-  return toMarkdown(tree, {
+  return toMarkdown(serializeBreaks(tree), {
     extensions: [
       directiveToMarkdown(patterns),
       mdxJsxToMarkdown(),
@@ -38154,7 +38260,7 @@ var toTinaMarkdown2 = (tree, field) => {
     }
     return text4(node2, parent, context, safeOptions);
   };
-  return toMarkdown(tree, {
+  return toMarkdown(serializeBreaks(tree), {
     extensions: [mdxJsxToMarkdown2({ patterns }), gfmToMarkdown()],
     listItemIndent: "one",
     handlers
@@ -39673,10 +39779,13 @@ var remarkToSlate = (root2, field, imageCallback, raw, skipMDXProcess) => {
         ) ?? mdxJsxElement2(content4, field, imageCallback);
       case "text":
         return text7(content4);
+      case "break":
+        return breakContent();
       case "inlineCode":
       case "emphasis":
       case "image":
       case "strong":
+      case "delete":
         return phrashingMark(content4);
       case "html":
         return html_inline(content4);

package/dist/link-children.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/mdx",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -58,14 +58,14 @@
     "unist-util-stringify-position": "3.0.3",
     "unist-util-visit": "4.1.2",
     "vfile-message": "3.1.4",
-    "@tinacms/schema-tools": "^2.9.0"
+    "@tinacms/schema-tools": "^2.10.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "repository": {
     "url": "https://github.com/tinacms/tinacms.git",
-    "directory": "packages/tina-graphql"
+    "directory": "packages/@tinacms/mdx"
   },
   "devDependencies": {
     "@types/estree": "1.0.0",