@superdoc-dev/cli 0.3.0-next.14 → 0.3.0-next.15

package/dist/index.js

@@ -39075,7 +39075,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-B6j-v0cn.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-ClF1lbF9.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -47061,14 +47061,27 @@ function getFontFamilyValue$1(attributes, docx) {
   return SuperConverter.toCssFontFamily(resolved, docx);
 }
 function getHighLightValue$1(attributes) {
-  const fill = attributes["w:fill"];
-  if (fill && fill !== "auto")
+  const fill = normalizeHighlightHex(attributes?.["w:fill"]);
+  if (fill)
     return `#${fill}`;
-  if (attributes?.["w:val"] === "none")
+  const value = attributes?.["w:val"];
+  if (value === "none")
     return "transparent";
-  if (isValidHexColor(attributes?.["w:val"]))
-    return `#${attributes["w:val"]}`;
-  return getHexColorFromDocxSystem(attributes?.["w:val"]) || null;
+  const normalizedValue = normalizeHighlightHex(value);
+  if (normalizedValue)
+    return `#${normalizedValue}`;
+  return getHexColorFromDocxSystem(value) || null;
+}
+function normalizeHighlightHex(rawValue) {
+  if (typeof rawValue !== "string")
+    return null;
+  const trimmedValue = rawValue.trim();
+  if (!trimmedValue || trimmedValue.toLowerCase() === "auto")
+    return null;
+  const normalizedValue = normalizeHexColor(trimmedValue);
+  if (!normalizedValue || !isValidHexColor(normalizedValue))
+    return null;
+  return normalizedValue;
 }
 function normalizeToggleValue(value) {
   if (value == null)
@@ -55505,7 +55518,7 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
   const resolvedRunProperties = resolvedFromSelection?.resolvedRunProperties ?? inlineRunProperties;
   const styleRunProperties = resolvedFromSelection?.styleRunProperties ?? null;
   const resolvedMarksFromProperties = createMarksFromRunProperties(state, resolvedRunProperties, editor);
-  resolvedMarks.push(...resolvedMarksFromProperties.length ? resolvedMarksFromProperties : inlineMarks);
+  resolvedMarks.push(...mergeResolvedMarksWithInlineFallback(resolvedMarksFromProperties, inlineMarks));
   if (storedMarks && includeCursorMarksWithStoredMarks)
     resolvedMarks.push(...cursorMarks);
   return {
@@ -55536,14 +55549,25 @@ function aggregateFormattingSegments(state, editor, segments) {
   const resolvedRunProperties = intersectRunProperties(segments.map((segment) => segment.resolvedRunProperties));
   const inlineRunProperties = intersectRunProperties(segments.map((segment) => segment.inlineRunProperties));
   const styleRunProperties = intersectRunProperties(segments.map((segment) => segment.styleRunProperties));
+  const resolvedMarks = createMarksFromRunProperties(state, resolvedRunProperties, editor);
+  const inlineMarks = createMarksFromRunProperties(state, inlineRunProperties, editor);
   return {
-    resolvedMarks: createMarksFromRunProperties(state, resolvedRunProperties, editor),
-    inlineMarks: createMarksFromRunProperties(state, inlineRunProperties, editor),
+    resolvedMarks: mergeResolvedMarksWithInlineFallback(resolvedMarks, inlineMarks),
+    inlineMarks,
     resolvedRunProperties,
     inlineRunProperties,
     styleRunProperties
   };
 }
+function mergeResolvedMarksWithInlineFallback(resolvedMarks, inlineMarks) {
+  if (!resolvedMarks.length)
+    return inlineMarks;
+  if (!inlineMarks.length)
+    return resolvedMarks;
+  const resolvedMarkNames = new Set(resolvedMarks.map((mark) => mark.type.name));
+  const missingInlineMarks = inlineMarks.filter((mark) => !resolvedMarkNames.has(mark.type.name));
+  return [...resolvedMarks, ...missingInlineMarks];
+}
 function intersectRunProperties(runPropertiesList) {
   const filtered = runPropertiesList.filter((props) => props && typeof props === "object");
   if (filtered.length === 0)
@@ -82435,7 +82459,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_B6j_v0cn_es = __esm(() => {
+var init_SuperConverter_ClF1lbF9_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -144232,7 +144256,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-C7UQVkf5.es.js
+// ../../packages/superdoc/dist/chunks/src-bFMQreny.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -224649,9 +224673,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_C7UQVkf5_es = __esm(() => {
+var init_src_bFMQreny_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_B6j_v0cn_es();
+  init_SuperConverter_ClF1lbF9_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -257737,8 +257761,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_C7UQVkf5_es();
-  init_SuperConverter_B6j_v0cn_es();
+  init_src_bFMQreny_es();
+  init_SuperConverter_ClF1lbF9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();
@@ -323304,20 +323328,32 @@ function getFontFamilyValue3(attributes, docx) {
   return SuperConverter3.toCssFontFamily(resolved, docx);
 }
 function getHighLightValue3(attributes) {
-  const fill = attributes["w:fill"];
-  if (fill && fill !== "auto")
+  const fill = normalizeHighlightHex2(attributes?.["w:fill"]);
+  if (fill)
     return `#${fill}`;
-  if (attributes?.["w:val"] === "none")
+  const value = attributes?.["w:val"];
+  if (value === "none")
     return "transparent";
-  if (isValidHexColor3(attributes?.["w:val"]))
-    return `#${attributes["w:val"]}`;
-  return getHexColorFromDocxSystem2(attributes?.["w:val"]) || null;
+  const normalizedValue = normalizeHighlightHex2(value);
+  if (normalizedValue)
+    return `#${normalizedValue}`;
+  return getHexColorFromDocxSystem2(value) || null;
+}
+function normalizeHighlightHex2(rawValue) {
+  if (typeof rawValue !== "string")
+    return null;
+  const trimmedValue = rawValue.trim();
+  if (!trimmedValue || trimmedValue.toLowerCase() === "auto")
+    return null;
+  const normalizedValue = normalizeHexColor3(trimmedValue);
+  if (!normalizedValue || !isValidHexColor3(normalizedValue))
+    return null;
+  return normalizedValue;
 }
 var getToCssFontFamily2 = () => {
   return SuperConverter3.toCssFontFamily;
 };
 var init_styles3 = __esm(() => {
-  init_helpers();
   init_helpers();
   init_SuperConverter();
   init_ooxml();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.14",
+  "version": "0.3.0-next.15",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -20,21 +20,21 @@
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
-    "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.19.0"
+    "superdoc": "1.19.0",
+    "@superdoc/document-api": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.14",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.14",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.14",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.14",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.14"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.15",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.15",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.15",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.15",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.15"
   },
   "scripts": {
     "dev": "bun run src/index.ts",