@superdoc-dev/cli 0.2.0-next.33 → 0.2.0-next.34

package/dist/index.js

@@ -101805,9 +101805,9 @@ var init_remark_gfm_CQ3Jg4PR_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DA7AHLPf.es.js
-var exports_src_DA7AHLPf_es = {};
-__export(exports_src_DA7AHLPf_es, {
+// ../../packages/superdoc/dist/chunks/src-DoNUa3rb.es.js
+var exports_src_DoNUa3rb_es = {};
+__export(exports_src_DoNUa3rb_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -116993,26 +116993,69 @@ function tablesInsertCellAdapter(editor, input2, options) {
 function tablesDeleteCellAdapter(editor, input2, options) {
   rejectTrackedMode("tables.deleteCell", options);
   const { table: table2, cellPos, cellNode, rowIndex, columnIndex } = resolveCellLocator(editor, input2, "tables.deleteCell");
+  const row2 = table2.candidate.node.child(rowIndex);
+  const deletedColspan = Math.max(1, cellNode.attrs.colspan || 1);
+  const deletedColwidth = Array.isArray(cellNode.attrs.colwidth) ? [...cellNode.attrs.colwidth] : null;
+  if (input2.mode === "shiftLeft" && row2.childCount <= 1)
+    return toTableFailure("NO_OP", "Cannot shift-left delete the last remaining cell in a row.");
   if (options?.dryRun)
     return buildTableSuccess(table2.address);
   try {
     const tr = editor.state.tr;
-    const tableStart = table2.candidate.pos + 1;
+    const tablePos = table2.candidate.pos;
+    const tableStart = tablePos + 1;
     const tableNode = table2.candidate.node;
     const map$22 = TableMap.get(tableNode);
     const schema = editor.state.schema;
     tr.delete(cellPos, cellPos + cellNode.nodeSize);
     if (input2.mode === "shiftLeft") {
-      const row2 = tableNode.child(rowIndex);
-      tr.mapping.map(tableStart + map$22.positionAt(rowIndex, map$22.width - 1, tableNode));
-      const lastCell = row2.child(row2.childCount - 1);
-      tr.mapping.map(cellPos + cellNode.nodeSize + lastCell.nodeSize - cellNode.nodeSize);
-      let rowEndPos = table2.candidate.pos + 1;
-      for (let i$1 = 0;i$1 <= rowIndex; i$1++)
-        rowEndPos += tableNode.child(i$1).nodeSize;
-      const mappedRowEnd = tr.mapping.map(rowEndPos - 1);
-      const newCell = schema.nodes.tableCell.createAndFill();
-      tr.insert(mappedRowEnd, newCell);
+      const currentTableNode = tr.doc.nodeAt(tablePos);
+      if (!currentTableNode || currentTableNode.type.name !== "table")
+        return toTableFailure("INVALID_TARGET", "Cell deletion could not locate the updated table.");
+      const currentRow = currentTableNode.child(rowIndex);
+      const lastCellIndex = currentRow.childCount - 1;
+      const lastAttrs = currentRow.child(lastCellIndex).attrs;
+      const tableCellProperties = lastAttrs.tableCellProperties ?? {};
+      const lastRowspan = Math.max(1, lastAttrs.rowspan || 1);
+      const hasVerticalMerge = tableCellProperties.vMerge != null;
+      if (lastRowspan > 1 || hasVerticalMerge) {
+        let rowEndPos = tablePos + 1;
+        for (let i$1 = 0;i$1 <= rowIndex; i$1++)
+          rowEndPos += currentTableNode.child(i$1).nodeSize;
+        const mappedRowEnd = rowEndPos - 1;
+        const newCell = schema.nodes.tableCell.createAndFill();
+        tr.insert(mappedRowEnd, newCell);
+      } else {
+        const nextColspan = Math.max(1, lastAttrs.colspan || 1) + deletedColspan;
+        const nextTableCellProps = { ...tableCellProperties };
+        if (nextColspan > 1)
+          nextTableCellProps.gridSpan = nextColspan;
+        else
+          delete nextTableCellProps.gridSpan;
+        const nextColwidth = Array.isArray(lastAttrs.colwidth) ? [...lastAttrs.colwidth] : null;
+        if (nextColwidth) {
+          if (deletedColwidth)
+            for (const width of deletedColwidth) {
+              if (nextColwidth.length >= nextColspan)
+                break;
+              nextColwidth.push(typeof width === "number" ? width : 0);
+            }
+          while (nextColwidth.length < nextColspan)
+            nextColwidth.push(0);
+        }
+        let rowOffset = 0;
+        for (let i$1 = 0;i$1 < rowIndex; i$1++)
+          rowOffset += currentTableNode.child(i$1).nodeSize;
+        let lastCellOffset = rowOffset + 1;
+        for (let i$1 = 0;i$1 < lastCellIndex; i$1++)
+          lastCellOffset += currentRow.child(i$1).nodeSize;
+        tr.setNodeMarkup(tableStart + lastCellOffset, null, {
+          ...lastAttrs,
+          colspan: nextColspan,
+          colwidth: nextColwidth,
+          tableCellProperties: nextTableCellProps
+        });
+      }
     } else {
       const lastRowIndex = map$22.height - 1;
       const colOffset = map$22.map[lastRowIndex * map$22.width + columnIndex];
@@ -173043,7 +173086,7 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$1, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_DA7AHLPf_es = __esm(() => {
+var init_src_DoNUa3rb_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_BSZgN87C_es();
   init_jszip_ChlR43oI_es();
@@ -203936,8 +203979,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_DA7AHLPf_es == "object" && exports_src_DA7AHLPf_es && !exports_src_DA7AHLPf_es.nodeType && exports_src_DA7AHLPf_es;
-  freeModule$2 = freeExports$2 && typeof module_src_DA7AHLPf_es == "object" && module_src_DA7AHLPf_es && !module_src_DA7AHLPf_es.nodeType && module_src_DA7AHLPf_es;
+  freeExports$2 = typeof exports_src_DoNUa3rb_es == "object" && exports_src_DoNUa3rb_es && !exports_src_DoNUa3rb_es.nodeType && exports_src_DoNUa3rb_es;
+  freeModule$2 = freeExports$2 && typeof module_src_DoNUa3rb_es == "object" && module_src_DoNUa3rb_es && !module_src_DoNUa3rb_es.nodeType && module_src_DoNUa3rb_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -203945,8 +203988,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_DA7AHLPf_es == "object" && exports_src_DA7AHLPf_es && !exports_src_DA7AHLPf_es.nodeType && exports_src_DA7AHLPf_es;
-  freeModule$1 = freeExports$1 && typeof module_src_DA7AHLPf_es == "object" && module_src_DA7AHLPf_es && !module_src_DA7AHLPf_es.nodeType && module_src_DA7AHLPf_es;
+  freeExports$1 = typeof exports_src_DoNUa3rb_es == "object" && exports_src_DoNUa3rb_es && !exports_src_DoNUa3rb_es.nodeType && exports_src_DoNUa3rb_es;
+  freeModule$1 = freeExports$1 && typeof module_src_DoNUa3rb_es == "object" && module_src_DoNUa3rb_es && !module_src_DoNUa3rb_es.nodeType && module_src_DoNUa3rb_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -204051,8 +204094,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_DA7AHLPf_es == "object" && exports_src_DA7AHLPf_es && !exports_src_DA7AHLPf_es.nodeType && exports_src_DA7AHLPf_es;
-  freeModule = freeExports && typeof module_src_DA7AHLPf_es == "object" && module_src_DA7AHLPf_es && !module_src_DA7AHLPf_es.nodeType && module_src_DA7AHLPf_es;
+  freeExports = typeof exports_src_DoNUa3rb_es == "object" && exports_src_DoNUa3rb_es && !exports_src_DoNUa3rb_es.nodeType && exports_src_DoNUa3rb_es;
+  freeModule = freeExports && typeof module_src_DoNUa3rb_es == "object" && module_src_DoNUa3rb_es && !module_src_DoNUa3rb_es.nodeType && module_src_DoNUa3rb_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -211704,7 +211747,7 @@ var init_zipper_Cnk_HjM2_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DA7AHLPf_es();
+  init_src_DoNUa3rb_es();
   init_SuperConverter_BSZgN87C_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -272493,6 +272536,12 @@ function tablesDeleteCellAdapter2(editor, input2, options) {
   rejectTrackedMode2("tables.deleteCell", options);
   const resolved = resolveCellLocator2(editor, input2, "tables.deleteCell");
   const { table: table2, cellPos, cellNode, rowIndex, columnIndex } = resolved;
+  const row2 = table2.candidate.node.child(rowIndex);
+  const deletedColspan = Math.max(1, cellNode.attrs.colspan || 1);
+  const deletedColwidth = Array.isArray(cellNode.attrs.colwidth) ? [...cellNode.attrs.colwidth] : null;
+  if (input2.mode === "shiftLeft" && row2.childCount <= 1) {
+    return toTableFailure2("NO_OP", "Cannot shift-left delete the last remaining cell in a row.");
+  }
   if (options?.dryRun) {
     return buildTableSuccess2(table2.address);
   }
@@ -272505,16 +272554,59 @@ function tablesDeleteCellAdapter2(editor, input2, options) {
     const schema = editor.state.schema;
     tr.delete(cellPos, cellPos + cellNode.nodeSize);
     if (input2.mode === "shiftLeft") {
-      const row2 = tableNode.child(rowIndex);
-      const rowEnd = tr.mapping.map(tableStart + map8.positionAt(rowIndex, map8.width - 1, tableNode));
-      const lastCell = row2.child(row2.childCount - 1);
-      const insertPos = tr.mapping.map(cellPos + cellNode.nodeSize + lastCell.nodeSize - cellNode.nodeSize);
-      let rowEndPos = table2.candidate.pos + 1;
-      for (let i5 = 0;i5 <= rowIndex; i5++)
-        rowEndPos += tableNode.child(i5).nodeSize;
-      const mappedRowEnd = tr.mapping.map(rowEndPos - 1);
-      const newCell = schema.nodes.tableCell.createAndFill();
-      tr.insert(mappedRowEnd, newCell);
+      const currentTableNode = tr.doc.nodeAt(tablePos);
+      if (!currentTableNode || currentTableNode.type.name !== "table") {
+        return toTableFailure2("INVALID_TARGET", "Cell deletion could not locate the updated table.");
+      }
+      const currentRow = currentTableNode.child(rowIndex);
+      const lastCellIndex = currentRow.childCount - 1;
+      const lastCell = currentRow.child(lastCellIndex);
+      const lastAttrs = lastCell.attrs;
+      const tableCellProperties = lastAttrs.tableCellProperties ?? {};
+      const lastRowspan = Math.max(1, lastAttrs.rowspan || 1);
+      const hasVerticalMerge = tableCellProperties.vMerge != null;
+      if (lastRowspan > 1 || hasVerticalMerge) {
+        let rowEndPos = tablePos + 1;
+        for (let i5 = 0;i5 <= rowIndex; i5++)
+          rowEndPos += currentTableNode.child(i5).nodeSize;
+        const mappedRowEnd = rowEndPos - 1;
+        const newCell = schema.nodes.tableCell.createAndFill();
+        tr.insert(mappedRowEnd, newCell);
+      } else {
+        const lastColspan = Math.max(1, lastAttrs.colspan || 1);
+        const nextColspan = lastColspan + deletedColspan;
+        const nextTableCellProps = {
+          ...tableCellProperties
+        };
+        if (nextColspan > 1)
+          nextTableCellProps.gridSpan = nextColspan;
+        else
+          delete nextTableCellProps.gridSpan;
+        const nextColwidth = Array.isArray(lastAttrs.colwidth) ? [...lastAttrs.colwidth] : null;
+        if (nextColwidth) {
+          if (deletedColwidth) {
+            for (const width of deletedColwidth) {
+              if (nextColwidth.length >= nextColspan)
+                break;
+              nextColwidth.push(typeof width === "number" ? width : 0);
+            }
+          }
+          while (nextColwidth.length < nextColspan)
+            nextColwidth.push(0);
+        }
+        let rowOffset = 0;
+        for (let i5 = 0;i5 < rowIndex; i5++)
+          rowOffset += currentTableNode.child(i5).nodeSize;
+        let lastCellOffset = rowOffset + 1;
+        for (let i5 = 0;i5 < lastCellIndex; i5++)
+          lastCellOffset += currentRow.child(i5).nodeSize;
+        tr.setNodeMarkup(tableStart + lastCellOffset, null, {
+          ...lastAttrs,
+          colspan: nextColspan,
+          colwidth: nextColwidth,
+          tableCellProperties: nextTableCellProps
+        });
+      }
     } else {
       const lastRowIndex = map8.height - 1;
       const colOffset = map8.map[lastRowIndex * map8.width + columnIndex];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.33",
+  "version": "0.2.0-next.34",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -21,19 +21,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.16.0",
-    "@superdoc/super-editor": "0.0.1"
+    "@superdoc/super-editor": "0.0.1",
+    "superdoc": "1.16.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.33",
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.33",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.33",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.33",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.33"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.34",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.34",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.34",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.34",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.34"
   },
   "scripts": {
     "dev": "bun run src/index.ts",