@superdoc-dev/cli 0.3.0-next.40 → 0.3.0-next.42

package/dist/index.js

@@ -39922,7 +39922,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-DarcJh0X.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-oKnAIRIw.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -85997,7 +85997,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_DarcJh0X_es = __esm(() => {
+var init_SuperConverter_oKnAIRIw_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -122099,7 +122099,7 @@ var init_SuperConverter_DarcJh0X_es = __esm(() => {
       if (!editor)
         return;
       try {
-        const stats = getWordStatistics(editor);
+        const stats = getWordStatistics(resolveMainBodyEditor(editor));
         writeAppStatistics(this.convertedXml, stats);
         const settingsPart = this.convertedXml["word/settings.xml"];
         if (settingsPart && stats.pages == null) {
@@ -148813,7 +148813,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DfS5gFIR.es.js
+// ../../packages/superdoc/dist/chunks/src-CLe3UbDE.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -185521,6 +185521,9 @@ function sliceLines(lines, startIndex, availableHeight) {
     height
   };
 }
+function shouldSuppressOwnSpacing(ownStyleId, ownContextualSpacing, adjacentStyleId) {
+  return ownContextualSpacing && !!ownStyleId && !!adjacentStyleId && ownStyleId === adjacentStyleId;
+}
 function coerceNumber(value) {
   if (isFiniteNumber(value))
     return Number(value);
@@ -186159,6 +186162,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
     state.page.fragments.push(fragment2);
     state.trailingSpacing = 0;
     state.lastParagraphStyleId = styleId;
+    state.lastParagraphContextualSpacing = contextualSpacing;
     return;
   }
   let narrowestWidth = columnWidth;
@@ -186195,8 +186199,9 @@ function layoutParagraphBlock(ctx$1, anchors) {
     let state = ensurePage();
     if (state.trailingSpacing == null)
       state.trailingSpacing = 0;
-    if (contextualSpacing && state.lastParagraphStyleId && styleId && state.lastParagraphStyleId === styleId) {
+    if (shouldSuppressOwnSpacing(styleId, contextualSpacing, state.lastParagraphStyleId))
       spacingBefore = 0;
+    if (shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, styleId)) {
       const prevTrailing = asSafeNumber(state.trailingSpacing);
       if (prevTrailing > 0) {
         state.cursorY -= prevTrailing;
@@ -186311,6 +186316,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
     } else
       lastState.trailingSpacing = 0;
     lastState.lastParagraphStyleId = styleId;
+    lastState.lastParagraphContextualSpacing = contextualSpacing;
   }
 }
 function layoutImageBlock({ block, measure, columns, ensurePage, advanceColumn, columnX }) {
@@ -187323,7 +187329,8 @@ function createPaginator(opts) {
       constraintBoundaries: [],
       activeConstraintIndex: -1,
       trailingSpacing: 0,
-      lastParagraphStyleId: undefined
+      lastParagraphStyleId: undefined,
+      lastParagraphContextualSpacing: false
     };
     states.push(state);
     pages.push(state.page);
@@ -187347,6 +187354,7 @@ function createPaginator(opts) {
         state.cursorY = state.topMargin;
       state.trailingSpacing = 0;
       state.lastParagraphStyleId = undefined;
+      state.lastParagraphContextualSpacing = false;
       return state;
     }
     return startNewPage();
@@ -187771,14 +187779,24 @@ function calculateChainHeight(chain, blocks2, measures, state) {
     const contextualSpacing = block.attrs?.contextualSpacing === true;
     if (isFirstMember) {
       const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
-      const sameAsLastOnPage = styleId && state.lastParagraphStyleId === styleId;
-      const effectiveSpacingBefore = contextualSpacing && sameAsLastOnPage ? 0 : Math.max(spacingBefore - prevTrailing, 0);
+      const prevSuppressAfter = shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, styleId);
+      const currSuppressBefore = shouldSuppressOwnSpacing(styleId, contextualSpacing, state.lastParagraphStyleId);
+      let effectiveSpacingBefore;
+      if (prevSuppressAfter && currSuppressBefore)
+        effectiveSpacingBefore = 0;
+      else if (prevSuppressAfter)
+        effectiveSpacingBefore = spacingBefore;
+      else if (currSuppressBefore)
+        effectiveSpacingBefore = 0;
+      else
+        effectiveSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
       totalHeight += effectiveSpacingBefore;
       isFirstMember = false;
     } else {
-      const sameStyle = styleId && prevStyleId && styleId === prevStyleId;
-      const effectiveSpacingAfterPrev = prevContextualSpacing && sameStyle ? 0 : prevSpacingAfter;
-      const effectiveSpacingBefore = contextualSpacing && sameStyle ? 0 : spacingBefore;
+      const prevSuppressAfter = shouldSuppressOwnSpacing(prevStyleId, prevContextualSpacing, styleId);
+      const currSuppressBefore = shouldSuppressOwnSpacing(styleId, contextualSpacing, prevStyleId);
+      const effectiveSpacingAfterPrev = prevSuppressAfter ? 0 : prevSpacingAfter;
+      const effectiveSpacingBefore = currSuppressBefore ? 0 : spacingBefore;
       totalHeight += Math.max(effectiveSpacingAfterPrev, effectiveSpacingBefore);
     }
     totalHeight += getMeasureHeight(block, measure);
@@ -187794,9 +187812,10 @@ function calculateChainHeight(chain, blocks2, measures, state) {
         const anchorSpacingBefore = getParagraphSpacingBefore(anchorBlock);
         const anchorStyleId = typeof anchorBlock.attrs?.styleId === "string" ? anchorBlock.attrs?.styleId : undefined;
         const anchorContextualSpacing = anchorBlock.attrs?.contextualSpacing === true;
-        const sameStyle = anchorStyleId && prevStyleId && anchorStyleId === prevStyleId;
-        const effectiveSpacingAfterPrev = prevContextualSpacing && sameStyle ? 0 : prevSpacingAfter;
-        const effectiveAnchorSpacingBefore = anchorContextualSpacing && sameStyle ? 0 : anchorSpacingBefore;
+        const prevSuppressAfter = shouldSuppressOwnSpacing(prevStyleId, prevContextualSpacing, anchorStyleId);
+        const anchorSuppressBefore = shouldSuppressOwnSpacing(anchorStyleId, anchorContextualSpacing, prevStyleId);
+        const effectiveSpacingAfterPrev = prevSuppressAfter ? 0 : prevSpacingAfter;
+        const effectiveAnchorSpacingBefore = anchorSuppressBefore ? 0 : anchorSpacingBefore;
         const interParagraphSpacing = Math.max(effectiveSpacingAfterPrev, effectiveAnchorSpacingBefore);
         const firstLineHeight = anchorMeasure.lines[0]?.lineHeight;
         const anchorHeight = typeof firstLineHeight === "number" && Number.isFinite(firstLineHeight) && firstLineHeight > 0 ? firstLineHeight : getMeasureHeight(anchorBlock, anchorMeasure);
@@ -188594,9 +188613,9 @@ function layoutDocument(blocks2, measures, options = {}) {
         const availableHeight = state.contentBottom - state.cursorY;
         const firstMemberBlock = blocks2[chain.startIndex];
         const firstMemberStyleId = typeof firstMemberBlock.attrs?.styleId === "string" ? firstMemberBlock.attrs?.styleId : undefined;
-        const contextualSpacingApplies = firstMemberBlock.attrs?.contextualSpacing === true && firstMemberStyleId && state.lastParagraphStyleId === firstMemberStyleId;
+        const prevSuppressAfter = shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, firstMemberStyleId);
         const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
-        const effectiveAvailableHeight = contextualSpacingApplies ? availableHeight + prevTrailing : availableHeight;
+        const effectiveAvailableHeight = prevSuppressAfter ? availableHeight + prevTrailing : availableHeight;
         const chainHeight = calculateChainHeight(chain, blocks2, measures, state);
         if (chainHeight <= state.contentBottom - state.topMargin && chainHeight > effectiveAvailableHeight && state.page.fragments.length > 0)
           state = paginator.advanceColumn(state);
@@ -188612,17 +188631,27 @@ function layoutDocument(blocks2, measures, options = {}) {
             const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
             const currentStyleId = typeof paraBlock.attrs?.styleId === "string" ? paraBlock.attrs?.styleId : undefined;
             const currentContextualSpacing = asBoolean(paraBlock.attrs?.contextualSpacing);
-            const contextualSpacingApplies = currentContextualSpacing && currentStyleId && state.lastParagraphStyleId === currentStyleId;
-            const effectiveSpacingBefore = contextualSpacingApplies ? 0 : Math.max(spacingBefore - prevTrailing, 0);
+            const prevSuppressAfter = shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, currentStyleId);
+            const currSuppressBefore = shouldSuppressOwnSpacing(currentStyleId, currentContextualSpacing, state.lastParagraphStyleId);
+            let effectiveSpacingBefore;
+            if (prevSuppressAfter && currSuppressBefore)
+              effectiveSpacingBefore = 0;
+            else if (prevSuppressAfter)
+              effectiveSpacingBefore = spacingBefore;
+            else if (currSuppressBefore)
+              effectiveSpacingBefore = 0;
+            else
+              effectiveSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
             const currentHeight = getMeasureHeight(paraBlock, measure);
             const nextHeight = getMeasureHeight(nextBlock, nextMeasure);
             const nextIsParagraph = nextBlock.kind === "paragraph" && nextMeasure.kind === "paragraph";
             const nextSpacingBefore = nextIsParagraph ? getParagraphSpacingBefore(nextBlock) : 0;
             const nextStyleId = nextIsParagraph && typeof nextBlock.attrs?.styleId === "string" ? nextBlock.attrs?.styleId : undefined;
             const nextContextualSpacing = nextIsParagraph && asBoolean(nextBlock.attrs?.contextualSpacing);
-            const sameStyleAsNext = currentStyleId && nextStyleId && nextStyleId === currentStyleId;
-            const effectiveSpacingAfter = currentContextualSpacing && sameStyleAsNext ? 0 : spacingAfter;
-            const effectiveNextSpacingBefore = nextContextualSpacing && sameStyleAsNext ? 0 : nextSpacingBefore;
+            const currSuppressAfter = shouldSuppressOwnSpacing(currentStyleId, currentContextualSpacing, nextStyleId);
+            const nextSuppressBefore = nextIsParagraph && shouldSuppressOwnSpacing(nextStyleId, nextContextualSpacing, currentStyleId);
+            const effectiveSpacingAfter = currSuppressAfter ? 0 : spacingAfter;
+            const effectiveNextSpacingBefore = nextSuppressBefore ? 0 : nextSpacingBefore;
             const interParagraphSpacing = nextIsParagraph ? Math.max(effectiveSpacingAfter, effectiveNextSpacingBefore) : effectiveSpacingAfter;
             const nextFirstLineHeight = (() => {
               if (!nextIsParagraph)
@@ -188632,17 +188661,19 @@ function layoutDocument(blocks2, measures, options = {}) {
                 return firstLineHeight;
               return nextHeight;
             })();
-            if ((nextIsParagraph ? effectiveSpacingBefore + currentHeight + interParagraphSpacing + nextFirstLineHeight : effectiveSpacingBefore + currentHeight + spacingAfter + nextHeight) > (contextualSpacingApplies ? availableHeight + prevTrailing : availableHeight) && state.page.fragments.length > 0)
+            if ((nextIsParagraph ? effectiveSpacingBefore + currentHeight + interParagraphSpacing + nextFirstLineHeight : effectiveSpacingBefore + currentHeight + spacingAfter + nextHeight) > (prevSuppressAfter ? availableHeight + prevTrailing : availableHeight) && state.page.fragments.length > 0)
               state = paginator.advanceColumn(state);
           }
         }
       }
       let overrideSpacingAfter;
       const curStyleId = typeof paraBlock.attrs?.styleId === "string" ? paraBlock.attrs.styleId : undefined;
-      if (asBoolean(paraBlock.attrs?.contextualSpacing) && curStyleId) {
+      const curContextualSpacing = asBoolean(paraBlock.attrs?.contextualSpacing);
+      if (curContextualSpacing && curStyleId) {
         const nextBlock = index2 < blocks2.length - 1 ? blocks2[index2 + 1] : null;
         if (nextBlock?.kind === "paragraph") {
-          if ((typeof nextBlock.attrs?.styleId === "string" ? nextBlock.attrs?.styleId : undefined) === curStyleId)
+          const nextPara = nextBlock;
+          if (shouldSuppressOwnSpacing(curStyleId, curContextualSpacing, typeof nextPara.attrs?.styleId === "string" ? nextPara.attrs?.styleId : undefined))
             overrideSpacingAfter = 0;
         }
       }
@@ -228990,9 +229021,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_DfS5gFIR_es = __esm(() => {
+var init_src_CLe3UbDE_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_DarcJh0X_es();
+  init_SuperConverter_oKnAIRIw_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -238805,6 +238836,8 @@ function print() { __p += __j.call(arguments, '') }
         });
         const numberingData = this.converter.convertedXml["word/numbering.xml"];
         const numbering = this.converter.schemaToXml(numberingData.elements[0]);
+        const appXmlData = this.converter.convertedXml["docProps/app.xml"];
+        const appXml = appXmlData?.elements?.[0] ? this.converter.schemaToXml(appXmlData.elements[0]) : null;
         const coreXmlData = this.converter.convertedXml["docProps/core.xml"];
         const coreXml = coreXmlData?.elements?.[0] ? this.converter.schemaToXml(coreXmlData.elements[0]) : null;
         const updatedDocs = {
@@ -238815,6 +238848,7 @@ function print() { __p += __j.call(arguments, '') }
           "word/numbering.xml": String(numbering),
           "word/styles.xml": String(styles),
           ...updatedHeadersFooters,
+          ...appXml ? { "docProps/app.xml": String(appXml) } : {},
           ...coreXml ? { "docProps/core.xml": String(coreXml) } : {}
         };
         if (hasCustomSettings)
@@ -262322,8 +262356,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DfS5gFIR_es();
-  init_SuperConverter_DarcJh0X_es();
+  init_src_CLe3UbDE_es();
+  init_SuperConverter_oKnAIRIw_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.40",
+  "version": "0.3.0-next.42",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -22,19 +22,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.20.0",
-    "@superdoc/super-editor": "0.0.1"
+    "@superdoc/super-editor": "0.0.1",
+    "superdoc": "1.20.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.40",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.40",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.40",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.40",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.40"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.42",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.42",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.42",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.42",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.42"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",