@superdoc-dev/cli 0.2.0-next.87 → 0.2.0-next.89

package/dist/index.js

@@ -886,13 +886,13 @@ var schemaBooleanOrNull = () => ({
   tracked: true,
   carrier: markCarrier(markName),
   schema: schemaBooleanOrNull()
-}), markTextStyleValue = (key, type, ooxmlElement, schema) => ({
+}), markTextStyleValue = (key, type, ooxmlElement, schema, textStyleAttr) => ({
   key,
   type,
   ooxmlElement,
   storage: "mark",
   tracked: true,
-  carrier: markCarrier("textStyle", key),
+  carrier: markCarrier("textStyle", textStyleAttr ?? key),
   schema
 }), runAttribute = (key, type, ooxmlElement, schema, runPropertyKey) => ({
   key,
@@ -957,7 +957,7 @@ var init_inline_run_patch = __esm(() => {
     markTextStyleValue("position", "number", "w:position", schemaNumberOrNull()),
     runAttribute("dstrike", "boolean", "w:dstrike", schemaBooleanOrNull()),
     runAttribute("smallCaps", "boolean", "w:smallCaps", schemaBooleanOrNull()),
-    runAttribute("caps", "boolean", "w:caps", schemaBooleanOrNull()),
+    markTextStyleValue("caps", "boolean", "w:caps", schemaBooleanOrNull(), "textTransform"),
     runAttribute("shading", "object", "w:shd", schemaObjectOrNull({
       fill: { oneOf: [{ type: "string", minLength: 1 }, { type: "null" }] },
       color: { oneOf: [{ type: "string", minLength: 1 }, { type: "null" }] },
@@ -33220,7 +33220,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-BcmJ8-gc.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CHHvo5ta.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -53630,13 +53630,13 @@ var isRegExp = (value) => {
   tracked: true,
   carrier: markCarrier2(markName),
   schema: schemaBooleanOrNull2()
-}), markTextStyleValue2 = (key, type, ooxmlElement, schema) => ({
+}), markTextStyleValue2 = (key, type, ooxmlElement, schema, textStyleAttr) => ({
   key,
   type,
   ooxmlElement,
   storage: "mark",
   tracked: true,
-  carrier: markCarrier2("textStyle", key),
+  carrier: markCarrier2("textStyle", textStyleAttr ?? key),
   schema
 }), runAttribute2 = (key, type, ooxmlElement, schema, runPropertyKey) => ({
   key,
@@ -65012,7 +65012,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_BcmJ8_gc_es = __esm(() => {
+var init_SuperConverter_CHHvo5ta_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -67552,7 +67552,7 @@ var init_SuperConverter_BcmJ8_gc_es = __esm(() => {
     markTextStyleValue2("position", "number", "w:position", schemaNumberOrNull2()),
     runAttribute2("dstrike", "boolean", "w:dstrike", schemaBooleanOrNull2()),
     runAttribute2("smallCaps", "boolean", "w:smallCaps", schemaBooleanOrNull2()),
-    runAttribute2("caps", "boolean", "w:caps", schemaBooleanOrNull2()),
+    markTextStyleValue2("caps", "boolean", "w:caps", schemaBooleanOrNull2(), "textTransform"),
     runAttribute2("shading", "object", "w:shd", schemaObjectOrNull2({
       fill: { oneOf: [{
         type: "string",
@@ -121745,9 +121745,9 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-LqliKMID.es.js
-var exports_src_LqliKMID_es = {};
-__export(exports_src_LqliKMID_es, {
+// ../../packages/superdoc/dist/chunks/src-CKjtLfFG.es.js
+var exports_src_CKjtLfFG_es = {};
+__export(exports_src_CKjtLfFG_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -127544,6 +127544,20 @@ function skipTab(dir) {
     return true;
   };
 }
+function tableSeparatorNeeds$1(doc$2, pos) {
+  const $pos = doc$2.resolve(pos);
+  if ($pos.depth !== 0)
+    return {
+      before: false,
+      after: false
+    };
+  const indexAfter = $pos.index(0);
+  const nodeAfter = indexAfter < doc$2.childCount ? doc$2.child(indexAfter) : null;
+  return {
+    before: (indexAfter > 0 ? doc$2.child(indexAfter - 1) : null)?.type.name === "table",
+    after: !nodeAfter || nodeAfter.type.name === "table"
+  };
+}
 function isVisuallyEmptyParagraph(node3) {
   if (!node3 || node3.type.name !== "paragraph")
     return false;
@@ -132162,6 +132176,11 @@ function toPointString(value) {
 function toHalfPoints(value) {
   return Math.round(value * 2);
 }
+function capsToTextTransform(caps) {
+  if (caps === null)
+    return null;
+  return caps ? "uppercase" : "none";
+}
 function collectInlineTextSegments(doc$2, absFrom, absTo) {
   const segments = [];
   doc$2.nodesBetween(absFrom, absTo, (node3, pos) => {
@@ -132211,8 +132230,7 @@ function applyHighlightPatch(tr, markType, absFrom, absTo, value) {
 }
 function mergeTextStyleAttrs(currentAttrs, patch3) {
   const next2 = { ...currentAttrs };
-  for (const key$1 of TEXT_STYLE_KEYS) {
-    const value = patch3[key$1];
+  for (const [key$1, value] of Object.entries(patch3)) {
     if (value === undefined)
       continue;
     if (value === null) {
@@ -132515,6 +132533,8 @@ function applyInlinePatchToRange(editor, tr, absFrom, absTo, inline) {
   for (const key$1 of TEXT_STYLE_KEYS)
     if (inline[key$1] !== undefined)
       textStylePatch[key$1] = inline[key$1];
+  if (inline.caps !== undefined)
+    textStylePatch.textTransform = capsToTextTransform(inline.caps ?? null);
   if (applyTextStylePatch(tr, schema.marks.textStyle, absFrom, absTo, textStylePatch))
     changed = true;
   const runAttributeUpdates = buildRunAttributeUpdates(inline);
@@ -133011,6 +133031,11 @@ function editorHasDom(editor) {
   const opts = editor.options;
   return !!(opts?.document ?? opts?.mockDocument ?? (typeof document !== "undefined" ? document : null));
 }
+function ensureTableSeparators(jsonNodes) {
+  for (let i$1 = jsonNodes.length - 2;i$1 >= 0; i$1--)
+    if (jsonNodes[i$1].type === "table" && jsonNodes[i$1 + 1].type === "table")
+      jsonNodes.splice(i$1 + 1, 0, { type: "paragraph" });
+}
 function normalizeWriteLocator(request) {
   if (request.kind === "insert") {
     const hasBlockId = request.blockId !== undefined;
@@ -133472,6 +133497,22 @@ function insertStructuredWrapper(editor, input2, options) {
       }
       const jsonNodes = [];
       fragment.forEach((node3) => jsonNodes.push(node3.toJSON()));
+      ensureTableSeparators(jsonNodes);
+      if (from$12 === to) {
+        const $pos = editor.state.doc.resolve(from$12);
+        const parent = $pos.parent;
+        if (parent.isTextblock && !parent.childCount) {
+          const grandparent = $pos.node($pos.depth - 1);
+          const idx = $pos.index($pos.depth - 1);
+          const prevIsTable = idx > 0 && grandparent.child(idx - 1).type.name === "table";
+          const nextIsTable = idx + 1 < grandparent.childCount && grandparent.child(idx + 1).type.name === "table";
+          const atEnd = idx + 1 >= grandparent.childCount;
+          if (jsonNodes[0]?.type === "table" && prevIsTable)
+            jsonNodes.unshift({ type: "paragraph" });
+          if (jsonNodes[jsonNodes.length - 1]?.type === "table" && (nextIsTable || atEnd))
+            jsonNodes.push({ type: "paragraph" });
+        }
+      }
       const ok3 = Boolean(editor.commands.insertContentAt({
         from: from$12,
         to
@@ -163756,6 +163797,20 @@ function insertRowAtIndex({ tr, tablePos, tableNode, sourceRowIndex, insertIndex
   }
   return true;
 }
+function tableSeparatorNeeds(doc$2, pos) {
+  const $pos = doc$2.resolve(pos);
+  if ($pos.depth !== 0)
+    return {
+      before: false,
+      after: false
+    };
+  const indexAfter = $pos.index(0);
+  const nodeAfter = indexAfter < doc$2.childCount ? doc$2.child(indexAfter) : null;
+  return {
+    before: (indexAfter > 0 ? doc$2.child(indexAfter - 1) : null)?.type.name === "table",
+    after: !nodeAfter || nodeAfter.type.name === "table"
+  };
+}
 function getCellType({ node: node3, state }) {
   return tableNodeTypes(state.schema)[node3.type.spec.tableRole];
 }
@@ -176501,7 +176556,25 @@ var Node$13 = class Node$14 {
     }
     const tableAttrs = sdBlockId ? { sdBlockId } : undefined;
     const tableNode = tableType.createChecked(tableAttrs, rowNodes);
-    const tr = state.tr.insert(pos, tableNode);
+    const sep = tableSeparatorNeeds$1(state.doc, pos);
+    let tr;
+    if (sep.before || sep.after) {
+      const makeSep = () => state.schema.nodes.paragraph.createAndFill();
+      const nodes = [];
+      if (sep.before) {
+        const s2 = makeSep();
+        if (s2)
+          nodes.push(s2);
+      }
+      nodes.push(tableNode);
+      if (sep.after) {
+        const s2 = makeSep();
+        if (s2)
+          nodes.push(s2);
+      }
+      tr = state.tr.insert(pos, Fragment.from(nodes));
+    } else
+      tr = state.tr.insert(pos, tableNode);
     if (!dispatch)
       return true;
     tr.setMeta("inputType", "programmatic");
@@ -198723,9 +198796,9 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$2, _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, _hoisted_2$1, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_HEIGHT_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, POPOVER_VERTICAL_OFFSET_PX = 15, 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_LqliKMID_es = __esm(() => {
+var init_src_CKjtLfFG_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_BcmJ8_gc_es();
+  init_SuperConverter_CHHvo5ta_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_CMPtQbp7_es();
@@ -222643,7 +222716,30 @@ function print() { __p += __j.call(arguments, '') }
             };
             const tableNode = tableType.createChecked(tableAttrs, rowNodes);
             if (dispatch) {
-              tr.insert(pos, tableNode);
+              const sep = tableSeparatorNeeds(state.doc, pos);
+              const makeSep = () => {
+                const attrs = {
+                  sdBlockId: v4_default(),
+                  paraId: genParaId()
+                };
+                return state.schema.nodes.paragraph.createAndFill(attrs);
+              };
+              if (sep.before || sep.after) {
+                const nodes = [];
+                if (sep.before) {
+                  const s2 = makeSep();
+                  if (s2)
+                    nodes.push(s2);
+                }
+                nodes.push(tableNode);
+                if (sep.after) {
+                  const s2 = makeSep();
+                  if (s2)
+                    nodes.push(s2);
+                }
+                tr.insert(pos, Fragment.from(nodes));
+              } else
+                tr.insert(pos, tableNode);
               tr.setMeta("inputType", "programmatic");
               if (tracked === true)
                 tr.setMeta("forceTrackChanges", true);
@@ -230433,8 +230529,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_LqliKMID_es == "object" && exports_src_LqliKMID_es && !exports_src_LqliKMID_es.nodeType && exports_src_LqliKMID_es;
-  freeModule$2 = freeExports$2 && typeof module_src_LqliKMID_es == "object" && module_src_LqliKMID_es && !module_src_LqliKMID_es.nodeType && module_src_LqliKMID_es;
+  freeExports$2 = typeof exports_src_CKjtLfFG_es == "object" && exports_src_CKjtLfFG_es && !exports_src_CKjtLfFG_es.nodeType && exports_src_CKjtLfFG_es;
+  freeModule$2 = freeExports$2 && typeof module_src_CKjtLfFG_es == "object" && module_src_CKjtLfFG_es && !module_src_CKjtLfFG_es.nodeType && module_src_CKjtLfFG_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 = {};
@@ -230442,8 +230538,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_LqliKMID_es == "object" && exports_src_LqliKMID_es && !exports_src_LqliKMID_es.nodeType && exports_src_LqliKMID_es;
-  freeModule$1 = freeExports$1 && typeof module_src_LqliKMID_es == "object" && module_src_LqliKMID_es && !module_src_LqliKMID_es.nodeType && module_src_LqliKMID_es;
+  freeExports$1 = typeof exports_src_CKjtLfFG_es == "object" && exports_src_CKjtLfFG_es && !exports_src_CKjtLfFG_es.nodeType && exports_src_CKjtLfFG_es;
+  freeModule$1 = freeExports$1 && typeof module_src_CKjtLfFG_es == "object" && module_src_CKjtLfFG_es && !module_src_CKjtLfFG_es.nodeType && module_src_CKjtLfFG_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -230548,8 +230644,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_LqliKMID_es == "object" && exports_src_LqliKMID_es && !exports_src_LqliKMID_es.nodeType && exports_src_LqliKMID_es;
-  freeModule = freeExports && typeof module_src_LqliKMID_es == "object" && module_src_LqliKMID_es && !module_src_LqliKMID_es.nodeType && module_src_LqliKMID_es;
+  freeExports = typeof exports_src_CKjtLfFG_es == "object" && exports_src_CKjtLfFG_es && !exports_src_CKjtLfFG_es.nodeType && exports_src_CKjtLfFG_es;
+  freeModule = freeExports && typeof module_src_CKjtLfFG_es == "object" && module_src_CKjtLfFG_es && !module_src_CKjtLfFG_es.nodeType && module_src_CKjtLfFG_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -238629,8 +238725,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_LqliKMID_es();
-  init_SuperConverter_BcmJ8_gc_es();
+  init_src_CKjtLfFG_es();
+  init_SuperConverter_CHHvo5ta_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CMPtQbp7_es();
@@ -302702,6 +302798,11 @@ function toPointString2(value) {
 function toHalfPoints2(value) {
   return Math.round(value * 2);
 }
+function capsToTextTransform2(caps) {
+  if (caps === null)
+    return null;
+  return caps ? "uppercase" : "none";
+}
 function collectInlineTextSegments2(doc4, absFrom, absTo) {
   const segments = [];
   doc4.nodesBetween(absFrom, absTo, (node4, pos) => {
@@ -302751,8 +302852,7 @@ function applyHighlightPatch2(tr, markType, absFrom, absTo, value) {
 }
 function mergeTextStyleAttrs2(currentAttrs, patch3) {
   const next2 = { ...currentAttrs };
-  for (const key2 of TEXT_STYLE_KEYS2) {
-    const value = patch3[key2];
+  for (const [key2, value] of Object.entries(patch3)) {
     if (value === undefined)
       continue;
     if (value === null) {
@@ -303050,6 +303150,9 @@ function applyInlinePatchToRange2(editor, tr, absFrom, absTo, inline) {
       textStylePatch[key2] = inline[key2];
     }
   }
+  if (inline.caps !== undefined) {
+    textStylePatch.textTransform = capsToTextTransform2(inline.caps ?? null);
+  }
   if (applyTextStylePatch2(tr, schema.marks.textStyle, absFrom, absTo, textStylePatch)) {
     changed = true;
   }
@@ -303588,6 +303691,13 @@ function editorHasDom2(editor) {
   const opts = editor.options;
   return !!(opts?.document ?? opts?.mockDocument ?? (typeof document !== "undefined" ? document : null));
 }
+function ensureTableSeparators2(jsonNodes) {
+  for (let i4 = jsonNodes.length - 2;i4 >= 0; i4--) {
+    if (jsonNodes[i4].type === "table" && jsonNodes[i4 + 1].type === "table") {
+      jsonNodes.splice(i4 + 1, 0, { type: "paragraph" });
+    }
+  }
+}
 function normalizeWriteLocator2(request) {
   if (request.kind === "insert") {
     const hasBlockId = request.blockId !== undefined;
@@ -303982,6 +304092,24 @@ function insertStructuredWrapper2(editor, input2, options) {
       }
       const jsonNodes = [];
       fragment.forEach((node4) => jsonNodes.push(node4.toJSON()));
+      ensureTableSeparators2(jsonNodes);
+      if (from4 === to) {
+        const $pos = editor.state.doc.resolve(from4);
+        const parent = $pos.parent;
+        if (parent.isTextblock && !parent.childCount) {
+          const grandparent = $pos.node($pos.depth - 1);
+          const idx = $pos.index($pos.depth - 1);
+          const prevIsTable = idx > 0 && grandparent.child(idx - 1).type.name === "table";
+          const nextIsTable = idx + 1 < grandparent.childCount && grandparent.child(idx + 1).type.name === "table";
+          const atEnd = idx + 1 >= grandparent.childCount;
+          if (jsonNodes[0]?.type === "table" && prevIsTable) {
+            jsonNodes.unshift({ type: "paragraph" });
+          }
+          if (jsonNodes[jsonNodes.length - 1]?.type === "table" && (nextIsTable || atEnd)) {
+            jsonNodes.push({ type: "paragraph" });
+          }
+        }
+      }
       const ok5 = Boolean(editor.commands.insertContentAt({ from: from4, to }, jsonNodes));
       if (!ok5) {
         insertFailure = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.87",
+  "version": "0.2.0-next.89",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -30,11 +30,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.87",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.87",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.87",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.87",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.87"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.89",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.89",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.89",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.89",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.89"
   },
   "scripts": {
     "dev": "bun run src/index.ts",