@superdoc-dev/cli 0.3.0-next.22 → 0.3.0-next.23

package/dist/index.js

@@ -39004,7 +39004,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-BtAhXvns.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-Dt28Xb1l.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -55277,13 +55277,13 @@ function extractTableInfo($pos, depth) {
     return fallbackInfo;
   }
 }
-function segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys) {
+function segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys, preferExistingKeys) {
   const segments = [];
   let lastKey = null;
   let boundaryCounter = 0;
   runNode.forEach((child) => {
     if (child.isText) {
-      const { inlineProps: inlineProps$1, inlineKey: inlineKey$1 } = computeInlineRunProps(child.marks, runNode.attrs?.runProperties, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys);
+      const { inlineProps: inlineProps$1, inlineKey: inlineKey$1 } = computeInlineRunProps(child.marks, runNode.attrs?.runProperties, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys, preferExistingKeys);
       const last = segments[segments.length - 1];
       if (last && inlineKey$1 === lastKey)
         last.content.push(child);
@@ -55311,24 +55311,36 @@ function segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor
     firstInlineProps: segments[0]?.inlineProps ?? null
   };
 }
-function computeInlineRunProps(marks, existingRunProperties, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys) {
+function computeInlineRunProps(marks, existingRunProperties, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys, preferExistingKeys) {
   const runPropertiesFromMarks = decodeRPrFromMarks(marks);
   const paragraphProperties = getResolvedParagraphProperties(paragraphNode) || calculateResolvedParagraphProperties(editor, paragraphNode, $pos);
   const inlineRunProperties = getInlineRunProperties(runPropertiesFromMarks, resolveRunProperties({
     translatedNumbering: editor.converter?.translatedNumbering ?? {},
     translatedLinkedStyles: editor.converter?.translatedLinkedStyles ?? {}
-  }, existingRunProperties?.styleId != null ? { styleId: existingRunProperties?.styleId } : {}, paragraphProperties, tableInfo, false, Boolean(paragraphNode.attrs.paragraphProperties?.numberingProperties)), existingRunProperties, editor, preservedDerivedKeys);
+  }, existingRunProperties?.styleId != null ? { styleId: existingRunProperties?.styleId } : {}, paragraphProperties, tableInfo, false, Boolean(paragraphNode.attrs.paragraphProperties?.numberingProperties)), existingRunProperties, editor, preservedDerivedKeys, preferExistingKeys);
   const inlineProps = Object.keys(inlineRunProperties).length ? inlineRunProperties : null;
   return {
     inlineProps,
     inlineKey: stableStringifyInlineProps(inlineProps)
   };
 }
