@superdoc-dev/cli 0.16.0-next.7 → 0.16.0-next.9

package/dist/index.js

@@ -68110,7 +68110,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-b2GjELX4.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-D9c2ow57.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -80629,6 +80629,42 @@ function handleDocumentSectionNode$1(params3) {
     }
   };
 }
+function hasDirectBlockSignal(sdtContent) {
+  return Boolean(sdtContent?.elements?.some((el) => el?.name === "w:p" || el?.name === "w:tbl" || BLOCK_FIELD_XML_NAMES.has(el?.name)));
+}
+function canEmitInlineStructuredContent(path2 = []) {
+  return path2.some((entry) => INLINE_CONTEXT_XML_NAMES.has(entry?.name) || entry?.name === "w:sdtContent");
+}
+function hasTranslatedBlockContent(content$2 = [], schema) {
+  return content$2.some((node3) => node3?.type && !isInlineNode(node3, schema));
+}
+function wrapInlineRunsAsParagraphs(content$2 = [], schema) {
+  const normalized = [];
+  let pendingInline = [];
+  const flushInline = () => {
+    if (!pendingInline.length)
+      return;
+    normalized.push({
+      type: "paragraph",
+      attrs: null,
+      content: pendingInline,
+      marks: []
+    });
+    pendingInline = [];
+  };
+  for (const node3 of content$2) {
+    if (!node3)
+      continue;
+    if (isInlineNode(node3, schema)) {
+      pendingInline.push(node3);
+      continue;
+    }
+    flushInline();
+    normalized.push(node3);
+  }
+  flushInline();
+  return normalized;
+}
 function detectControlType(sdtPr) {
   if (!sdtPr?.elements)
     return "richText";
@@ -80703,18 +80739,18 @@ function handleStructuredContentNode(params3) {
   const temporary = extractTemporary(sdtPr);
   if (!sdtContent)
     return null;
-  const paragraph2 = sdtContent.elements?.find((el) => el.name === "w:p");
-  const table = sdtContent.elements?.find((el) => el.name === "w:tbl");
-  const blockField = sdtContent.elements?.find((el) => BLOCK_FIELD_XML_NAMES.has(el?.name));
   const { marks } = parseAnnotationMarks(sdtContent);
   const translatedContent = nodeListHandler.handler({
     ...params3,
     nodes: sdtContent.elements,
     path: [...params3.path || [], sdtContent]
   });
+  const schema = params3.editor?.schema;
+  const content$2 = Array.isArray(translatedContent) ? translatedContent : [];
+  const isBlockNode$1 = hasTranslatedBlockContent(content$2, schema) || hasDirectBlockSignal(sdtContent) || !canEmitInlineStructuredContent(params3.path);
   return {
-    type: paragraph2 || table || blockField ? "structuredContentBlock" : "structuredContent",
-    content: translatedContent,
+    type: isBlockNode$1 ? "structuredContentBlock" : "structuredContent",
+    content: isBlockNode$1 ? wrapInlineRunsAsParagraphs(content$2, schema) : content$2,
     marks,
     attrs: {
       id: id2?.attributes?.["w:val"] || null,
@@ -114466,7 +114502,7 @@ var isRegExp = (value) => {
       normalized.push(node3);
   });
   return normalized;
-}, BLOCK_FIELD_XML_NAMES, lower16 = 65535, factor16, DEL_BEFORE = 1, DEL_AFTER = 2, DEL_ACROSS = 4, DEL_SIDE = 8, MapResult = class {
+}, BLOCK_FIELD_XML_NAMES, INLINE_CONTEXT_XML_NAMES, lower16 = 65535, factor16, DEL_BEFORE = 1, DEL_AFTER = 2, DEL_ACROSS = 4, DEL_SIDE = 8, MapResult = class {
   constructor(pos, delInfo, recover) {
     this.pos = pos;
     this.delInfo = delInfo;
@@ -130660,7 +130696,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_b2GjELX4_es = __esm(() => {
+var init_SuperConverter_D9c2ow57_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -147105,6 +147141,7 @@ var init_SuperConverter_b2GjELX4_es = __esm(() => {
     "endnoteReference",
     "fieldAnnotation",
     "structuredContent",
+    "image",
     "mathInline",
     "passthroughInline",
     "page-number",
@@ -147422,6 +147459,12 @@ var init_SuperConverter_b2GjELX4_es = __esm(() => {
     "sd:bibliography",
     "sd:tableOfAuthorities"
   ]);
+  INLINE_CONTEXT_XML_NAMES = new Set([
+    "w:p",
+    "w:r",
+    "w:hyperlink",
+    "w:smartTag"
+  ]);
   factor16 = Math.pow(2, 16);
   StepMap.empty = new StepMap([]);
   stepsByID = Object.create(null);
@@ -169427,7 +169470,7 @@ var init_SuperConverter_b2GjELX4_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BSnV7Mdp.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-evnTxkbH.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -179758,8 +179801,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_BSnV7Mdp_es = __esm(() => {
-  init_SuperConverter_b2GjELX4_es();
+var init_create_headless_toolbar_evnTxkbH_es = __esm(() => {
+  init_SuperConverter_D9c2ow57_es();
   init_uuid_qzgm05fK_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
@@ -228922,7 +228965,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BuzqViEa.es.js
+// ../../packages/superdoc/dist/chunks/src-BJS18wJQ.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -269354,6 +269397,7 @@ function resolveLayout(input2) {
     items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache)),
     margins: page.margins,
     footnoteReserved: page.footnoteReserved,
+    displayNumber: page.displayNumber,
     numberText: page.numberText,
     vAlign: page.vAlign,
     baseMargins: page.baseMargins,
@@ -269379,6 +269423,7 @@ function resolveHeaderFooterLayout(layout, blocks2, measures, story) {
     const blockVersionCache = /* @__PURE__ */ new Map;
     return {
       number: page.number,
+      displayNumber: page.displayNumber,
       numberText: page.numberText,
       items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, page.number - 1, blockMap, blockVersionCache, story))
     };
@@ -272556,7 +272601,7 @@ function layoutDocument(blocks2, measures, options = {}) {
     if (args$1.sectionPageNumber === 1 && args$1.titlePgEnabled)
       return "first";
     if (args$1.alternateHeaders)
-      return args$1.documentPageNumber % 2 === 0 ? "even" : "odd";
+      return args$1.parityPageNumber % 2 === 0 ? "even" : "odd";
     return "default";
   };
   const getHeaderHeightForPage = (variantType, headerRef, sectionIndex) => {
@@ -273161,7 +273206,7 @@ function layoutDocument(blocks2, measures, options = {}) {
         const alternateHeaders = options.alternateHeaders ?? false;
         const variantType = getVariantTypeForPage({
           sectionPageNumber,
-          documentPageNumber: newPageNumber,
+          parityPageNumber: activePageCounter,
           titlePgEnabled,
           alternateHeaders
         });
@@ -273202,6 +273247,7 @@ function layoutDocument(blocks2, measures, options = {}) {
         return;
       }
       if (state?.page) {
+        state.page.displayNumber = activePageCounter;
         state.page.numberText = formatPageNumber(activePageCounter, activeNumberFormat);
         state.page.sectionIndex = activeSectionIndex;
         layoutLog(`[Layout] Page ${state.page.number}: Stamped sectionIndex:`, activeSectionIndex);
@@ -274544,6 +274590,7 @@ function getHeaderFooterTypeForSection(pageNumber, sectionIndex, identifier, opt
     return null;
   const kind = options?.kind ?? "header";
   const sectionPageNumber = options?.sectionPageNumber ?? pageNumber;
+  const parityPageNumber = options?.parityPageNumber ?? pageNumber;
   const ids = (kind === "header" ? identifier.sectionHeaderIds.get(sectionIndex) : identifier.sectionFooterIds.get(sectionIndex)) ?? (kind === "header" ? identifier.headerIds : identifier.footerIds);
   const hasFirst = Boolean(ids.first);
   const hasEven = Boolean(ids.even);
@@ -274570,7 +274617,7 @@ function getHeaderFooterTypeForSection(pageNumber, sectionIndex, identifier, opt
   if (identifier.alternateHeaders) {
     if (!hasAny)
       return null;
-    return pageNumber % 2 === 0 ? "even" : "odd";
+    return parityPageNumber % 2 === 0 ? "even" : "odd";
   }
   if (hasDefault)
     return "default";
@@ -313506,7 +313553,9 @@ menclose::after {
 }, getHeaderFooterType2 = (pageNumber, identifier, options) => {
   if (pageNumber <= 0)
     return null;
-  const ids = (options?.kind ?? "header") === "header" ? identifier.headerIds : identifier.footerIds;
+  const kind = options?.kind ?? "header";
+  const parityPageNumber = options?.parityPageNumber ?? pageNumber;
+  const ids = kind === "header" ? identifier.headerIds : identifier.footerIds;
   const hasFirst = Boolean(ids.first);
   const hasEven = Boolean(ids.even);
   const hasOdd = Boolean(ids.odd);
@@ -313515,9 +313564,9 @@ menclose::after {
   if (pageNumber === 1 && titlePgEnabled)
     return "first";
   if (identifier.alternateHeaders) {
-    if (pageNumber % 2 === 0 && hasEven)
+    if (parityPageNumber % 2 === 0 && hasEven)
       return "even";
-    if (pageNumber % 2 === 1 && (hasOdd || hasDefault))
+    if (parityPageNumber % 2 !== 0 && (hasOdd || hasDefault))
       return hasOdd ? "odd" : "default";
     return null;
   }
@@ -320710,7 +320759,7 @@ menclose::after {
     if (isFirstPageOfSection && titlePgEnabled)
       return "first";
     if (hasAlternateHeaders)
-      return page.number % 2 === 0 ? "even" : "odd";
+      return (page.displayNumber ?? page.number) % 2 === 0 ? "even" : "odd";
     return "default";
   }
   #stripFootnoteReserveFromBottomMargin(margins, page) {
@@ -321021,6 +321070,7 @@ menclose::after {
         },
         pages: activeLayoutResult.layout.pages.map((page) => ({
           number: page.number,
+          displayNumber: page.displayNumber,
           numberText: page.numberText,
           fragments: page.fragments
         }))
@@ -321094,10 +321144,15 @@ menclose::after {
       const sectionIndex = page?.sectionIndex ?? 0;
       const firstPageInSection = sectionFirstPageNumbers.get(sectionIndex);
       const sectionPageNumber = typeof firstPageInSection === "number" ? pageNumber - firstPageInSection + 1 : pageNumber;
+      const parityPageNumber = page?.displayNumber ?? pageNumber;
       const headerFooterType = multiSectionId ? getHeaderFooterTypeForSection(pageNumber, sectionIndex, multiSectionId, {
         kind,
-        sectionPageNumber
-      }) : getHeaderFooterType2(pageNumber, legacyIdentifier, { kind });
+        sectionPageNumber,
+        parityPageNumber
+      }) : getHeaderFooterType2(pageNumber, legacyIdentifier, {
+        kind,
+        parityPageNumber
+      });
       let sectionRId;
       if (page?.sectionRefs && kind === "header") {
         sectionRId = page.sectionRefs.headerRefs?.[headerFooterType];
@@ -321623,13 +321678,13 @@ 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_BuzqViEa_es = __esm(() => {
+var init_src_BJS18wJQ_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_b2GjELX4_es();
+  init_SuperConverter_D9c2ow57_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_BSnV7Mdp_es();
+  init_create_headless_toolbar_evnTxkbH_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -355941,11 +355996,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-BNdktf8e.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-DX0SYUhT.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_BNdktf8e_es = __esm(() => {
-  init_SuperConverter_b2GjELX4_es();
-  init_create_headless_toolbar_BSnV7Mdp_es();
+var init_create_super_doc_ui_DX0SYUhT_es = __esm(() => {
+  init_SuperConverter_D9c2ow57_es();
+  init_create_headless_toolbar_evnTxkbH_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -355987,16 +356042,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BuzqViEa_es();
-  init_SuperConverter_b2GjELX4_es();
+  init_src_BJS18wJQ_es();
+  init_SuperConverter_D9c2ow57_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_BSnV7Mdp_es();
+  init_create_headless_toolbar_evnTxkbH_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_nv_KfOqb_es();
-  init_create_super_doc_ui_BNdktf8e_es();
+  init_create_super_doc_ui_DX0SYUhT_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.16.0-next.7",
+  "version": "0.16.0-next.9",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,19 +25,19 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "superdoc": "1.38.0",
-    "@superdoc/super-editor": "0.0.1"
+    "@superdoc/super-editor": "0.0.1",
+    "superdoc": "1.38.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.7",
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.7",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.7",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.7",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.7"
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.9",
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.9",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.9",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.9",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.9"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",