canopycms 0.0.68-int.104 → 0.0.68-int.105

package/dist/editor/fields/mdx-jsx-support.js

@@ -64,7 +64,7 @@ function unsupportedJsx(mdx, node) {
 }
 // Blocks that run into the block before them in a list item, by that block's type.
 const RUNS_INTO = {
-    paragraph: ['paragraph', 'thematicBreak'],
+    paragraph: ['thematicBreak'],
     blockquote: ['paragraph', 'blockquote', 'table'],
     table: ['paragraph', 'table'],
 };
@@ -75,15 +75,11 @@ const BLOCK_NAMES = {
     thematicBreak: 'horizontal rule',
 };
 /**
- * Why MDXEditor would change what this list item or quote says, or null. Its import joins a list
- * item's adjacent paragraphs and moves a nested list into a new item after its own, so what follows
- * the list comes out before it; its export writes an item tight, so `---` underlines a paragraph and
- * a line continues a quote or table (`RUNS_INTO`); and 3.53 exports a quote as one paragraph.
+ * Why MDXEditor would change what this list item says, or null. Its import moves a nested list into
+ * a new item after its own, so what follows the list comes out before it; its export writes an item
+ * tight, so `---` underlines a paragraph and a line continues a quote or table (`RUNS_INTO`).
  */
 function rearrangedBlocks(node) {
-    if (node.type === 'blockquote') {
-        return node.children.length > 1 ? 'a quote with more than one paragraph or block' : null;
-    }
     if (node.type !== 'listItem')
         return null;
     for (let i = 1; i < node.children.length; i++) {
@@ -92,20 +88,57 @@ function rearrangedBlocks(node) {
         if (before === 'list')
             return 'a list item with content after its nested list';
         if (RUNS_INTO[before]?.includes(after)) {
-            return before === 'paragraph' && after === 'paragraph'
-                ? 'a list item with more than one paragraph'
-                : `a list item with a ${BLOCK_NAMES[before] ?? before} followed by a ${BLOCK_NAMES[after] ?? after}`;
+            return `a list item with a ${BLOCK_NAMES[before] ?? before} followed by a ${BLOCK_NAMES[after] ?? after}`;
         }
     }
     return null;
 }
+const isLexicalParent = (node) => 'getChildren' in node && typeof node.getChildren === 'function';
+const hasBlockChild = (node) => isLexicalParent(node) && node.getChildren().some((child) => !child.isInline());
+// Writes `node`'s children into `target`: a run of inline children as one paragraph, a block as itself.
+function writeBlocks(node, target, actions) {
+    let paragraph = null;
+    for (const child of isLexicalParent(node) ? node.getChildren() : []) {
+        if (!child.isInline()) {
+            paragraph = null;
+            actions.visit(child, target);
+            continue;
+        }
+        if (paragraph === null) {
+            const created = { type: 'paragraph', children: [] };
+            actions.appendToParent(target, created);
+            paragraph = created;
+        }
+        actions.visit(child, paragraph);
+    }
+}
+// MDXEditor 4 exports each child of a quote as a block, so inline children the toolbar's Quote,
+// the `> ` shortcut or a merge put in a quote would come out one paragraph each.
+const quoteExportVisitor = {
+    priority: 100,
+    testLexicalNode: (node) => node.getType() === 'quote',
+    visitLexicalNode({ lexicalNode, mdastParent, actions }) {
+        const quote = { type: 'blockquote', children: [] };
+        actions.appendToParent(mdastParent, quote);
+        writeBlocks(lexicalNode, quote, actions);
+    },
+};
+// Backspace at the start of a quote moves its paragraphs and lists into one paragraph, which
+// MDXEditor would export as one run of text; they are written as the blocks they show.
+const paragraphOfBlocksExportVisitor = {
+    priority: 100,
+    testLexicalNode: (node) => node.getType() === 'paragraph' && hasBlockChild(node),
+    visitLexicalNode({ lexicalNode, mdastParent, actions }) {
+        writeBlocks(lexicalNode, mdastParent, actions);
+    },
+};
 /** Typed `string` because the mdast node union this package resolves omits the ESM node. */
 const ESM_NODE_TYPE = 'mdxjsEsm';
 /** Node types inside a table, imported by its cell editors rather than by visitors. */
 const CONSUMED_BY_PARENT_VISITOR = new Set(['tableRow', 'tableCell']);
 /** Creates the JSX plugins from MDXEditor's exports; call once per load of MDXEditor. */
 export function createMdxJsxPlugins(mdx) {
-    const { NestedLexicalEditor, UnrecognizedMarkdownConstructError, addImportVisitor$, importVisitors$, isMdastJsxNode, jsxPlugin, realmPlugin, } = mdx;
+    const { NestedLexicalEditor, UnrecognizedMarkdownConstructError, addExportVisitor$, addImportVisitor$, importVisitors$, isMdastJsxNode, jsxPlugin, realmPlugin, } = mdx;
     /**
      * Shows an element's tag and attributes read-only (they are edited as source)
      * and edits its children, inline or block per the parsed node: one `*`
@@ -142,7 +175,6 @@ export function createMdxJsxPlugins(mdx) {
                 testNode: (node) => node.type === ESM_NODE_TYPE ||
                     node.type === 'table' ||
                     node.type === 'listItem' ||
-                    node.type === 'blockquote' ||
                     isMdastJsxNode(node),
                 visitNode({ mdastNode, descriptors, actions }) {
                     if (mdastNode.type === ESM_NODE_TYPE) {
@@ -155,7 +187,7 @@ export function createMdxJsxPlugins(mdx) {
                         }
                     };
                     reject(mdastNode);
-                    if (mdastNode.type === 'listItem' || mdastNode.type === 'blockquote') {
+                    if (mdastNode.type === 'listItem') {
                         actions.nextVisitor();
                         return;
                     }
@@ -180,8 +212,14 @@ export function createMdxJsxPlugins(mdx) {
             realm.pub(addImportVisitor$, guard);
         },
     });
+    const blockExportPlugin = realmPlugin({
+        init(realm) {
+            realm.pub(addExportVisitor$, [quoteExportVisitor, paragraphOfBlocksExportVisitor]);
+        },
+    });
     return () => [
         jsxPlugin({ jsxComponentDescriptors: [catchAllJsxDescriptor] }),
         roundTripGuardPlugin(),
+        blockExportPlugin(),
     ];
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CANOPYCMS_VERSION = "0.0.68-int.104";
+export declare const CANOPYCMS_VERSION = "0.0.68-int.105";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by scripts/bump-version.mjs, its only writer. The package builds with plain
 // tsc (rootDir: src), so src/ cannot import ../package.json; version.test.ts keeps the two equal.
-export const CANOPYCMS_VERSION = '0.0.68-int.104';
+export const CANOPYCMS_VERSION = '0.0.68-int.105';

package/package.json

@@ -1,7 +1,7 @@
 {
   "//": "@codemirror/language, @lezer/highlight: workaround — @mdxeditor/editor uses cm6-theme-basic-light which peer-requires these but mdxeditor doesn't declare them as dependencies",
   "name": "canopycms",
-  "version": "0.0.68-int.104",
+  "version": "0.0.68-int.105",
   "description": "CanopyCMS core package: schema-driven content, branch-aware editing, and editor UI for Next.js.",
   "license": "MIT",
   "repository": {
@@ -114,7 +114,7 @@
     "@mantine/hooks": "^7.14.2",
     "@mantine/modals": "^7.14.2",
     "@mantine/notifications": "^7.14.2",
-    "@mdxeditor/editor": "^3.52.4",
+    "@mdxeditor/editor": "^4.3.2",
     "@octokit/auth-token": "^4.0.0",
     "@octokit/plugin-throttling": "^8.2.0",
     "@octokit/rest": "^20.0.2",