@superdoc-dev/cli 0.2.0-next.124 → 0.2.0-next.126

package/dist/index.js

@@ -135072,7 +135072,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BV6PERs7.es.js
+// ../../packages/superdoc/dist/chunks/src-CfMc8y28.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -197545,10 +197545,29 @@ var Node$13 = class Node$14 {
   newTr.setMeta(CommentsPluginKey, { type: "force" });
 }, require_lodash, import_lodash$1, normalizeAttrs = (attrs = {}) => {
   return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value !== null && value !== undefined));
-}, attrsExactlyMatch = (left$1 = {}, right$1 = {}) => {
-  return (0, import_lodash$1.isEqual)(normalizeAttrs(left$1), normalizeAttrs(right$1));
+}, IDENTITY_ATTR_VALUES, ATTRIBUTE_ONLY_MARKS, normalizeSnapshotAttrs = (attrs = {}) => {
+  const base$1 = normalizeAttrs(attrs);
+  return Object.fromEntries(Object.entries(base$1).filter(([key$1, value]) => IDENTITY_ATTR_VALUES[key$1] !== value));
 }, getTypeName = (markLike) => {
   return markLike?.type?.name ?? markLike?.type;
+}, isTrackFormatNoOp = (before, after) => {
+  const normalize$1 = (entries) => entries.map((s2) => ({
+    type: getTypeName(s2),
+    attrs: normalizeSnapshotAttrs(s2.attrs || {})
+  })).filter((s2) => {
+    if (ATTRIBUTE_ONLY_MARKS.includes(s2.type) && Object.keys(s2.attrs).length === 0)
+      return false;
+    return true;
+  });
+  const normBefore = normalize$1(before);
+  const normAfter = normalize$1(after);
+  if (normBefore.length === 0 && normAfter.length === 0)
+    return true;
+  if (normBefore.length !== normAfter.length)
+    return false;
+  return normBefore.every((b$1) => normAfter.some((a2) => a2.type === b$1.type && (0, import_lodash$1.isEqual)(a2.attrs, b$1.attrs))) && normAfter.every((a2) => normBefore.some((b$1) => b$1.type === a2.type && (0, import_lodash$1.isEqual)(b$1.attrs, a2.attrs)));
+}, attrsExactlyMatch = (left$1 = {}, right$1 = {}) => {
+  return (0, import_lodash$1.isEqual)(normalizeAttrs(left$1), normalizeAttrs(right$1));
 }, marksMatch = (left$1, right$1, exact = true) => {
   if (!left$1 || !right$1 || getTypeName(left$1) !== getTypeName(right$1))
     return false;
@@ -197651,7 +197670,7 @@ var Node$13 = class Node$14 {
       if (formatChangeMark)
         if (formatChangeMark.attrs.before.find((mark2) => markSnapshotMatchesStepMark(mark2, step3.mark, true))) {
           before = [...formatChangeMark.attrs.before.filter((mark2) => !markSnapshotMatchesStepMark(mark2, step3.mark, true))];
-          after = [...formatChangeMark.attrs.after];
+          after = formatChangeMark.attrs.after.filter((mark2) => getTypeName(mark2) !== step3.mark.type.name);
         } else {
           before = [...formatChangeMark.attrs.before];
           after = upsertMarkSnapshotByType(formatChangeMark.attrs.after, {
@@ -197670,6 +197689,11 @@ var Node$13 = class Node$14 {
           attrs: { ...step3.mark.attrs }
         }];
       }
+      if (isTrackFormatNoOp(before, after)) {
+        if (formatChangeMark)
+          newTr.removeMark(Math.max(step3.from, pos), Math.min(step3.to, pos + node3.nodeSize), formatChangeMark);
+        return;
+      }
       if (after.length || before.length) {
         const newFormatMark = state.schema.marks[TrackFormatMarkName].create({
           id: wid,
@@ -202240,7 +202264,7 @@ var Node$13 = class Node$14 {
     pmStart: start$1,
     pmEnd: (typeof attrs.pmEnd === "number" ? attrs.pmEnd : undefined) ?? (start$1 != null ? start$1 + 1 : undefined)
   };
-}, TWIPS_PER_INCH$1 = 1440, PX_PER_PT2, VALID_TRACKED_MODES, DEFAULT_HYPERLINK_CONFIG, ATOMIC_INLINE_TYPES, TOKEN_INLINE_TYPES, twipsToPx$1 = (value) => value / TWIPS_PER_INCH$1 * 96, ptToPx = (pt) => {
+}, SUBSCRIPT_SUPERSCRIPT_SCALE2 = 0.65, TWIPS_PER_INCH$1 = 1440, PX_PER_PT2, VALID_TRACKED_MODES, DEFAULT_HYPERLINK_CONFIG, ATOMIC_INLINE_TYPES, TOKEN_INLINE_TYPES, twipsToPx$1 = (value) => value / TWIPS_PER_INCH$1 * 96, ptToPx = (pt) => {
   if (pt == null || !Number.isFinite(pt))
     return;
   return pt * PX_PER_PT2;
@@ -204124,6 +204148,8 @@ var Node$13 = class Node$14 {
         textRun.strike ? 1 : 0,
         textRun.highlight ?? "",
         textRun.letterSpacing != null ? textRun.letterSpacing : "",
+        textRun.vertAlign ?? "",
+        textRun.baselineShift != null ? textRun.baselineShift : "",
         textRun.token ?? "",
         textRun.trackedChange ? 1 : 0,
         textRun.comments?.length ?? 0
@@ -204305,6 +204331,8 @@ var Node$13 = class Node$14 {
               hash$3 = hashString(hash$3, getRunUnderlineStyle(run2));
               hash$3 = hashString(hash$3, getRunUnderlineColor(run2));
               hash$3 = hashString(hash$3, getRunBooleanProp(run2, "strike") ? "1" : "");
+              hash$3 = hashString(hash$3, getRunStringProp(run2, "vertAlign"));
+              hash$3 = hashNumber(hash$3, getRunNumberProp(run2, "baselineShift"));
             }
           }
         }
@@ -204368,6 +204396,14 @@ var Node$13 = class Node$14 {
     decorations.push("line-through");
   if (decorations.length > 0)
     element3.style.textDecorationLine = decorations.join(" ");
+  if (run2.baselineShift != null && Number.isFinite(run2.baselineShift))
+    element3.style.verticalAlign = `${run2.baselineShift}pt`;
+  else if (run2.vertAlign === "superscript")
+    element3.style.verticalAlign = "super";
+  else if (run2.vertAlign === "subscript")
+    element3.style.verticalAlign = "sub";
+  else if (run2.vertAlign === "baseline")
+    element3.style.verticalAlign = "baseline";
 }, CLIP_PATH_PREFIXES, readClipPathValue = (value) => {
   if (typeof value !== "string")
     return "";
@@ -204846,6 +204882,8 @@ var Node$13 = class Node$14 {
   delete run2.highlight;
   delete run2.link;
   delete run2.letterSpacing;
+  delete run2.vertAlign;
+  delete run2.baselineShift;
 }, applyFormatChangeMarks = (run2, config2, hyperlinkConfig, applyMarksToRun$1, themeColors, enableComments = true) => {
   const tracked = run2.trackedChange;
   if (!tracked || tracked.kind !== "format")
@@ -205450,9 +205488,14 @@ var Node$13 = class Node$14 {
     fontFamily = resolveDocxFontFamily(runProps.fontFamily, converterContext.docx) || defaultFontFamily;
   else
     fontFamily = runProps.fontFamily?.ascii || runProps.fontFamily?.hAnsi || runProps.fontFamily?.eastAsia || defaultFontFamily;
+  const vertAlign = runProps.vertAlign;
+  const hasPosition = runProps.position != null && Number.isFinite(runProps.position);
+  let fontSize = runProps.fontSize ? ptToPx(runProps.fontSize / 2) : defaultFontSizePx;
+  if (!hasPosition && (vertAlign === "superscript" || vertAlign === "subscript"))
+    fontSize *= SUBSCRIPT_SUPERSCRIPT_SCALE2;
   return {
     fontFamily: toCssFontFamily(fontFamily),
-    fontSize: runProps.fontSize ? ptToPx(runProps.fontSize / 2) : defaultFontSizePx,
+    fontSize,
     bold: runProps.bold,
     italic: runProps.italic,
     underline: runProps.underline && runProps.underline["w:val"] && runProps.underline["w:val"] !== "none" ? {
@@ -205466,7 +205509,9 @@ var Node$13 = class Node$14 {
     allCaps: runProps?.textTransform === "uppercase",
     letterSpacing: runProps.letterSpacing ? twipsToPx$1(runProps.letterSpacing) : undefined,
     lang: runProps.lang?.val || undefined,
-    vanish: runProps.vanish
+    vanish: runProps.vanish,
+    vertAlign,
+    baselineShift: hasPosition ? runProps.position / 2 : undefined
   };
 }, VALID_LINK_TARGETS, toTrimmedString = (value) => {
   if (typeof value !== "string")
@@ -205915,6 +205960,18 @@ var Node$13 = class Node$14 {
     if (transform === "uppercase" || transform === "lowercase" || transform === "capitalize" || transform === "none")
       run2.textTransform = transform;
   }
+  if (typeof attrs.vertAlign === "string") {
+    const va = attrs.vertAlign;
+    if (va === "superscript" || va === "subscript" || va === "baseline")
+      run2.vertAlign = va;
+  }
+  if (attrs.position != null && typeof attrs.position === "string") {
+    const parsed = parseFloat(attrs.position);
+    if (Number.isFinite(parsed))
+      run2.baselineShift = parsed;
+  }
+  if (run2.baselineShift == null && (run2.vertAlign === "superscript" || run2.vertAlign === "subscript"))
+    run2.fontSize *= SUBSCRIPT_SUPERSCRIPT_SCALE2;
 }, DEFAULT_HYPERLINK_CONFIG$1, applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, backgroundColor, enableComments = true) => {
   if (!enableComments && "comments" in run2 && run2.comments)
     delete run2.comments;
@@ -212753,7 +212810,7 @@ var Node$13 = class Node$14 {
     this.#hoverRegion = null;
     this.#overlayManager = null;
   }
-}, DEFAULT_SEMANTIC_FOOTNOTE_HEADING_STYLE, SUBSCRIPT_SUPERSCRIPT_SCALE2 = 0.65, DEFAULT_PAGE_SIZE, DEFAULT_MARGINS, DEFAULT_PAGE_GAP = 24, DEFAULT_HORIZONTAL_PAGE_GAP = 20, layoutDebugEnabled, perfLog = (...args$1) => {
+}, DEFAULT_SEMANTIC_FOOTNOTE_HEADING_STYLE, DEFAULT_PAGE_SIZE, DEFAULT_MARGINS, DEFAULT_PAGE_GAP = 24, DEFAULT_HORIZONTAL_PAGE_GAP = 20, layoutDebugEnabled, perfLog = (...args$1) => {
   if (!layoutDebugEnabled)
     return;
   console.log(...args$1);
@@ -217758,7 +217815,7 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_BV6PERs7_es = __esm(() => {
+var init_src_CfMc8y28_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_Cw5CEerM_es();
   init_jszip_ChlR43oI_es();
@@ -225386,6 +225443,11 @@ function print() { __p += __j.call(arguments, '') }
     }).call(exports);
   });
   import_lodash$1 = require_lodash();
+  IDENTITY_ATTR_VALUES = {
+    vertAlign: "baseline",
+    position: "0pt"
+  };
+  ATTRIBUTE_ONLY_MARKS = ["textStyle"];
   DOCUMENT_MIGRATIONS = { initial: migration_after_0_4_14 };
   AnnotatorHelpers = {
     getFieldAttrs,
@@ -238549,7 +238611,6 @@ function print() { __p += __j.call(arguments, '') }
         painter.paint(layout, this.#painterHost, mapping ?? undefined);
         perfLog(`[Perf] painter.paint: ${(perfNow() - painterPaintStart).toFixed(2)}ms`);
         const painterPostStart = perfNow();
-        this.#applyVertAlignToLayout();
         this.#rebuildDomPositionIndex();
         this.#syncDecorations();
         this.#domIndexObserverManager?.resume();
@@ -239829,75 +239890,6 @@ function print() { __p += __j.call(arguments, '') }
         return false;
       return this.#documentMode === "viewing";
     }
-    #applyVertAlignToLayout() {
-      const doc$2 = this.#editor?.state?.doc;
-      if (!doc$2 || !this.#painterHost)
-        return;
-      try {
-        this.#painterHost.querySelectorAll(".superdoc-line span[data-pm-start]").forEach((span) => {
-          try {
-            if (span.closest(".superdoc-page-header, .superdoc-page-footer"))
-              return;
-            const pmStart = Number(span.dataset.pmStart ?? "NaN");
-            if (!Number.isFinite(pmStart))
-              return;
-            const pos = Math.max(0, Math.min(pmStart, doc$2.content.size));
-            const $pos = doc$2.resolve(pos);
-            let runNode = null;
-            for (let depth = $pos.depth;depth >= 0; depth--) {
-              const node3 = $pos.node(depth);
-              if (node3.type.name === "run") {
-                runNode = node3;
-                break;
-              }
-            }
-            let vertAlign = runNode?.attrs?.runProperties?.vertAlign ?? null;
-            let position4 = runNode?.attrs?.runProperties?.position ?? null;
-            let fontSizeHalfPts = runNode?.attrs?.runProperties?.fontSize ?? null;
-            if (!vertAlign && position4 == null && runNode)
-              runNode.forEach((child) => {
-                if (!child.isText || !child.marks?.length)
-                  return;
-                const rpr = decodeRPrFromMarks(child.marks);
-                if (rpr.vertAlign && !vertAlign)
-                  vertAlign = rpr.vertAlign;
-                if (rpr.position != null && position4 == null)
-                  position4 = rpr.position;
-                if (rpr.fontSize != null && fontSizeHalfPts == null)
-                  fontSizeHalfPts = rpr.fontSize;
-              });
-            if (vertAlign == null && position4 == null)
-              return;
-            const styleEntries = [];
-            if (position4 != null && Number.isFinite(position4)) {
-              const pts = halfPointToPoints(position4);
-              if (Number.isFinite(pts))
-                styleEntries.push(`vertical-align: ${pts}pt`);
-            } else if (vertAlign === "superscript" || vertAlign === "subscript") {
-              styleEntries.push(`vertical-align: ${vertAlign === "superscript" ? "super" : "sub"}`);
-              if (fontSizeHalfPts != null && Number.isFinite(fontSizeHalfPts)) {
-                const scaledPts = halfPointToPoints(fontSizeHalfPts * SUBSCRIPT_SUPERSCRIPT_SCALE2);
-                if (Number.isFinite(scaledPts))
-                  styleEntries.push(`font-size: ${scaledPts}pt`);
-                else
-                  styleEntries.push(`font-size: ${SUBSCRIPT_SUPERSCRIPT_SCALE2 * 100}%`);
-              } else
-                styleEntries.push(`font-size: ${SUBSCRIPT_SUPERSCRIPT_SCALE2 * 100}%`);
-            } else if (vertAlign === "baseline")
-              styleEntries.push("vertical-align: baseline");
-            if (!styleEntries.length)
-              return;
-            const existing = span.getAttribute("style");
-            const merged = existing ? `${existing}; ${styleEntries.join("; ")}` : styleEntries.join("; ");
-            span.setAttribute("style", merged);
-          } catch (error) {
-            console.error("Failed to apply vertical alignment to span:", error);
-          }
-        });
-      } catch (error) {
-        console.error("Failed to apply vertical alignment to layout:", error);
-      }
-    }
   };
   Color = Extension.create({
     name: "color",
@@ -251429,7 +251421,7 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BV6PERs7_es();
+  init_src_CfMc8y28_es();
   init_SuperConverter_Cw5CEerM_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.124",
+  "version": "0.2.0-next.126",
   "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/pm-adapter": "0.0.0",
-    "superdoc": "1.18.0",
-    "@superdoc/super-editor": "0.0.1"
+    "superdoc": "1.18.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.124",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.124",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.124",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.124",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.124"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.126",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.126",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.126",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.126",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.126"
   },
   "scripts": {
     "dev": "bun run src/index.ts",