-function getInlineRunProperties(runPropertiesFromMarks, runPropertiesFromStyles, existingRunProperties, editor, preservedDerivedKeys = /* @__PURE__ */ new Set) {
+function getInlineRunProperties(runPropertiesFromMarks, runPropertiesFromStyles, existingRunProperties, editor, preservedDerivedKeys = /* @__PURE__ */ new Set, preferExistingKeys = /* @__PURE__ */ new Set) {
   const inlineRunProperties = {};
   for (const key in runPropertiesFromMarks) {
-    if (preservedDerivedKeys.has(key))
+    if (preservedDerivedKeys.has(key)) {
+      const fromMarks = runPropertiesFromMarks[key];
+      const existing = existingRunProperties?.[key];
+      if (preferExistingKeys.has(key) && existing != null)
+        inlineRunProperties[key] = existing;
+      else if (fromMarks != null && existing != null && typeof fromMarks === "object" && typeof existing === "object")
+        inlineRunProperties[key] = {
+          ...existing,
+          ...fromMarks
+        };
+      else if (fromMarks !== undefined)
+        inlineRunProperties[key] = fromMarks;
       continue;
+    }
     const valueFromMarks = runPropertiesFromMarks[key];
     const valueFromStyles = runPropertiesFromStyles[key];
     if (JSON.stringify(valueFromMarks) !== JSON.stringify(valueFromStyles))
@@ -76788,13 +76800,19 @@ var isRegExp = (value) => {
   if (!runType)
     return null;
   const preservedDerivedKeys = /* @__PURE__ */ new Set;
+  const preferExistingKeys = /* @__PURE__ */ new Set;
   transactions.forEach((transaction) => {
-    const keys$1 = transaction.getMeta(RUN_PROPERTY_PRESERVE_META_KEY);
-    if (!Array.isArray(keys$1))
+    const entries = transaction.getMeta(RUN_PROPERTY_PRESERVE_META_KEY);
+    if (!Array.isArray(entries))
       return;
-    keys$1.forEach((key) => {
-      if (typeof key === "string" && key.length > 0)
-        preservedDerivedKeys.add(key);
+    entries.forEach((entry) => {
+      if (typeof entry === "string" && entry.length > 0)
+        preservedDerivedKeys.add(entry);
+      else if (entry && typeof entry === "object" && typeof entry.key === "string") {
+        preservedDerivedKeys.add(entry.key);
+        if (entry.preferExisting)
+          preferExistingKeys.add(entry.key);
+      }
     });
   });
   const changedRanges = collectChangedRangesThroughTransactions(transactions, newState.doc.content.size);
@@ -76817,7 +76835,7 @@ var isRegExp = (value) => {
     const { paragraphNode, paragraphPos, tableInfo } = getRunContext($pos);
     if (!paragraphNode || paragraphPos === undefined)
       return;
-    const { segments, firstInlineProps } = segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys);
+    const { segments, firstInlineProps } = segmentRunByInlineProps(runNode, paragraphNode, tableInfo, $pos, editor, preservedDerivedKeys, preferExistingKeys);
     const runProperties = firstInlineProps ?? null;
     if (segments.length === 1) {
       if (JSON.stringify(runProperties) === JSON.stringify(runNode.attrs.runProperties))
@@ -82437,7 +82455,7 @@ var isRegExp = (value) => {
     }],
     media: footnoteMedia
   };
-}, BIBLIOGRAPHY_NAMESPACE_URI = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography", CUSTOM_XML_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml", CUSTOM_XML_PROPS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps", DEFAULT_SELECTED_STYLE = "/APA.XSL", DEFAULT_STYLE_NAME = "APA", DEFAULT_VERSION = "6", DEFAULT_XML_DECLARATION, API_TO_OOXML_SOURCE_TYPE, OOXML_TO_API_SOURCE_TYPE, SIMPLE_FIELD_TO_XML_TAG, XML_TAG_TO_SIMPLE_FIELD, import_lib2, FONT_FAMILY_FALLBACKS, DEFAULT_GENERIC_FALLBACK = "sans-serif", DEFAULT_FONT_SIZE_PT = 10, CURRENT_APP_VERSION = "1.19.0", collectRunDefaultProperties = (runProps, { allowOverrideTypeface = true, allowOverrideSize = true, themeResolver, state }) => {
+}, BIBLIOGRAPHY_NAMESPACE_URI = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography", CUSTOM_XML_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml", CUSTOM_XML_PROPS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps", DEFAULT_SELECTED_STYLE = "/APA.XSL", DEFAULT_STYLE_NAME = "APA", DEFAULT_VERSION = "6", DEFAULT_XML_DECLARATION, API_TO_OOXML_SOURCE_TYPE, OOXML_TO_API_SOURCE_TYPE, SIMPLE_FIELD_TO_XML_TAG, XML_TAG_TO_SIMPLE_FIELD, import_lib2, FONT_FAMILY_FALLBACKS, DEFAULT_GENERIC_FALLBACK = "sans-serif", DEFAULT_FONT_SIZE_PT = 10, CURRENT_APP_VERSION = "1.20.0", collectRunDefaultProperties = (runProps, { allowOverrideTypeface = true, allowOverrideSize = true, themeResolver, state }) => {
   if (!runProps?.elements?.length || !state)
     return;
   const fontsNode = runProps.elements.find((el) => el.name === "w:rFonts");
@@ -82471,7 +82489,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_BtAhXvns_es = __esm(() => {
+var init_SuperConverter_Dt28Xb1l_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -144335,7 +144353,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DMxoYkrw.es.js
+// ../../packages/superdoc/dist/chunks/src-EwkFfYFq.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -144415,7 +144433,7 @@ function prosemirrorToYXmlFragment(doc$12, xmlFragment) {
 }
 function getSuperdocVersion() {
   try {
-    return "1.19.0";
+    return "1.20.0";
   } catch {
     return "unknown";
   }
@@ -155708,7 +155726,10 @@ function applyRunAttributePatch(tr, runType, absFrom, absTo, updates) {
   if (overlappingRuns.length === 0)
     return false;
   if (Object.prototype.hasOwnProperty.call(updates, "fontFamily"))
-    tr.setMeta(PRESERVE_RUN_PROPERTIES_META_KEY, ["fontFamily"]);
+    tr.setMeta(PRESERVE_RUN_PROPERTIES_META_KEY, [{
+      key: "fontFamily",
+      preferExisting: true
+    }]);
   let changed = false;
   for (const run2 of overlappingRuns) {
     const runPos = tr.mapping.map(run2.pos, 1);
@@ -155791,6 +155812,8 @@ function applyInlinePatchToRange(editor, tr, absFrom, absTo, inline) {
       textStylePatch[key$1] = inline[key$1];
   if (inline.caps !== undefined)
     textStylePatch.textTransform = capsToTextTransform(inline.caps ?? null);
+  if (textStylePatch.fontFamily != null)
+    tr.setMeta(PRESERVE_RUN_PROPERTIES_META_KEY, ["fontFamily"]);
   if (applyTextStylePatch(tr, schema.marks.textStyle, absFrom, absTo, textStylePatch))
     changed = true;
   const runAttributeUpdates = buildRunAttributeUpdates(inline);
@@ -205643,7 +205666,7 @@ var Node$13 = class Node$14 {
     domAvailabilityCache = false;
     return false;
   }
-}, summaryVersion = "1.19.0", nodeKeys, markKeys, transformListsInCopiedContent = (html3) => {
+}, summaryVersion = "1.20.0", nodeKeys, markKeys, transformListsInCopiedContent = (html3) => {
   const container = document.createElement("div");
   container.innerHTML = html3;
   const result = [];
@@ -206584,7 +206607,7 @@ var Node$13 = class Node$14 {
     candidate = String(parseInt(hex, 16));
   } while (!candidate || existingIds.has(candidate));
   return candidate;
-}, ALLOWED_WRAP_ATTRS, WRAP_TYPES_SUPPORTING_SIDE, WRAP_TYPES_SUPPORTING_DISTANCES, RELATIVE_HEIGHT_MIN = 0, RELATIVE_HEIGHT_MAX = 4294967295, FORBIDDEN_RAW_PATCH_NAMES, CONTROL_TYPE_SDT_PR_ELEMENTS, DEFAULT_CHECKBOX_SYMBOL_FONT2 = "MS Gothic", DEFAULT_CHECKBOX_CHECKED_HEX2 = "2612", DEFAULT_CHECKBOX_UNCHECKED_HEX2 = "2610", VARIANT_ORDER, KIND_ORDER, HEADER_RELATIONSHIP_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", DOCUMENT_RELS_PATH = "word/_rels/document.xml.rels", HEADER_FILE_PATTERN, FOOTER_FILE_PATTERN, SPECIAL_NOTE_TYPES, FOOTNOTES_PART_ID = "word/footnotes.xml", ENDNOTES_PART_ID = "word/endnotes.xml", FOOTNOTES_CONFIG, ENDNOTES_CONFIG, NOTES_XMLNS, footnotesPartDescriptor, endnotesPartDescriptor, RESTART_POLICY_TO_OOXML, VALID_DISPLAYS, CAPTION_STYLE_NAMES, CAPTION_PARAGRAPH_STYLE_ID = "Caption", CAPTION_FORMAT_TO_OOXML, FIELD_NODE_TYPES, TOA_LEADER_REVERSE_MAP, CONTENT_TYPES_PART_ID = "[Content_Types].xml", CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types", contentTypesPartDescriptor, empty_exports, init_empty, CURRENT_APP_VERSION2 = "1.19.0", PIXELS_PER_INCH$1 = 96, MAX_HEIGHT_BUFFER_PX = 50, MAX_WIDTH_BUFFER_PX = 20, Editor, ContextMenuPluginKey, MENU_OFFSET_X = 0, MENU_OFFSET_Y = 28, CONTEXT_MENU_OFFSET_X = 10, CONTEXT_MENU_OFFSET_Y = 10, SLASH_COOLDOWN_MS = 5000, ContextMenu, SearchQuery = class {
+}, ALLOWED_WRAP_ATTRS, WRAP_TYPES_SUPPORTING_SIDE, WRAP_TYPES_SUPPORTING_DISTANCES, RELATIVE_HEIGHT_MIN = 0, RELATIVE_HEIGHT_MAX = 4294967295, FORBIDDEN_RAW_PATCH_NAMES, CONTROL_TYPE_SDT_PR_ELEMENTS, DEFAULT_CHECKBOX_SYMBOL_FONT2 = "MS Gothic", DEFAULT_CHECKBOX_CHECKED_HEX2 = "2612", DEFAULT_CHECKBOX_UNCHECKED_HEX2 = "2610", VARIANT_ORDER, KIND_ORDER, HEADER_RELATIONSHIP_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", DOCUMENT_RELS_PATH = "word/_rels/document.xml.rels", HEADER_FILE_PATTERN, FOOTER_FILE_PATTERN, SPECIAL_NOTE_TYPES, FOOTNOTES_PART_ID = "word/footnotes.xml", ENDNOTES_PART_ID = "word/endnotes.xml", FOOTNOTES_CONFIG, ENDNOTES_CONFIG, NOTES_XMLNS, footnotesPartDescriptor, endnotesPartDescriptor, RESTART_POLICY_TO_OOXML, VALID_DISPLAYS, CAPTION_STYLE_NAMES, CAPTION_PARAGRAPH_STYLE_ID = "Caption", CAPTION_FORMAT_TO_OOXML, FIELD_NODE_TYPES, TOA_LEADER_REVERSE_MAP, CONTENT_TYPES_PART_ID = "[Content_Types].xml", CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types", contentTypesPartDescriptor, empty_exports, init_empty, CURRENT_APP_VERSION2 = "1.20.0", PIXELS_PER_INCH$1 = 96, MAX_HEIGHT_BUFFER_PX = 50, MAX_WIDTH_BUFFER_PX = 20, Editor, ContextMenuPluginKey, MENU_OFFSET_X = 0, MENU_OFFSET_Y = 28, CONTEXT_MENU_OFFSET_X = 10, CONTEXT_MENU_OFFSET_Y = 10, SLASH_COOLDOWN_MS = 5000, ContextMenu, SearchQuery = class {
   constructor(config2) {
     this.search = config2.search;
     this.caseSensitive = !!config2.caseSensitive;
@@ -224996,9 +225019,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_DMxoYkrw_es = __esm(() => {
+var init_src_EwkFfYFq_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_BtAhXvns_es();
+  init_SuperConverter_Dt28Xb1l_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -258085,8 +258108,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DMxoYkrw_es();
-  init_SuperConverter_BtAhXvns_es();
+  init_src_EwkFfYFq_es();
+  init_SuperConverter_Dt28Xb1l_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.22",
+  "version": "0.3.0-next.23",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -21,20 +21,20 @@
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.19.0",
-    "@superdoc/pm-adapter": "0.0.0"
+    "@superdoc/pm-adapter": "0.0.0",
+    "superdoc": "1.20.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.22",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.22",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.22",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.22",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.22"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.23",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.23",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.23",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.23",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.23"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",