canopycms 0.1.0 → 0.2.0-int.119

package/dist/editor/undo-removal.js

@@ -1,6 +1,12 @@
 import equal from 'fast-deep-equal';
+import { ITEM_KEY, isItemKey } from '../item-keys.js';
 import { isPlainRecord } from '../validation/field-traversal.js';
 import { normalizeCanopyPath, parseCanopyPath } from './canopy-path.js';
+const itemKeyAt = (list, index) => {
+    const item = list[index];
+    const key = isPlainRecord(item) ? item[ITEM_KEY] : undefined;
+    return isItemKey(key) ? key : undefined;
+};
 const findField = (fields, name) => {
     for (const field of fields) {
         if (field.type === 'group') {
@@ -22,8 +28,8 @@ const resolvePath = (fields, value, path) => {
     let scope = fields;
     let node = value;
     const out = [];
-    const anchors = [];
-    const anchor = (list, index) => anchors.push({ index, siblings: list.filter((_, i) => i !== index) });
+    const lists = [];
+    const anchor = (list, index) => lists.push({ list, index });
     let i = 0;
     while (i < path.length) {
         const name = path[i];
@@ -34,7 +40,7 @@ const resolvePath = (fields, value, path) => {
         node = isPlainRecord(node) ? node[name] : undefined;
         i += 1;
         if (i === path.length)
-            return { path: out, anchors };
+            return { path: out, lists };
         const index = path[i];
         if (field.type === 'block') {
             const block = typeof index === 'number' && Array.isArray(node) ? node[index] : undefined;
@@ -65,7 +71,7 @@ const resolvePath = (fields, value, path) => {
             return undefined;
         }
     }
-    return { path: out, anchors };
+    return { path: out, lists };
 };
 const getAt = (root, path) => path.reduce((node, segment) => {
     if (typeof segment === 'number')
@@ -89,9 +95,15 @@ const sameContent = (a, b) => equal(JSON.parse(JSON.stringify(a ?? null)), JSON.
 const removalPath = (removal) => removal.kind === 'list-item' ? removal.listPath : removal.path;
 const anchorsHold = (then, now) => then === undefined ||
     (then.length === now.length &&
-        then.every((anchor, i) => anchor.index === now[i].index &&
+        then.every((anchor, i) => {
+            const { list, index } = now[i];
+            if (anchor.index !== index)
+                return false;
+            if (anchor.key !== undefined)
+                return itemKeyAt(list, index) === anchor.key;
             // By content as stored, so the server's copy of the same items still holds.
-            sameContent(anchor.siblings, now[i].siblings)));
+            return sameContent(anchor.siblings, list.filter((_, j) => j !== index));
+        }));
 /**
  * The canopy path `restoreRemoval` puts a removal back at: a list item returns to its old index,
  * or to the list's end when the list is now shorter than that.
@@ -105,17 +117,17 @@ export function restoredFieldPath(fields, value, removal) {
 }
 /** The enclosing lists of a removal in `value`, taken before the removal applies; see `anchors`. */
 export function removalAnchors(fields, value, removal) {
-    return resolvePath(fields, value, removalPath(removal))?.anchors;
+    return resolvePath(fields, value, removalPath(removal))?.lists.map(({ list, index }) => {
+        const key = itemKeyAt(list, index);
+        return key !== undefined
+            ? { index, key }
+            : { index, siblings: list.filter((_, j) => j !== index) };
+    });
 }
-/**
- * `value` with a removal put back, or undefined when it can't be: the list or field is gone, an
- * enclosing list has changed, the item is already there, or the image field has been filled.
- * Edits made after the removal are kept, because it changes only the one list or field, in the
- * value as it is now.
- */
-export function restoreRemoval(fields, value, removal) {
+/** Where and what `restoreRemoval` writes, or undefined when it can't; see there. */
+const planRestore = (fields, value, removal) => {
     const resolved = resolvePath(fields, value, removalPath(removal));
-    if (!resolved || !anchorsHold(removal.anchors, resolved.anchors))
+    if (!resolved || !anchorsHold(removal.anchors, resolved.lists))
         return undefined;
     const { path } = resolved;
     // An enclosing object cleared since would come back holding only this.
@@ -139,9 +151,25 @@ export function restoreRemoval(fields, value, removal) {
             return undefined;
         next = removal.value;
     }
-    const restored = setAt(value, path, next);
+    return { path, next };
+};
+/** Whether `restoreRemoval` would put the removal back, without building the restored value. */
+export const canRestoreRemoval = (fields, value, removal) => planRestore(fields, value, removal) !== undefined;
+/**
+ * `value` with a removal put back, or undefined when it can't be: the list or field is gone,
+ * another item holds an enclosing index, the item is already there, or the image field or object
+ * has been filled. Edits made after the removal are kept, because it changes only the one list or
+ * field, in the value as it is now.
+ */
+export function restoreRemoval(fields, value, removal) {
+    const plan = planRestore(fields, value, removal);
+    const restored = plan ? setAt(value, plan.path, plan.next) : undefined;
     return isPlainRecord(restored) ? restored : undefined;
 }
+/** Where a removal's moved threads went, said with its Undo; undefined when none moved. */
+export const movedThreadsNote = (count) => count > 0
+    ? `Its ${count === 1 ? 'comment thread' : `${count} comment threads`} moved to "Comment on this entry".`
+    : undefined;
 /**
  * How many open field threads a removal at `path` moves to the entry: those inside it keyed to an
  * item at or below it. One keyed only above stays on its field, which a Clear leaves in place.

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CANOPYCMS_VERSION = "0.1.0";
+export declare const CANOPYCMS_VERSION = "0.2.0-int.119";

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.1.0';
+export const CANOPYCMS_VERSION = '0.2.0-int.119';

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.1.0",
+  "version": "0.2.0-int.119",
   "description": "CanopyCMS core package: schema-driven content, branch-aware editing, and editor UI for Next.js.",
   "license": "MIT",
   "repository": {