@superdoc-dev/cli 0.15.0-next.5 → 0.15.0-next.6

package/dist/index.js

@@ -221759,7 +221759,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-B9A7ox0h.es.js
+// ../../packages/superdoc/dist/chunks/src-D1Zc7Jgj.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -223110,12 +223110,80 @@ function findContainingBlockAncestor(element3) {
   }
   return null;
 }
+function isZeroWidthMarker(node3) {
+  if (node3.type.name === "fieldAnnotation" && node3.attrs?.hidden === true)
+    return true;
+  return ZERO_WIDTH_MARKER_NODE_NAMES.has(node3.type.name);
+}
+function findFirstTextPosInNode(node3, nodePos) {
+  if (node3.isText)
+    return nodePos;
+  for (let index2 = 0, offset$1 = 0;index2 < node3.childCount; index2 += 1) {
+    const child = node3.child(index2);
+    const found2 = findFirstTextPosInNode(child, nodePos + 1 + offset$1);
+    if (found2 != null)
+      return found2;
+    offset$1 += child.nodeSize;
+  }
+  return null;
+}
+function findFirstContentCursorPosInNode(node3, nodePos) {
+  if (isZeroWidthMarker(node3))
+    return null;
+  if (node3.isText || node3.isAtom)
+    return nodePos;
+  if (node3.isTextblock && node3.childCount === 0)
+    return nodePos + 1;
+  for (let index2 = 0, offset$1 = 0;index2 < node3.childCount; index2 += 1) {
+    const child = node3.child(index2);
+    const found2 = findFirstContentCursorPosInNode(child, nodePos + 1 + offset$1);
+    if (found2 != null)
+      return found2;
+    offset$1 += child.nodeSize;
+  }
+  if (node3.isTextblock)
+    return nodePos + 1;
+  return null;
+}
+function findLastTextPosInNode(node3, nodePos) {
+  if (node3.isText)
+    return nodePos + (node3.text?.length ?? 0);
+  for (let index2 = node3.childCount - 1, offset$1 = node3.content.size;index2 >= 0; index2 -= 1) {
+    const child = node3.child(index2);
+    offset$1 -= child.nodeSize;
+    const found2 = findLastTextPosInNode(child, nodePos + 1 + offset$1);
+    if (found2 != null)
+      return found2;
+  }
+  return null;
+}
+function findLastContentCursorPosInNode(node3, nodePos) {
+  if (isZeroWidthMarker(node3))
+    return null;
+  if (node3.isText)
+    return nodePos + (node3.text?.length ?? 0);
+  if (node3.isAtom)
+    return node3.isInline ? nodePos + node3.nodeSize : nodePos;
+  if (node3.isTextblock && node3.childCount === 0)
+    return nodePos + 1;
+  for (let index2 = node3.childCount - 1, offset$1 = node3.content.size;index2 >= 0; index2 -= 1) {
+    const child = node3.child(index2);
+    offset$1 -= child.nodeSize;
+    const found2 = findLastContentCursorPosInNode(child, nodePos + 1 + offset$1);
+    if (found2 != null)
+      return found2;
+  }
+  if (node3.isTextblock)
+    return nodePos + node3.nodeSize - 1;
+  return null;
+}
 function collectSDTNodes(doc$12) {
   const sdtNodes = [];
   doc$12.descendants((node3, pos) => {
     if (node3.type.name === "structuredContent" || node3.type.name === "structuredContentBlock")
       sdtNodes.push({
         type: node3.type.name,
+        node: node3,
         lockMode: node3.attrs.lockMode,
         pos,
         end: pos + node3.nodeSize
@@ -223171,6 +223239,15 @@ function isAtBlockSdtWrapperDeletePosition(state, sdt, pos) {
     return false;
   return $pos.before(textblockDepth) === $pos.start(sdtDepth);
 }
+function selectionCoversSdtContent(sdt, from$1, to) {
+  if (from$1 === sdt.pos + 1 && to === sdt.end - 1)
+    return true;
+  if (sdt.type !== "structuredContentBlock")
+    return false;
+  const contentStart = findFirstContentCursorPosInNode(sdt.node, sdt.pos);
+  const contentEnd = findLastContentCursorPosInNode(sdt.node, sdt.pos);
+  return contentStart != null && contentEnd != null && from$1 === contentStart && to === contentEnd;
+}
 function createStructuredContentLockPlugin() {
   return new Plugin({
     key: STRUCTURED_CONTENT_LOCK_KEY,
@@ -223198,7 +223275,7 @@ function createStructuredContentLockPlugin() {
         if (sdtNodes.length === 0)
           return false;
         if (from$1 !== to && !(selection instanceof NodeSelection)) {
-          const exactContentSDT = sdtNodes.find((s2) => from$1 === s2.pos + 1 && to === s2.end - 1);
+          const exactContentSDT = sdtNodes.find((s2) => selectionCoversSdtContent(s2, from$1, to));
           if (exactContentSDT) {
             const isContentLocked = exactContentSDT.lockMode === "contentLocked" || exactContentSDT.lockMode === "sdtContentLocked";
             const isWrapperDeletable = exactContentSDT.lockMode !== "sdtLocked" && exactContentSDT.lockMode !== "sdtContentLocked";
@@ -224331,80 +224408,70 @@ function shallowEqual$2(a2, b$1) {
       return false;
   return true;
 }
-function isSdtContentFullyLocked(node3) {
-  return node3.attrs.lockMode === "sdtContentLocked";
-}
-function findAncestorDepth$2($pos, predicate) {
+function findAncestorDepth$3($pos, predicate) {
   for (let depth = $pos.depth;depth > 0; depth -= 1)
     if (predicate($pos.node(depth)))
       return depth;
   return null;
 }
-function isZeroWidthMarker(node3) {
-  if (node3.type.name === "fieldAnnotation" && node3.attrs?.hidden === true)
-    return true;
-  return ZERO_WIDTH_MARKER_NODE_NAMES.has(node3.type.name);
-}
-function findFirstTextPosInNode(node3, nodePos) {
-  if (node3.isText)
-    return nodePos;
-  for (let index2 = 0, offset$1 = 0;index2 < node3.childCount; index2 += 1) {
-    const child = node3.child(index2);
-    const found2 = findFirstTextPosInNode(child, nodePos + 1 + offset$1);
-    if (found2 != null)
-      return found2;
-    offset$1 += child.nodeSize;
+function findSiblingAcrossHiddenMarkers$1(doc$12, pos, direction) {
+  let currentPos = pos;
+  let node3 = direction === "before" ? doc$12.resolve(currentPos).nodeBefore : doc$12.resolve(currentPos).nodeAfter;
+  while (node3 && isZeroWidthMarker(node3)) {
+    currentPos += direction === "before" ? -node3.nodeSize : node3.nodeSize;
+    node3 = direction === "before" ? doc$12.resolve(currentPos).nodeBefore : doc$12.resolve(currentPos).nodeAfter;
   }
-  return null;
+  return {
+    node: node3,
+    nodePos: direction === "before" && node3 ? currentPos - node3.nodeSize : currentPos
+  };
 }
-function findFirstContentCursorPosInNode(node3, nodePos) {
-  if (isZeroWidthMarker(node3))
+function isAtTextBlockBoundary($from, direction) {
+  const textblockDepth = findAncestorDepth$3($from, (node3) => node3.isTextblock);
+  if (textblockDepth == null)
     return null;
-  if (node3.isText || node3.isAtom)
-    return nodePos;
-  if (node3.isTextblock && node3.childCount === 0)
-    return nodePos + 1;
-  for (let index2 = 0, offset$1 = 0;index2 < node3.childCount; index2 += 1) {
-    const child = node3.child(index2);
-    const found2 = findFirstContentCursorPosInNode(child, nodePos + 1 + offset$1);
-    if (found2 != null)
-      return found2;
-    offset$1 += child.nodeSize;
-  }
-  if (node3.isTextblock)
-    return nodePos + 1;
-  return null;
+  const textblock = $from.node(textblockDepth);
+  const textblockPos = $from.before(textblockDepth);
+  const boundary = direction === "before" ? findFirstContentCursorPosInNode(textblock, textblockPos) ?? $from.start(textblockDepth) : findLastContentCursorPosInNode(textblock, textblockPos) ?? $from.end(textblockDepth);
+  if ($from.pos !== boundary)
+    return null;
+  return {
+    textblockDepth,
+    textblockPos
+  };
 }
-function findLastTextPosInNode(node3, nodePos) {
-  if (node3.isText)
-    return nodePos + (node3.text?.length ?? 0);
-  for (let index2 = node3.childCount - 1, offset$1 = node3.content.size;index2 >= 0; index2 -= 1) {
-    const child = node3.child(index2);
-    offset$1 -= child.nodeSize;
-    const found2 = findLastTextPosInNode(child, nodePos + 1 + offset$1);
-    if (found2 != null)
-      return found2;
-  }
-  return null;
+function selectAdjacentBlockSdtContent(direction) {
+  return ({ state, dispatch }) => {
+    const { selection } = state;
+    if (!selection.empty)
+      return false;
+    const boundary = isAtTextBlockBoundary(selection.$from, direction);
+    if (!boundary)
+      return false;
+    const siblingBoundaryPos = direction === "before" ? boundary.textblockPos : selection.$from.after(boundary.textblockDepth);
+    const { node: node3, nodePos } = findSiblingAcrossHiddenMarkers$1(state.doc, siblingBoundaryPos, direction);
+    if (node3?.type.name !== "structuredContentBlock")
+      return false;
+    if (node3.content.size === 0)
+      return false;
+    const contentStart = findFirstContentCursorPosInNode(node3, nodePos);
+    const contentEnd = findLastContentCursorPosInNode(node3, nodePos);
+    if (contentStart == null || contentEnd == null)
+      return false;
+    if (contentStart >= contentEnd)
+      return false;
+    if (dispatch)
+      dispatch(state.tr.setSelection(TextSelection.create(state.doc, contentStart, contentEnd)).scrollIntoView());
+    return true;
+  };
 }
-function findLastContentCursorPosInNode(node3, nodePos) {
-  if (isZeroWidthMarker(node3))
-    return null;
-  if (node3.isText)
-    return nodePos + (node3.text?.length ?? 0);
-  if (node3.isAtom)
-    return node3.isInline ? nodePos + node3.nodeSize : nodePos;
-  if (node3.isTextblock && node3.childCount === 0)
-    return nodePos + 1;
-  for (let index2 = node3.childCount - 1, offset$1 = node3.content.size;index2 >= 0; index2 -= 1) {
-    const child = node3.child(index2);
-    offset$1 -= child.nodeSize;
-    const found2 = findLastContentCursorPosInNode(child, nodePos + 1 + offset$1);
-    if (found2 != null)
-      return found2;
-  }
-  if (node3.isTextblock)
-    return nodePos + node3.nodeSize - 1;
+function isSdtContentFullyLocked(node3) {
+  return node3.attrs.lockMode === "sdtContentLocked";
+}
+function findAncestorDepth$2($pos, predicate) {
+  for (let depth = $pos.depth;depth > 0; depth -= 1)
+    if (predicate($pos.node(depth)))
+      return depth;
   return null;
 }
 function findAncestorDepth$1($pos, predicate) {
@@ -283216,7 +283283,7 @@ var Node$13 = class Node$14 {
     const transaction = view.state.tr.setSelection(selection);
     view.dispatch(transaction);
   }
-}, StructuredContentInlineView, findChildren$12, SD_BLOCK_ID_ATTRIBUTE_NAME = "sdBlockId", SD_BLOCK_REV_ATTRIBUTE_NAME = "sdBlockRev", BLOCK_NODE_METADATA_UPDATE_META = "blockNodeMetadataUpdate", BlockNodePluginKey, BlockNode, nodeAllowsSdBlockIdAttr = (node3) => {
+}, StructuredContentInlineView, ZERO_WIDTH_MARKER_NODE_NAMES, findChildren$12, SD_BLOCK_ID_ATTRIBUTE_NAME = "sdBlockId", SD_BLOCK_REV_ATTRIBUTE_NAME = "sdBlockRev", BLOCK_NODE_METADATA_UPDATE_META = "blockNodeMetadataUpdate", BlockNodePluginKey, BlockNode, nodeAllowsSdBlockIdAttr = (node3) => {
   return !!(node3?.isBlock && node3?.type?.spec?.attrs?.[SD_BLOCK_ID_ATTRIBUTE_NAME]);
 }, nodeAllowsSdBlockRevAttr = (node3) => {
   return !!(node3?.isBlock && node3?.type?.spec?.attrs?.[SD_BLOCK_REV_ATTRIBUTE_NAME]);
@@ -284872,7 +284939,7 @@ var Node$13 = class Node$14 {
     dispatch(tr.scrollIntoView());
   }
   return true;
-}, deleteBlockSdtAtTextBlockStart = () => ({ state, dispatch }) => {
+}, selectBlockSdtBeforeTextBlockStart = () => selectAdjacentBlockSdtContent("before"), selectBlockSdtAfterTextBlockEnd = () => selectAdjacentBlockSdtContent("after"), deleteBlockSdtAtTextBlockStart = () => ({ state, dispatch }) => {
   const { selection } = state;
   if (!selection.empty)
     return false;
@@ -284901,7 +284968,7 @@ var Node$13 = class Node$14 {
     dispatch(tr.setSelection(Selection.near(tr.doc.resolve(selectionPos), -1)).scrollIntoView());
   }
   return true;
-}, ZERO_WIDTH_MARKER_NODE_NAMES, moveIntoBlockSdtBeforeTextBlockStart = () => moveIntoAdjacentBlockSdt("before"), moveIntoBlockSdtAfterTextBlockEnd = () => moveIntoAdjacentBlockSdt("after"), deleteSkipEmptyRun = () => ({ state, dispatch }) => {
+}, moveIntoBlockSdtBeforeTextBlockStart = () => moveIntoAdjacentBlockSdt("before"), moveIntoBlockSdtAfterTextBlockEnd = () => moveIntoAdjacentBlockSdt("after"), deleteSkipEmptyRun = () => ({ state, dispatch }) => {
   const sel = state.selection;
   if (!sel.empty)
     return false;
@@ -296268,6 +296335,7 @@ var Node$13 = class Node$14 {
     },
     () => commands$1.deleteBlockSdtAtTextBlockStart(),
     () => commands$1.selectInlineSdtBeforeRunStart(),
+    () => commands$1.selectBlockSdtBeforeTextBlockStart(),
     () => commands$1.moveIntoBlockSdtBeforeTextBlockStart(),
     () => commands$1.backspaceEmptyRunParagraph(),
     () => commands$1.backspaceSkipEmptyRun(),
@@ -296286,6 +296354,7 @@ var Node$13 = class Node$14 {
   return editor.commands.first(({ commands: commands$1 }) => [
     () => commands$1.deleteBlockSdtAtTextBlockStart(),
     () => commands$1.selectInlineSdtAfterRunEnd(),
+    () => commands$1.selectBlockSdtAfterTextBlockEnd(),
     () => commands$1.moveIntoBlockSdtAfterTextBlockEnd(),
     () => commands$1.deleteSkipEmptyRun(),
     () => commands$1.deleteAtomAfter(),
@@ -318874,7 +318943,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_B9A7ox0h_es = __esm(() => {
+var init_src_D1Zc7Jgj_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_C6hKp29w_es();
   init_jszip_C49i9kUs_es();
@@ -320632,6 +320701,22 @@ ${err.toString()}`);
       return true;
     }
   };
+  ZERO_WIDTH_MARKER_NODE_NAMES = new Set([
+    "bookmarkStart",
+    "bookmarkEnd",
+    "commentRangeStart",
+    "commentRangeEnd",
+    "commentReference",
+    "permStart",
+    "permEnd",
+    "permStartBlock",
+    "permEndBlock",
+    "tableOfContentsEntry",
+    "indexEntry",
+    "authorityEntry",
+    "passthroughInline",
+    "passthroughBlock"
+  ]);
   ({ findChildren: findChildren$12 } = helpers_exports);
   BlockNodePluginKey = new PluginKey("blockNodePlugin");
   BlockNode = Extension.create({
@@ -321900,22 +321985,6 @@ ${err.toString()}`);
     macBaseKeymap[key2] = pcBaseKeymap[key2];
   typeof navigator != "undefined" ? /Mac|iP(hone|[oa]d)/.test(navigator.platform) : typeof os != "undefined" && os.platform && os.platform();
   DELETABLE_INLINE_ATOMS$1 = new Set(["noBreakHyphen"]);
-  ZERO_WIDTH_MARKER_NODE_NAMES = new Set([
-    "bookmarkStart",
-    "bookmarkEnd",
-    "commentRangeStart",
-    "commentRangeEnd",
-    "commentReference",
-    "permStart",
-    "permEnd",
-    "permStartBlock",
-    "permEndBlock",
-    "tableOfContentsEntry",
-    "indexEntry",
-    "authorityEntry",
-    "passthroughInline",
-    "passthroughBlock"
-  ]);
   DELETABLE_INLINE_ATOMS = new Set(["noBreakHyphen"]);
   commands_exports = /* @__PURE__ */ __export3({
     SELECT_INLINE_SDT_BEFORE_RUN_START_META: () => SELECT_INLINE_SDT_BEFORE_RUN_START_META,
@@ -321966,6 +322035,8 @@ ${err.toString()}`);
     resetAttributes: () => resetAttributes,
     restoreSelection: () => restoreSelection,
     selectAll: () => selectAll$1,
+    selectBlockSdtAfterTextBlockEnd: () => selectBlockSdtAfterTextBlockEnd,
+    selectBlockSdtBeforeTextBlockStart: () => selectBlockSdtBeforeTextBlockStart,
     selectInlineSdtAfterRunEnd: () => selectInlineSdtAfterRunEnd,
     selectInlineSdtBeforeRunStart: () => selectInlineSdtBeforeRunStart,
     selectNodeBackward: () => selectNodeBackward$1,
@@ -353127,7 +353198,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_B9A7ox0h_es();
+  init_src_D1Zc7Jgj_es();
   init_SuperConverter_C6hKp29w_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.15.0-next.5",
+  "version": "0.15.0-next.6",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,8 +25,8 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "superdoc": "1.37.0"
   },
   "module": "src/index.ts",
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.15.0-next.5",
-    "@superdoc-dev/cli-darwin-arm64": "0.15.0-next.5",
-    "@superdoc-dev/cli-linux-x64": "0.15.0-next.5",
-    "@superdoc-dev/cli-linux-arm64": "0.15.0-next.5",
-    "@superdoc-dev/cli-windows-x64": "0.15.0-next.5"
+    "@superdoc-dev/cli-darwin-arm64": "0.15.0-next.6",
+    "@superdoc-dev/cli-darwin-x64": "0.15.0-next.6",
+    "@superdoc-dev/cli-linux-x64": "0.15.0-next.6",
+    "@superdoc-dev/cli-linux-arm64": "0.15.0-next.6",
+    "@superdoc-dev/cli-windows-x64": "0.15.0-next.6"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",