@input/pen-core 0.1.0 → 0.1.2

package/dist/index.mjs

@@ -692,6 +692,25 @@ function mergeSchemas(...registries2) {
   });
 }
 
+// src/schema/slashMenuOrder.ts
+var FALLBACK_GROUP = "other";
+function slashMenuGroupOf(display) {
+  return display.group ?? FALLBACK_GROUP;
+}
+function orderSlashMenuItemsByGroup(items) {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const group = slashMenuGroupOf(item.display);
+    const existing = grouped.get(group);
+    if (existing) {
+      existing.push(item);
+    } else {
+      grouped.set(group, [item]);
+    }
+  }
+  return [...grouped.values()].flat();
+}
+
 // src/schema/defineBlock.ts
 function resolveProps2(config) {
   const raw = config.props ?? config.propSchema ?? {};
@@ -971,6 +990,15 @@ var SchemaEngineImpl = class {
   markDirty(blockId) {
     this.dirtyBlockIds.add(blockId);
   }
+  /**
+   * Drop the cached pass index because `blockOrder` or a `children` array
+   * changed outside this engine — an executing op, or a remote/undo update.
+   * Every structural mutation the engine performs itself already invalidates
+   * at the mutation site, so those callers do not go through here.
+   */
+  notifyStructureChanged() {
+    this.invalidatePassIndex();
+  }
   deferBlock(blockId) {
     this.deferredBlockIds.add(blockId);
   }
@@ -990,7 +1018,6 @@ var SchemaEngineImpl = class {
       }
       iterations++;
       this.dirtyBlockIds.clear();
-      this.invalidatePassIndex();
       this.doc.adapter.transact(this.crdtDoc, () => {
         for (const blockId of snapshot) {
           if (this.deferredBlockIds.has(blockId)) {
@@ -1001,7 +1028,6 @@ var SchemaEngineImpl = class {
         }
       });
     }
-    this.invalidatePassIndex();
     if (iterations >= MAX_ITERATIONS) {
       this.onDiagnostic?.({
         code: "normalize-cap",
@@ -1013,6 +1039,7 @@ var SchemaEngineImpl = class {
     }
   }
   normalizeAll() {
+    this.invalidatePassIndex();
     for (const blockId of this.doc.blocks.keys()) {
       this.dirtyBlockIds.add(blockId);
     }
@@ -2672,6 +2699,9 @@ function opBlockId(_pipeline, op) {
 import { STRUCTURAL_ORIGIN_META_KEY } from "@input/pen-yjs";
 
 // src/schema/contentType.ts
+import {
+  isNestedContent
+} from "@input/pen-types";
 function resolveRuntimeContentType(schema) {
   if (!schema) {
     return "none";
@@ -2681,6 +2711,10 @@ function resolveRuntimeContentType(schema) {
   }
   return schema.content;
 }
+function isContainerBlock(schema) {
+  if (!schema) return false;
+  return isNestedContent(schema.content) || schema.isContainer === true;
+}
 
 // src/editor/rejectedOwnKeys.ts
 var REJECTED_OWN_PROP_KEYS = /* @__PURE__ */ new Set([
@@ -3227,6 +3261,11 @@ function emitSchemaUnknownBlock(pipeline, type) {
   });
 }
 function reportUnknownBlocksInDocument(pipeline) {
+  const blockCount = pipeline._doc.blocks.size;
+  if (blockCount === pipeline._unknownScanBlockCount) {
+    return;
+  }
+  pipeline._unknownScanBlockCount = blockCount;
   for (const [, rawBlockMap] of pipeline._doc.blocks.entries()) {
     if (!isCRDTMap(rawBlockMap)) {
       continue;
@@ -3526,6 +3565,9 @@ function emitMalformedOpDiagnostic(pipeline, op, error) {
     ...error !== void 0 ? { error } : {}
   });
 }
+function isStructuralOp(op) {
+  return op.type === "insert-block" || op.type === "delete-block" || op.type === "move-block";
+}
 function executeOps(pipeline, ops, origin, structural) {
   pipeline._commitDiagnostics = [];
   reportUnknownBlocksInDocument(pipeline);
@@ -3547,6 +3589,15 @@ function executeOps(pipeline, ops, origin, structural) {
     const blockId = opBlockId(pipeline, op);
     if (!validateOp(pipeline, op)) continue;
     if (op.type === "insert-block") {
+      if (blockExists(pipeline, op.blockId) || pendingBlockIds.has(op.blockId)) {
+        emitPipelineDiagnostic(pipeline, {
+          code: "PEN_APPLY_010",
+          level: "warn",
+          source: "apply",
+          message: `apply: skipping insert-block for already-present block "${op.blockId}"`
+        });
+        continue;
+      }
       pendingBlockIds.add(op.blockId);
       pendingBlockTypes.set(op.blockId, op.blockType);
     }
@@ -3592,6 +3643,9 @@ function executeOps(pipeline, ops, origin, structural) {
           } catch (err) {
             emitMalformedOpDiagnostic(pipeline, op, err);
           }
+          if (isStructuralOp(op)) {
+            pipeline._engine.notifyStructureChanged();
+          }
         }
         for (const blockId of affectedBlocks) {
           pipeline._engine.markDirty(blockId);
@@ -3763,6 +3817,7 @@ var ApplyPipeline = class {
   _applyStormEmitted = false;
   _suppressObserver = false;
   _unknownBlockTypesReported;
+  _unknownScanBlockCount;
   _queue = [];
   _applyBoundaryHooks = [];
   _beforeApplyHooks = [];
@@ -3846,6 +3901,7 @@ var ApplyPipeline = class {
     this._doc = doc;
     this._crdtDoc = crdtDoc;
     this._engine = engine;
+    this._unknownScanBlockCount = void 0;
   }
 };
 
@@ -6007,9 +6063,11 @@ var SelectionAuthorityImpl = class {
 };
 
 // src/editor/documentState.ts
+var EMPTY_CHILD_IDS = Object.freeze([]);
 var DocumentStateImpl = class {
   _positionIndex;
   _parentIndex;
+  _childIndex;
   _blockOrder;
   _generation = 0;
   _documentProfile;
@@ -6023,6 +6081,7 @@ var DocumentStateImpl = class {
     this._documentProfile = documentProfile;
     this._positionIndex = /* @__PURE__ */ new Map();
     this._parentIndex = /* @__PURE__ */ new Map();
+    this._childIndex = /* @__PURE__ */ new Map();
     this._blockOrder = [];
     this.rebuild();
   }
@@ -6061,6 +6120,9 @@ var DocumentStateImpl = class {
   parentOf(blockId) {
     return this._parentIndex.get(blockId) ?? null;
   }
+  childrenOf(blockId) {
+    return this._childIndex.get(blockId) ?? EMPTY_CHILD_IDS;
+  }
   *allBlocks() {
     const seen = /* @__PURE__ */ new Set();
     for (const id of this._blockOrder) {
@@ -6080,21 +6142,44 @@ var DocumentStateImpl = class {
     this._blockOrder = [];
     this._positionIndex = /* @__PURE__ */ new Map();
     this._parentIndex = /* @__PURE__ */ new Map();
+    this._childIndex = /* @__PURE__ */ new Map();
     for (let i = 0; i < order.length; i++) {
       const id = order.get(i);
       this._blockOrder.push(id);
       this._positionIndex.set(id, i);
     }
+    const nestedChildIds = /* @__PURE__ */ new Set();
+    const parentIdChildIds = [];
     for (const [blockId, blockMap] of this._doc.blocks.entries()) {
       const props = blockMap.get("props");
       if (props?.get?.("parentId")) {
         this._parentIndex.set(blockId, props.get("parentId"));
+        parentIdChildIds.push(blockId);
       }
       const children = blockMap.get("children");
-      if (children) {
+      if (children && children.length > 0) {
+        const childIds = [];
         for (let i = 0; i < children.length; i++) {
-          this._parentIndex.set(children.get(i), blockId);
+          const childId = children.get(i);
+          this._parentIndex.set(childId, blockId);
+          nestedChildIds.add(childId);
+          childIds.push(childId);
         }
+        this._childIndex.set(blockId, childIds);
+      }
+    }
+    parentIdChildIds.sort(
+      (a, b) => (this._positionIndex.get(a) ?? -1) - (this._positionIndex.get(b) ?? -1)
+    );
+    for (const childId of parentIdChildIds) {
+      if (nestedChildIds.has(childId)) continue;
+      const parentId = this._parentIndex.get(childId);
+      if (parentId === void 0) continue;
+      const siblings = this._childIndex.get(parentId);
+      if (siblings === void 0) {
+        this._childIndex.set(parentId, [childId]);
+      } else {
+        siblings.push(childId);
       }
     }
     this._generation++;
@@ -6102,6 +6187,7 @@ var DocumentStateImpl = class {
   clear() {
     this._positionIndex.clear();
     this._parentIndex.clear();
+    this._childIndex.clear();
     this._blockOrder = [];
     this._generation++;
   }
@@ -7378,11 +7464,18 @@ var BACKSPACE_EXIT_TYPES = /* @__PURE__ */ new Set([
   ...CONTAINER_EXIT_TYPES,
   ...HEADING_TYPES
 ]);
-var PARENT_ID_CONTAINER_TYPES = /* @__PURE__ */ new Set([
-  "toggle",
-  "callout",
-  "blockquote"
-]);
+function isContainerBlockType(editor, blockType) {
+  if (!blockType) {
+    return false;
+  }
+  return isContainerBlock(editor.schema.resolve(blockType));
+}
+function shouldRenderContainerChildren(editor, block) {
+  if (!block || !isContainerBlockType(editor, block.type)) {
+    return false;
+  }
+  return block.props?.open !== false;
+}
 function emitCommandDiagnostic(editor, event) {
   editor.internals?.emit("diagnostic", event);
 }
@@ -7434,18 +7527,13 @@ function isInsideParentIdContainer(editor, blockId) {
     return false;
   }
   const parent = editor.getBlock(parentId);
-  return !!parent && PARENT_ID_CONTAINER_TYPES.has(parent.type);
+  return !!parent && isContainerBlockType(editor, parent.type);
 }
 function getRootBlockIds(editor) {
   return editor.documentState.blockOrder.filter(
     (blockId) => editor.documentState.parentOf(blockId) == null
   );
 }
-function getParentIdChildBlockIds(editor, parentBlockId) {
-  return editor.documentState.blockOrder.filter(
-    (blockId) => editor.documentState.parentOf(blockId) === parentBlockId
-  );
-}
 function getVisibleBlockIds(editor) {
   const visibleBlockIds = [];
   for (const rootBlockId of getRootBlockIds(editor)) {
@@ -7567,23 +7655,13 @@ function convertBlockOps(editor, options) {
 }
 function collectVisibleBlockIds(editor, blockId, visibleBlockIds) {
   visibleBlockIds.push(blockId);
-  if (!shouldShowParentIdChildren(editor, blockId)) {
+  if (!shouldRenderContainerChildren(editor, editor.getBlock(blockId))) {
     return;
   }
-  for (const childBlockId of getParentIdChildBlockIds(editor, blockId)) {
+  for (const childBlockId of editor.documentState.childrenOf(blockId)) {
     collectVisibleBlockIds(editor, childBlockId, visibleBlockIds);
   }
 }
-function shouldShowParentIdChildren(editor, blockId) {
-  const block = editor.getBlock(blockId);
-  if (!block || !PARENT_ID_CONTAINER_TYPES.has(block.type)) {
-    return false;
-  }
-  if (block.type !== "toggle") {
-    return true;
-  }
-  return Boolean(block.props?.open);
-}
 
 // src/commands/commandSelection.ts
 function textSelectionResult(anchor, focus = anchor, extras) {
@@ -7759,12 +7837,12 @@ function parentContainerKind(editor, parentId) {
   if (!parent) {
     return null;
   }
-  if (PARENT_ID_CONTAINER_TYPES.has(parent.type)) {
-    return "layout-cell";
-  }
   if (parent.type === "table") {
     return "table";
   }
+  if (isContainerBlockType(editor, parent.type)) {
+    return "layout-cell";
+  }
   return null;
 }
 
@@ -10660,44 +10738,20 @@ function createBlockIndex(initial) {
     snapshot() {
       return current;
     },
-    apply(summary) {
-      current = applySummaryToSnapshot(current, summary);
+    applyTextLengths(blockText) {
+      for (const change of blockText) {
+        const previous = current.lengthById.get(change.blockId) ?? 0;
+        current.lengthById.set(
+          change.blockId,
+          lengthAfterSplices(previous, change.splices)
+        );
+      }
     },
     replace(snapshot) {
       current = cloneSnapshot(snapshot);
     }
   };
 }
-function applySummaryToSnapshot(snapshot, summary) {
-  const lengthById = new Map(snapshot.lengthById);
-  const typeById = new Map(snapshot.typeById);
-  const childrenByParentId = cloneChildren(snapshot.childrenByParentId);
-  for (const change of summary.structural) {
-    applyStructural(change, lengthById, typeById, childrenByParentId);
-  }
-  for (const text of summary.blockText) {
-    const previous = lengthById.get(text.blockId) ?? 0;
-    lengthById.set(
-      text.blockId,
-      lengthAfterSplices(previous, text.splices)
-    );
-  }
-  const roots = [...childrenByParentId.get(null) ?? []];
-  const parentById = /* @__PURE__ */ new Map();
-  for (const [parentId, children] of childrenByParentId) {
-    for (const childId of children) {
-      parentById.set(childId, parentId);
-    }
-  }
-  return {
-    lengthById,
-    typeById,
-    parentById,
-    childrenByParentId,
-    order: flattenOrder(roots, childrenByParentId),
-    roots
-  };
-}
 function lengthAfterSplices(length, splices) {
   let next = length;
   for (const splice of splices) {
@@ -10715,120 +10769,6 @@ function cloneSnapshot(snapshot) {
     roots: [...snapshot.roots]
   };
 }
-function applyStructural(change, lengthById, typeById, childrenByParentId) {
-  switch (change.type) {
-    case "block-inserted": {
-      insertChild(
-        childrenByParentId,
-        change.parentId,
-        change.index,
-        change.blockId
-      );
-      if (!lengthById.has(change.blockId))
-        lengthById.set(change.blockId, 0);
-      break;
-    }
-    case "block-removed": {
-      removeChild(childrenByParentId, change.parentId, change.blockId);
-      lengthById.delete(change.blockId);
-      typeById.delete(change.blockId);
-      childrenByParentId.delete(change.blockId);
-      break;
-    }
-    case "block-moved": {
-      removeChild(
-        childrenByParentId,
-        change.fromParentId,
-        change.blockId
-      );
-      insertChild(
-        childrenByParentId,
-        change.toParentId,
-        change.toIndex,
-        change.blockId
-      );
-      break;
-    }
-    case "block-split": {
-      insertAfter(childrenByParentId, change.blockId, change.newBlockId);
-      const original = lengthById.get(change.blockId) ?? 0;
-      lengthById.set(change.blockId, Math.max(0, change.offset));
-      lengthById.set(
-        change.newBlockId,
-        Math.max(0, original - change.offset)
-      );
-      if (!typeById.has(change.newBlockId)) {
-        typeById.set(
-          change.newBlockId,
-          typeById.get(change.blockId) ?? ""
-        );
-      }
-      break;
-    }
-    case "blocks-merged": {
-      const parentId = parentOf(childrenByParentId, change.sourceBlockId);
-      const targetLength = lengthById.get(change.targetBlockId) ?? 0;
-      const sourceLength = lengthById.get(change.sourceBlockId) ?? 0;
-      lengthById.set(change.targetBlockId, targetLength + sourceLength);
-      removeChild(childrenByParentId, parentId, change.sourceBlockId);
-      lengthById.delete(change.sourceBlockId);
-      typeById.delete(change.sourceBlockId);
-      childrenByParentId.delete(change.sourceBlockId);
-      break;
-    }
-    case "block-props-changed":
-    case "table-changed":
-    case "apps-changed":
-    case "metadata-changed":
-      break;
-    default: {
-      const _exhaustive = change;
-      return _exhaustive;
-    }
-  }
-}
-function insertAfter(childrenByParentId, beforeId, newId) {
-  for (const [parentId, children] of childrenByParentId) {
-    const index = children.indexOf(beforeId);
-    if (index < 0) continue;
-    if (!children.includes(newId)) {
-      children.splice(index + 1, 0, newId);
-    }
-    childrenByParentId.set(parentId, children);
-    return;
-  }
-  insertChild(childrenByParentId, null, -1, newId);
-}
-function insertChild(childrenByParentId, parentId, index, blockId) {
-  const children = childrenByParentId.get(parentId) ?? [];
-  const next = children.filter((id) => id !== blockId);
-  const at = index < 0 || index > next.length ? next.length : index;
-  next.splice(at, 0, blockId);
-  childrenByParentId.set(parentId, next);
-}
-function removeChild(childrenByParentId, parentId, blockId) {
-  const children = childrenByParentId.get(parentId);
-  if (!children) {
-    for (const [id, list] of childrenByParentId) {
-      const index2 = list.indexOf(blockId);
-      if (index2 >= 0) {
-        list.splice(index2, 1);
-        childrenByParentId.set(id, list);
-        return;
-      }
-    }
-    return;
-  }
-  const index = children.indexOf(blockId);
-  if (index >= 0) children.splice(index, 1);
-  childrenByParentId.set(parentId, children);
-}
-function parentOf(childrenByParentId, blockId) {
-  for (const [parentId, children] of childrenByParentId) {
-    if (children.includes(blockId)) return parentId;
-  }
-  return null;
-}
 function flattenOrder(roots, childrenByParentId) {
   const order = [];
   const visit = (id) => {
@@ -11418,7 +11358,7 @@ function affectedBlockIdsFromSummary(summary, documentOrder) {
     addStructuralBlockIds(ids, change);
   }
   const collected = [...ids];
-  if (!documentOrder || documentOrder.length === 0) {
+  if (collected.length < 2 || !documentOrder || documentOrder.length === 0) {
     return collected;
   }
   const rank = /* @__PURE__ */ new Map();
@@ -11840,14 +11780,22 @@ function installChangeSummaries(host) {
     host._unsubSummary = createSummarySource(
       host._crdtDoc,
       (delta) => {
-        host._pendingSummary = buildChangeSummary(
+        if (delta.blockOrderDelta.length > 0 || delta.childArrayDeltas.size > 0) {
+          host._engine.notifyStructureChanged();
+        }
+        const summary = buildChangeSummary(
           delta,
           host._blockIndex.snapshot(),
           0
         );
-        host._blockIndex.replace(
-          createBlockIndexSnapshotFromDocument(host._doc)
-        );
+        host._pendingSummary = summary;
+        if (summary.structural.length === 0) {
+          host._blockIndex.applyTextLengths(summary.blockText);
+        } else {
+          host._blockIndex.replace(
+            createBlockIndexSnapshotFromDocument(host._doc)
+          );
+        }
         flushDeferredCRDTEvent(host);
       }
     );
@@ -14417,6 +14365,16 @@ var macosBindings = [
     key: "Alt-Delete",
     command: deleteForward,
     param: { granularity: "word" }
+  },
+  {
+    key: "Meta-Backspace",
+    command: deleteBackward,
+    param: { granularity: "line" }
+  },
+  {
+    key: "Ctrl-k",
+    command: deleteForward,
+    param: { granularity: "line" }
   }
 ];
 var windowsLinuxBindings = [
@@ -14910,6 +14868,8 @@ export {
   interpolateMessage,
   isBlockSelected,
   isCollapsed,
+  isContainerBlock,
+  isContainerBlockType,
   isContinuousTextFlowCapability,
   isMultiBlock,
   isPseudoLocaleText,
@@ -14926,6 +14886,7 @@ export {
   nextGraphemeBoundary,
   nextWordBoundary,
   normalizePendingBlocksForImport,
+  orderSlashMenuItemsByGroup,
   outdent,
   previousGraphemeBoundary,
   previousWordBoundary,
@@ -14968,8 +14929,10 @@ export {
   shouldAllowFlowInsertionInSlashMenu,
   shouldExposeBlockInTooling,
   shouldForceBlockScopedSelectAll,
+  shouldRenderContainerChildren,
   shouldShowBlockInDefaultMenus,
   singleController,
+  slashMenuGroupOf,
   snapToNormalPosition,
   snapshotsControllerFacet,
   sortDeltaAttributes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@input/pen-core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Headless, extension-first editor engine for human-AI co-authoring",
   "license": "MIT",
   "homepage": "https://github.com/input-systems/pen#readme",
@@ -43,8 +43,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@input/pen-yjs": "^0.1.0",
-    "@input/pen-types": "^0.1.0"
+    "@input/pen-yjs": "^0.1.2",
+    "@input/pen-types": "^0.1.2"
   },
   "devDependencies": {
     "tsup": "^8.4.0",