@superdoc-dev/cli 0.16.0-next.3 → 0.16.0-next.4

package/dist/index.js

@@ -68110,7 +68110,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-kNDiQmof.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-nmIRMGtB.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -68913,10 +68913,10 @@ function isStoryLocator2(value) {
     case "headerFooterSlot":
       return isSectionAddress2(value.section) && isStringEnumMember2(value.headerFooterKind, STORY_HEADER_FOOTER_KINDS2) && isStringEnumMember2(value.variant, STORY_HEADER_FOOTER_VARIANTS2) && isOptionalStringEnumMember2(value.resolution, STORY_HEADER_FOOTER_RESOLUTIONS2) && isOptionalStringEnumMember2(value.onWrite, STORY_HEADER_FOOTER_ON_WRITE_VALUES2);
     case "headerFooterPart":
-      return isNonEmptyString$1(value.refId);
+      return isNonEmptyString$2(value.refId);
     case "footnote":
     case "endnote":
-      return isNonEmptyString$1(value.noteId);
+      return isNonEmptyString$2(value.noteId);
   }
 }
 function getStoryHeaderFooterResolution(locator) {
@@ -68949,7 +68949,7 @@ function storyLocatorToKey2(locator) {
 function isObjectRecord$1(value) {
   return typeof value === "object" && value !== null;
 }
-function isNonEmptyString$1(value) {
+function isNonEmptyString$2(value) {
   return typeof value === "string" && value.length > 0;
 }
 function isStringEnumMember2(value, allowed) {
@@ -104708,6 +104708,7 @@ function toFlowBlocks(pmDoc, options) {
     bookmarks: bookmarks.size
   });
   const mergedBlocks = mergeFusedParagraphs(mergeDropCapParagraphs(hydrateImageBlocks(blocks, options?.mediaFiles)));
+  stampTrackedChangeColors(mergedBlocks, options?.resolveTrackedChangeColor);
   flowBlockCache?.commit();
   return {
     blocks: mergedBlocks,
@@ -108715,6 +108716,9 @@ function getTextAdapter(editor, input) {
 `, `
 `, { textModel: "visible" });
 }
+function rangesOverlap(a, b) {
+  return a[0] < b[1] && b[0] < a[1];
+}
 function getRawTrackedMarks(editor) {
   try {
     const marks = getTrackChanges(editor.state);
@@ -108914,6 +108918,7 @@ function groupTrackedChanges(editor) {
     const wordRevisionId = toNonEmptyString(attrs.sourceId);
     const wordRevisionIdKey = getWordRevisionIdKey(markType);
     const excerptText = !wordRevisionId || !hasChildTrackedMarkOnNode(item, id2) ? getTrackedMarkText(editor, item) : "";
+    const range = [item.from, item.to];
     if (!existing) {
       byRawId.set(groupKey, {
         rawId: groupKey,
@@ -108925,6 +108930,7 @@ function groupTrackedChanges(editor) {
         hasFormat: nextHasFormat,
         attrs: { ...attrs },
         excerptParts: excerptText ? [excerptText] : [],
+        excerptRanges: excerptText ? [range] : [],
         wordRevisionIds: wordRevisionIdKey ? mergeWordRevisionId(undefined, wordRevisionIdKey, wordRevisionId ?? undefined) : undefined
       });
       continue;
@@ -108936,12 +108942,14 @@ function groupTrackedChanges(editor) {
     existing.hasFormat = existing.hasFormat || nextHasFormat;
     if (Object.keys(existing.attrs).length === 0 && Object.keys(attrs).length > 0)
       existing.attrs = { ...attrs };
-    if (excerptText)
+    if (excerptText && !existing.excerptRanges.some((counted) => rangesOverlap(counted, range))) {
+      existing.excerptRanges.push(range);
       existing.excerptParts.push(excerptText);
+    }
     if (wordRevisionIdKey)
       existing.wordRevisionIds = mergeWordRevisionId(existing.wordRevisionIds, wordRevisionIdKey, wordRevisionId ?? undefined);
   }
-  const grouped = Array.from(byRawId.values()).map(({ excerptParts, ...change }) => {
+  const grouped = Array.from(byRawId.values()).map(({ excerptParts, excerptRanges: _excerptRanges, ...change }) => {
     const hasWordSourceId = Boolean(toNonEmptyString(change.attrs.sourceId));
     const rawExcerpt = excerptParts.join("");
     const withExcerpt = {
@@ -112821,6 +112829,50 @@ var isRegExp = (value) => {
     partialRow: fragment2.kind === "table" ? fragment2.partialRow : undefined,
     sourceAnchor: fragment2.sourceAnchor ?? existing?.sourceAnchor
   });
+}, isNonEmptyString$1 = (value) => typeof value === "string" && value.length > 0, authorFromTrackedChangeMeta = (meta) => ({
+  name: meta.author,
+  email: meta.authorEmail,
+  image: meta.authorImage
+}), applyColorToLayer = (meta, resolve2) => {
+  const color2 = resolve2?.(authorFromTrackedChangeMeta(meta));
+  if (isNonEmptyString$1(color2)) {
+    meta.color = color2;
+    return;
+  }
+  delete meta.color;
+}, stampRunTrackedChangeColors = (run$1, resolve2) => {
+  if (Array.isArray(run$1.trackedChanges))
+    for (const layer of run$1.trackedChanges)
+      applyColorToLayer(layer, resolve2);
+  if (run$1.trackedChange)
+    applyColorToLayer(run$1.trackedChange, resolve2);
+}, stampBlockTrackedChangeColors = (block, resolve2) => {
+  if (!block)
+    return;
+  switch (block.kind) {
+    case "paragraph":
+      for (const run$1 of block.runs)
+        stampRunTrackedChangeColors(run$1, resolve2);
+      break;
+    case "list":
+      for (const item of block.items)
+        stampBlockTrackedChangeColors(item.paragraph, resolve2);
+      break;
+    case "table":
+      for (const row of block.rows)
+        for (const cell of row.cells) {
+          stampBlockTrackedChangeColors(cell.paragraph, resolve2);
+          if (Array.isArray(cell.blocks))
+            for (const nested of cell.blocks)
+              stampBlockTrackedChangeColors(nested, resolve2);
+        }
+      break;
+    default:
+      break;
+  }
+}, stampTrackedChangeColors = (blocks, resolve2) => {
+  for (const block of blocks)
+    stampBlockTrackedChangeColors(block, resolve2);
 }, idlessSdtContainerKeys, nextIdlessSdtContainerKey = 0, engines_exports, EMPTY_SDT_PLACEHOLDER_TEXT = "Click or tap here to enter text", FONT_SLOT_THEME_PAIRS, TABLE_STYLE_ID_TABLE_GRID = "TableGrid", TABLE_FALLBACK_BORDER, TABLE_FALLBACK_BORDERS, TABLE_FALLBACK_CELL_PADDING, DEFAULT_TBL_LOOK, CNF_STYLE_MAP, TABLE_STYLE_PRECEDENCE, getToCssFontFamily = () => {
   return SuperConverter.toCssFontFamily;
 }, getSpacingStyle = (spacing, isListItem$1) => {
@@ -130197,7 +130249,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_kNDiQmof_es = __esm(() => {
+var init_SuperConverter_nmIRMGtB_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -168886,7 +168938,7 @@ var init_SuperConverter_kNDiQmof_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-fRnbrGLy.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-7bitVHMJ.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -179217,8 +179269,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_fRnbrGLy_es = __esm(() => {
-  init_SuperConverter_kNDiQmof_es();
+var init_create_headless_toolbar_7bitVHMJ_es = __esm(() => {
+  init_SuperConverter_nmIRMGtB_es();
   init_uuid_qzgm05fK_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
@@ -228381,7 +228433,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DckQskSY.es.js
+// ../../packages/superdoc/dist/chunks/src-BrZa8lMN.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -276146,7 +276198,7 @@ function selectionToRects(layout, blocks2, measures, from$1, to, geometryHelper)
           return;
         const block = blocks2[blockIndex];
         const pmRange = getAtomicPmRange(fragment2, block);
-        if (!rangesOverlap(pmRange.pmStart, pmRange.pmEnd, from$1, to))
+        if (!rangesOverlap2(pmRange.pmStart, pmRange.pmEnd, from$1, to))
           return;
         rects.push({
           x: fragment2.x,
@@ -277705,7 +277757,7 @@ function createLayoutMetrics(perf, startMark, layout, blocks2) {
     pageCount: layout.pages?.length ?? 0
   };
 }
-function buildFootnotesInput(editorState, converter, converterContext, themeColors, renderOverride = null) {
+function buildFootnotesInput(editorState, converter, converterContext, themeColors, renderOverride = null, resolveTrackedChangeColor) {
   if (!editorState)
     return null;
   const footnoteNumberById = converterContext?.footnoteNumberById;
@@ -277745,7 +277797,8 @@ function buildFootnotesInput(editorState, converter, converterContext, themeColo
         }),
         enableRichHyperlinks: true,
         themeColors,
-        converterContext
+        converterContext,
+        resolveTrackedChangeColor
       });
       if (result?.blocks?.length) {
         ensureFootnoteMarker(result.blocks, id2, footnoteNumberById);
@@ -283790,7 +283843,7 @@ function getHostEditor(editor) {
 function resolveSessionHostEditor(editor, runtime) {
   return getHostEditor(editor) ?? getHostEditor(runtime.editor) ?? runtime.editor;
 }
-function buildEndnoteBlocks(editorState, converter, converterContext, themeColors, renderOverride = null) {
+function buildEndnoteBlocks(editorState, converter, converterContext, themeColors, renderOverride = null, resolveTrackedChangeColor) {
   if (!editorState)
     return [];
   const endnoteNumberById = converterContext?.endnoteNumberById;
@@ -283828,7 +283881,8 @@ function buildEndnoteBlocks(editorState, converter, converterContext, themeColor
         }),
         enableRichHyperlinks: true,
         themeColors,
-        converterContext
+        converterContext,
+        resolveTrackedChangeColor
       });
       if (result?.blocks?.length) {
         ensureEndnoteMarker(result.blocks, id2, endnoteNumberById);
@@ -308409,7 +308463,47 @@ menclose::after {
     });
     return createErrorPlaceholder(fragment2.blockId, error3);
   }
-}, TRACK_CHANGE_BASE_CLASS, TRACK_CHANGE_OVERLAP_INSERT_DELETE_CLASS = "track-overlap-insert-delete-dec", TRACK_CHANGE_MODIFIER_CLASS, getTrackedChangeLayers$1 = (run2) => {
+}, TRACK_CHANGE_BASE_CLASS, TRACK_CHANGE_OVERLAP_INSERT_DELETE_CLASS = "track-overlap-insert-delete-dec", TRACK_CHANGE_BACKGROUND_ALPHA = 34, TRACK_CHANGE_BACKGROUND_FOCUSED_ALPHA = 68, expandHexColor = (hex) => {
+  const normalized = hex.replace("#", "");
+  if (normalized.length === 3)
+    return normalized.split("").map((char) => char + char).join("");
+  if (normalized.length === 6 || normalized.length === 8)
+    return normalized.slice(0, 6);
+  return null;
+}, colorWithAlpha = (color2, alpha) => {
+  const expanded = color2.trim().startsWith("#") ? expandHexColor(color2.trim()) : null;
+  if (!expanded)
+    return color2;
+  return `#${expanded}${Math.max(0, Math.min(255, alpha)).toString(16).padStart(2, "0")}`;
+}, setColorVar = (elem, name, value) => {
+  elem.style.setProperty(name, value);
+}, applyAuthorColorVariables = (elem, layer) => {
+  const color2 = layer.color;
+  if (!color2)
+    return;
+  const background = colorWithAlpha(color2, TRACK_CHANGE_BACKGROUND_ALPHA);
+  const backgroundFocused = colorWithAlpha(color2, TRACK_CHANGE_BACKGROUND_FOCUSED_ALPHA);
+  switch (layer.kind) {
+    case "insert":
+      setColorVar(elem, "--sd-tracked-changes-insert-border", color2);
+      setColorVar(elem, "--sd-tracked-changes-insert-background", background);
+      setColorVar(elem, "--sd-tracked-changes-insert-background-focused", backgroundFocused);
+      break;
+    case "delete":
+      setColorVar(elem, "--sd-tracked-changes-delete-border", color2);
+      setColorVar(elem, "--sd-tracked-changes-delete-background", background);
+      setColorVar(elem, "--sd-tracked-changes-delete-background-focused", backgroundFocused);
+      setColorVar(elem, "--sd-tracked-changes-delete-text", color2);
+      break;
+    case "format":
+      setColorVar(elem, "--sd-tracked-changes-format-border", color2);
+      setColorVar(elem, "--sd-tracked-changes-format-background", background);
+      setColorVar(elem, "--sd-tracked-changes-format-background-focused", backgroundFocused);
+      break;
+    default:
+      break;
+  }
+}, TRACK_CHANGE_MODIFIER_CLASS, getTrackedChangeLayers$1 = (run2) => {
   if (Array.isArray(run2.trackedChanges) && run2.trackedChanges.length > 0)
     return run2.trackedChanges;
   return run2.trackedChange ? [run2.trackedChange] : [];
@@ -308446,6 +308540,7 @@ menclose::after {
     const modifier = TRACK_CHANGE_MODIFIER_CLASS[layer.kind]?.[config2.mode];
     if (modifier)
       elem.classList.add(modifier);
+    applyAuthorColorVariables(elem, layer);
   });
   if (overlap) {
     elem.classList.add(TRACK_CHANGE_OVERLAP_INSERT_DELETE_CLASS);
@@ -314004,7 +314099,7 @@ menclose::after {
       };
   }
   return null;
-}, logSelectionMapDebug = (payload) => {}, rangesOverlap = (startA, endA, startB, endB) => {
+}, logSelectionMapDebug = (payload) => {}, rangesOverlap2 = (startA, endA, startB, endB) => {
   if (startA == null)
     return false;
   return (endA ?? startA + 1) > startB && startA < endB;
@@ -319432,13 +319527,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_DckQskSY_es = __esm(() => {
+var init_src_BrZa8lMN_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_kNDiQmof_es();
+  init_SuperConverter_nmIRMGtB_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_fRnbrGLy_es();
+  init_create_headless_toolbar_7bitVHMJ_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -347400,6 +347495,7 @@ function print() { __p += __j.call(arguments, '') }
         flowMode: requestedFlowMode,
         semanticOptions: options.layoutEngineOptions?.semanticOptions,
         trackedChanges: options.layoutEngineOptions?.trackedChanges,
+        resolveTrackedChangeColor: options.layoutEngineOptions?.resolveTrackedChangeColor,
         emitCommentPositionsInViewing: options.layoutEngineOptions?.emitCommentPositionsInViewing,
         enableCommentsInViewing: options.layoutEngineOptions?.enableCommentsInViewing,
         presence: validatedPresence,
@@ -350770,6 +350866,7 @@ function print() { __p += __j.call(arguments, '') }
             sectionMetadata,
             trackedChangesMode: this.#trackedChangesMode,
             enableTrackedChanges: this.#trackedChangesEnabled,
+            resolveTrackedChangeColor: this.#layoutOptions.resolveTrackedChangeColor,
             enableComments: commentsEnabled,
             enableRichHyperlinks: true,
             themeColors: this.#editor?.converter?.themeColors ?? undefined,
@@ -350801,10 +350898,10 @@ function print() { __p += __j.call(arguments, '') }
         const isSemanticFlow = this.#isSemanticFlowMode();
         const baseLayoutOptions = this.#resolveLayoutOptions(blocks2, sectionMetadata);
         const activeFootnoteOverride = this.#buildActiveNoteRenderOverride("footnote");
-        const footnotesLayoutInput = buildFootnotesInput(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeFootnoteOverride);
+        const footnotesLayoutInput = buildFootnotesInput(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeFootnoteOverride, this.#layoutOptions.resolveTrackedChangeColor);
         const semanticFootnoteBlocks = isSemanticFlow ? buildSemanticFootnoteBlocks(footnotesLayoutInput, this.#layoutOptions.semanticOptions?.footnotesMode) : [];
         const activeEndnoteOverride = this.#buildActiveNoteRenderOverride("endnote");
-        const endnoteBlocks = buildEndnoteBlocks(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeEndnoteOverride);
+        const endnoteBlocks = buildEndnoteBlocks(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeEndnoteOverride, this.#layoutOptions.resolveTrackedChangeColor);
         const blocksForLayout = semanticFootnoteBlocks.length > 0 || endnoteBlocks.length > 0 ? [
           ...blocks2,
           ...semanticFootnoteBlocks,
@@ -353602,11 +353699,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-DQ3Apok7.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-DZGOzt3u.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_DQ3Apok7_es = __esm(() => {
-  init_SuperConverter_kNDiQmof_es();
-  init_create_headless_toolbar_fRnbrGLy_es();
+var init_create_super_doc_ui_DZGOzt3u_es = __esm(() => {
+  init_SuperConverter_nmIRMGtB_es();
+  init_create_headless_toolbar_7bitVHMJ_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -353648,16 +353745,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DckQskSY_es();
-  init_SuperConverter_kNDiQmof_es();
+  init_src_BrZa8lMN_es();
+  init_SuperConverter_nmIRMGtB_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_fRnbrGLy_es();
+  init_create_headless_toolbar_7bitVHMJ_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_nv_KfOqb_es();
-  init_create_super_doc_ui_DQ3Apok7_es();
+  init_create_super_doc_ui_DZGOzt3u_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.3",
+  "version": "0.16.0-next.4",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -24,20 +24,20 @@
     "@types/node": "22.19.2",
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/document-api": "0.0.1",
-    "superdoc": "1.38.0"
+    "superdoc": "1.38.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.3",
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.3",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.3",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.3",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.3"
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.4",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.4",
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.4",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.4",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.4"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",