@superdoc-dev/cli 0.5.0-next.76 → 0.5.0-next.78

package/dist/index.js

@@ -65886,7 +65886,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-DKPcCGTm.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-C87tnocN.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -74840,11 +74840,19 @@ function encodeMarksFromRPr(runProperties, docx) {
       case "fontFamily":
         const fontFamily = resolveDocxFontFamily(value, docx, getToCssFontFamily());
         textStyleAttrs[key] = fontFamily;
-        const eastAsiaFamily = typeof value === "object" && value !== null ? value["eastAsia"] : undefined;
-        if (eastAsiaFamily) {
-          const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
-          if (!fontFamily || eastAsiaCss !== textStyleAttrs.fontFamily)
-            textStyleAttrs.eastAsiaFontFamily = eastAsiaCss;
+        if (typeof value === "object" && value !== null) {
+          const eastAsiaFamily = value["eastAsia"];
+          if (eastAsiaFamily) {
+            const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
+            if (!fontFamily || eastAsiaCss !== textStyleAttrs.fontFamily)
+              textStyleAttrs.eastAsiaFontFamily = eastAsiaCss;
+          }
+          const csFamily = value["cs"];
+          if (csFamily) {
+            const csCss = getFontFamilyValue$1({ "w:ascii": csFamily }, docx);
+            if (!fontFamily || csCss !== textStyleAttrs.fontFamily)
+              textStyleAttrs.csFontFamily = csCss;
+          }
         }
         break;
       case "highlight":
@@ -75239,6 +75247,14 @@ function decodeRPrFromMarks(marks) {
                 runProperties.fontFamily = result;
               }
               break;
+            case "eastAsiaFontFamily":
+              if (value != null && runProperties.fontFamily)
+                runProperties.fontFamily.eastAsia = value.split(",")[0].trim();
+              break;
+            case "csFontFamily":
+              if (value != null && runProperties.fontFamily)
+                runProperties.fontFamily.cs = value.split(",")[0].trim();
+              break;
             case "vertAlign":
               if (value != null)
                 runProperties.vertAlign = value;
@@ -103534,10 +103550,11 @@ var isRegExp = (value) => {
   if (!text$2)
     return textStyleAttrs;
   const eastAsiaFont = textStyleAttrs?.eastAsiaFontFamily;
-  if (!eastAsiaFont)
+  if (!(eastAsiaFont || textStyleAttrs?.csFontFamily))
     return textStyleAttrs;
   const normalized = { ...textStyleAttrs };
   delete normalized.eastAsiaFontFamily;
+  delete normalized.csFontFamily;
   if (!(typeof text$2 === "string" && containsEastAsianCharacters(text$2)))
     return normalized;
   return {
@@ -111518,36 +111535,58 @@ var isRegExp = (value) => {
     if (!paragraphNode || paragraphPos === undefined)
       return;
     const { segments, firstInlineProps } = segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys, preferExistingKeys);
-    const runProperties = firstInlineProps ?? null;
+    let runProperties = firstInlineProps ?? null;
     const existingInlineKeys = runNode.attrs?.runPropertiesInlineKeys || [];
+    const hadInlineKeysMetadata = Array.isArray(runNode.attrs?.runPropertiesInlineKeys);
     const styleKeys = runNode.attrs?.runPropertiesStyleKeys || [];
     const keysFromMarks = (segment) => {
       const textNode = segment.content?.find((n) => n.isText);
       return Object.keys(decodeRPrFromMarks(textNode?.marks || []));
     };
     const overrideKeysFromInlineProps = (inlineProps) => styleKeys.filter((k) => inlineProps && (k in inlineProps));
+    const existingRunPropsKeys = new Set(runNode.attrs?.runProperties ? Object.keys(runNode.attrs.runProperties) : []);
+    const computeSegmentKeys = (segmentInlineProps, segment) => {
+      const hasNewInlineProps = segmentInlineProps != null && Object.keys(segmentInlineProps).some((k) => !existingRunPropsKeys.has(k));
+      const markKeysToAdd = !hadInlineKeysMetadata || existingInlineKeys.length > 0 || hasNewInlineProps ? keysFromMarks(segment) : [];
+      const keys$1 = [...new Set([...existingInlineKeys, ...markKeysToAdd])];
+      const ok3 = overrideKeysFromInlineProps(segmentInlineProps);
+      return {
+        inlineKeys: keys$1.length ? keys$1 : hadInlineKeysMetadata ? [] : null,
+        overrideKeys: ok3?.length ? ok3 : null
+      };
+    };
     if (segments.length === 1) {
       const hadInlineKeys = Array.isArray(runNode.attrs?.runPropertiesInlineKeys) && runNode.attrs.runPropertiesInlineKeys.length > 0;
       if (JSON.stringify(runProperties) === JSON.stringify(runNode.attrs.runProperties) && hadInlineKeys)
         return;
-      const newInlineKeys = [...new Set([...existingInlineKeys, ...keysFromMarks(segments[0])])];
-      const newOverrideKeys = overrideKeysFromInlineProps(runProperties);
+      if (hadInlineKeys) {
+        const computedKeys = new Set(runProperties ? Object.keys(runProperties) : []);
+        const lostKeys = existingInlineKeys.filter((k) => !computedKeys.has(k));
+        if (lostKeys.length > 0) {
+          if (!runProperties)
+            runProperties = {};
+          lostKeys.forEach((k) => {
+            if (runNode.attrs?.runProperties?.[k] !== undefined)
+              runProperties[k] = runNode.attrs.runProperties[k];
+          });
+        }
+      }
+      const { inlineKeys: newInlineKeys, overrideKeys: newOverrideKeys } = computeSegmentKeys(runProperties, segments[0]);
       tr.setNodeMarkup(mappedPos, runNode.type, {
         ...runNode.attrs,
         runProperties,
-        runPropertiesInlineKeys: newInlineKeys.length ? newInlineKeys : null,
-        runPropertiesOverrideKeys: newOverrideKeys.length ? newOverrideKeys : null
+        runPropertiesInlineKeys: newInlineKeys,
+        runPropertiesOverrideKeys: newOverrideKeys
       }, runNode.marks);
     } else {
       const newRuns = segments.map((segment) => {
         const props = segment.inlineProps ?? null;
-        const segmentInlineKeys = [...new Set([...existingInlineKeys, ...keysFromMarks(segment)])];
-        const segmentOverrideKeys = overrideKeysFromInlineProps(props);
+        const { inlineKeys: segInlineKeys, overrideKeys: segOverrideKeys } = computeSegmentKeys(props, segment);
         return runType.create({
           ...runNode.attrs ?? {},
           runProperties: props,
-          runPropertiesInlineKeys: segmentInlineKeys.length ? segmentInlineKeys : null,
-          runPropertiesOverrideKeys: segmentOverrideKeys.length ? segmentOverrideKeys : null
+          runPropertiesInlineKeys: segInlineKeys,
+          runPropertiesOverrideKeys: segOverrideKeys
         }, Fragment.fromArray(segment.content), runNode.marks);
       });
       const replacement = Fragment.fromArray(newRuns);
@@ -114722,16 +114761,20 @@ var isRegExp = (value) => {
 }, config$13, translator$21, XML_NODE_NAME$12 = "sd:tableOfContents", SD_NODE_NAME$10 = "tableOfContents", encode$16 = (params3) => {
   const { nodes = [], nodeListHandler } = params3 || {};
   const node3 = nodes[0];
-  const processedContent = nodeListHandler.handler({
+  let processedContent = nodeListHandler.handler({
     ...params3,
     nodes: node3.elements || []
   });
+  if (!(processedContent || []).some((child) => child?.type === "paragraph"))
+    processedContent = [{
+      type: "paragraph",
+      content: processedContent.filter((child) => Boolean(child && child.type))
+    }];
+  const attrs = { instruction: node3.attributes?.instruction || "" };
+  attrs.rightAlignPageNumbers = deriveRightAlignPageNumbers(processedContent);
   return {
     type: "tableOfContents",
-    attrs: {
-      instruction: node3.attributes?.instruction || "",
-      rightAlignPageNumbers: deriveRightAlignPageNumbers(processedContent)
-    },
+    attrs,
     content: processedContent
   };
 }, decode$16 = (params3) => {
@@ -117503,7 +117546,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_DKPcCGTm_es = __esm(() => {
+var init_SuperConverter_C87tnocN_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -154595,7 +154638,7 @@ var init_SuperConverter_DKPcCGTm_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BTSQjUTS.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-sUHsO53v.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -156206,8 +156249,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     return false;
   return Boolean(checker(attrs));
 };
-var init_create_headless_toolbar_BTSQjUTS_es = __esm(() => {
-  init_SuperConverter_DKPcCGTm_es();
+var init_create_headless_toolbar_sUHsO53v_es = __esm(() => {
+  init_SuperConverter_C87tnocN_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -204645,7 +204688,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-osCd4WFE.es.js
+// ../../packages/superdoc/dist/chunks/src-yBJbeHWu.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -222912,11 +222955,15 @@ function resolveStructuralRangeRewrite(doc$12, absFrom, absTo, step3) {
     });
     return null;
   }
-  const replacementBlocks = payload.blocks;
+  const effectiveBlocks = [...payload.blocks];
+  if (payload.splitBefore)
+    effectiveBlocks.unshift("");
+  if (payload.splitAfter)
+    effectiveBlocks.push("");
   if (replacesEntireTextblock) {
-    if (replacementBlocks.length <= 1) {
+    if (effectiveBlocks.length <= 1) {
       debugTextRewrite("structural rewrite skipped: whole-textblock rewrite resolved to one block", {
-        replacementBlocks,
+        replacementBlocks: effectiveBlocks,
         stepId: step3.id
       });
       return null;
@@ -222931,13 +222978,13 @@ function resolveStructuralRangeRewrite(doc$12, absFrom, absTo, step3) {
       inlineRange,
       replaceFrom,
       replaceTo,
-      replacementBlockCount: replacementBlocks.length,
+      replacementBlockCount: effectiveBlocks.length,
       openStart: 0,
       openEnd: 0,
       stepId: step3.id
     });
     return {
-      replacementBlocks,
+      replacementBlocks: effectiveBlocks,
       paragraphAttrs: stripIdentityAttrs($from.node(textblockDepth).attrs),
       replaceFrom,
       replaceTo,
@@ -222949,11 +222996,6 @@ function resolveStructuralRangeRewrite(doc$12, absFrom, absTo, step3) {
   }
   const leadingWrappers = resolveInlineWrapperChainAt(doc$12, absFrom, textblockDepth);
   const trailingWrappers = resolveInlineWrapperChainAt(doc$12, absTo, textblockDepth);
-  const effectiveBlocks = [...replacementBlocks];
-  if (payload.splitBefore)
-    effectiveBlocks.unshift("");
-  if (payload.splitAfter)
-    effectiveBlocks.push("");
   const openStart = 1 + leadingWrappers.length;
   const openEnd = 1 + trailingWrappers.length;
   debugTextRewrite("structural rewrite enabled", {
@@ -287704,12 +287746,12 @@ var Node$13 = class Node$14 {
     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;
-var init_src_osCd4WFE_es = __esm(() => {
+var init_src_yBJbeHWu_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_DKPcCGTm_es();
+  init_SuperConverter_C87tnocN_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_BTSQjUTS_es();
+  init_create_headless_toolbar_sUHsO53v_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -288544,15 +288586,25 @@ ${err.toString()}`);
     addGlobalAttributes() {
       return [{
         types: this.options.types,
-        attributes: { fontFamily: {
-          default: null,
-          parseDOM: (el) => el.style.fontFamily?.replace(/['"]+/g, ""),
-          renderDOM: (attrs) => {
-            if (!attrs.fontFamily)
-              return {};
-            return { style: `font-family: ${attrs.fontFamily}` };
+        attributes: {
+          fontFamily: {
+            default: null,
+            parseDOM: (el) => el.style.fontFamily?.replace(/['"]+/g, ""),
+            renderDOM: (attrs) => {
+              if (!attrs.fontFamily)
+                return {};
+              return { style: `font-family: ${attrs.fontFamily}` };
+            }
+          },
+          eastAsiaFontFamily: {
+            default: null,
+            rendered: false
+          },
+          csFontFamily: {
+            default: null,
+            rendered: false
           }
-        } }
+        }
       }];
     },
     addCommands() {
@@ -322279,11 +322331,11 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_osCd4WFE_es();
-  init_SuperConverter_DKPcCGTm_es();
+  init_src_yBJbeHWu_es();
+  init_SuperConverter_C87tnocN_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_BTSQjUTS_es();
+  init_create_headless_toolbar_sUHsO53v_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.5.0-next.76",
+  "version": "0.5.0-next.78",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -24,21 +24,21 @@
     "@types/node": "22.19.2",
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
+    "superdoc": "1.25.0",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.25.0"
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.76",
-    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.76",
-    "@superdoc-dev/cli-linux-x64": "0.5.0-next.76",
-    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.76",
-    "@superdoc-dev/cli-windows-x64": "0.5.0-next.76"
+    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.78",
+    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.78",
+    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.78",
+    "@superdoc-dev/cli-linux-x64": "0.5.0-next.78",
+    "@superdoc-dev/cli-windows-x64": "0.5.0-next.78"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",