@superdoc-dev/cli 0.4.0-next.12 → 0.4.0-next.14

package/dist/index.js

@@ -41140,7 +41140,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-C9MZOwsC.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CrD9C1_e.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -58889,6 +58889,8 @@ function getInlineRunProperties(runPropertiesFromMarks, runPropertiesFromStyles,
     Object.keys(existingRunProperties).forEach((key) => {
       if (RUN_PROPERTIES_DERIVED_FROM_MARKS.has(key) && !preservedDerivedKeys.has(key))
         return;
+      if (key === "styleId" && TRANSIENT_HYPERLINK_STYLE_IDS.has(existingRunProperties[key]) && (runPropertiesFromMarks.styleId == null || runPropertiesFromMarks.styleId === ""))
+        return;
       if (key in inlineRunProperties)
         return;
       if (existingRunProperties[key] === undefined)
@@ -61217,7 +61219,7 @@ function handleHtmlPaste(html2, editor, source) {
     cleanedHtml = htmlHandler(html2, editor);
   if (cleanedHtml?.dataset)
     cleanedHtml.dataset.superdocImport = "true";
-  let doc$2 = DOMParser$1.fromSchema(editor.schema).parse(cleanedHtml, { preserveWhitespace: true });
+  let doc$2 = DOMParser$1.fromSchema(editor.schema).parse(cleanedHtml);
   doc$2 = mergeAdjacentTableFragments(doc$2);
   doc$2 = wrapTextsInRuns(doc$2);
   const { dispatch, state } = editor.view;
@@ -85438,7 +85440,7 @@ var isRegExp = (value) => {
     start: safeStart,
     end: safeEnd
   };
-}, RUN_PROPERTIES_DERIVED_FROM_MARKS, RUN_PROPERTY_PRESERVE_META_KEY = "sdPreserveRunPropertiesKeys", calculateInlineRunPropertiesPlugin = (editor) => new Plugin({ appendTransaction(transactions, _oldState, newState) {
+}, RUN_PROPERTIES_DERIVED_FROM_MARKS, TRANSIENT_HYPERLINK_STYLE_IDS, RUN_PROPERTY_PRESERVE_META_KEY = "sdPreserveRunPropertiesKeys", calculateInlineRunPropertiesPlugin = (editor) => new Plugin({ appendTransaction(transactions, _oldState, newState) {
   const tr = newState.tr;
   if (!transactions.some((t) => t.docChanged))
     return null;
@@ -91371,7 +91373,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_C9MZOwsC_es = __esm(() => {
+var init_SuperConverter_CrD9C1_e_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_40FWvL78_es();
@@ -119700,6 +119702,7 @@ var init_SuperConverter_C9MZOwsC_es = __esm(() => {
     "vertAlign",
     "position"
   ]);
+  TRANSIENT_HYPERLINK_STYLE_IDS = new Set(["Hyperlink", "FollowedHyperlink"]);
   init_dist();
   DEFAULT_ALLOWED_PROTOCOLS = [
     "http",
@@ -154597,7 +154600,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-GN-UTjOb.es.js
+// ../../packages/superdoc/dist/chunks/src-BK2GcXbz.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -217357,9 +217360,25 @@ var Node$13 = class Node$14 {
   if (Object.keys(normalizedSnapshotAttrs).length === 0)
     return false;
   return (0, import_lodash$1.isMatch)(normalizedMarkAttrs, normalizedSnapshotAttrs);
+}, markAttrsMatchOnOverlap = (mark2, snapshot2) => {
+  if (!mark2 || !snapshot2 || mark2.type.name !== snapshot2.type)
+    return false;
+  if (!ATTRIBUTE_ONLY_MARKS.includes(snapshot2.type))
+    return false;
+  const normalizedMarkAttrs = normalizeAttrs(mark2.attrs || {});
+  const normalizedSnapshotAttrs = normalizeAttrs(snapshot2.attrs || {});
+  const markKeys$1 = Object.keys(normalizedMarkAttrs);
+  const snapshotKeys = Object.keys(normalizedSnapshotAttrs);
+  if (markKeys$1.length === 0 || snapshotKeys.length === 0)
+    return false;
+  const overlapKeys = markKeys$1.filter((key$1) => Object.prototype.hasOwnProperty.call(normalizedSnapshotAttrs, key$1));
+  if (overlapKeys.length === 0)
+    return false;
+  return overlapKeys.every((key$1) => (0, import_lodash$1.isEqual)(normalizedMarkAttrs[key$1], normalizedSnapshotAttrs[key$1]));
 }, findMarkInRangeBySnapshot = ({ doc: doc$12, from: from$1, to, snapshot: snapshot2 }) => {
   let exactMatch = null;
   let subsetMatch = null;
+  let overlapMatch = null;
   let typeOnlyMatch = null;
   const normalizedSnapshotAttrs = normalizeAttrs(snapshot2?.attrs || {});
   const shouldFallbackToTypeOnly = !(Object.keys(normalizedSnapshotAttrs).length > 0);
@@ -217378,13 +217397,18 @@ var Node$13 = class Node$14 {
       if (subset)
         subsetMatch = subset;
     }
+    if (!overlapMatch) {
+      const overlap = node3.marks.find((mark2) => markAttrsMatchOnOverlap(mark2, snapshot2));
+      if (overlap)
+        overlapMatch = overlap;
+    }
     if (!typeOnlyMatch) {
       const fallback = node3.marks.find((mark2) => markMatchesSnapshot(mark2, snapshot2, false));
       if (fallback)
         typeOnlyMatch = fallback;
     }
   });
-  const liveMark = exactMatch || subsetMatch || (shouldFallbackToTypeOnly ? typeOnlyMatch : null);
+  const liveMark = exactMatch || subsetMatch || overlapMatch || (shouldFallbackToTypeOnly ? typeOnlyMatch : null);
   if (!liveMark)
     console.debug("[track-changes] could not find live mark for snapshot", snapshot2);
   return liveMark;
@@ -228467,6 +228491,27 @@ var Node$13 = class Node$14 {
   if (borders.left)
     parts.push(`l:[${hashBorderSpec(borders.left)}]`);
   return parts.join(";");
+}, hashRunVisualMarks = (run2) => {
+  const bold = "bold" in run2 ? run2.bold : false;
+  const italic = "italic" in run2 ? run2.italic : false;
+  const underline = "underline" in run2 ? run2.underline : undefined;
+  const strike = "strike" in run2 ? run2.strike : false;
+  const color2 = "color" in run2 ? run2.color : undefined;
+  const fontSize = "fontSize" in run2 ? run2.fontSize : undefined;
+  const fontFamily = "fontFamily" in run2 ? run2.fontFamily : undefined;
+  const highlight = "highlight" in run2 ? run2.highlight : undefined;
+  const link2 = "link" in run2 ? run2.link : undefined;
+  return [
+    bold ? "b" : "",
+    italic ? "i" : "",
+    underline ? `u:${JSON.stringify(underline)}` : "",
+    strike ? "s" : "",
+    color2 ?? "",
+    fontSize !== undefined ? `fs:${fontSize}` : "",
+    fontFamily ? `ff:${fontFamily}` : "",
+    highlight ? `hl:${highlight}` : "",
+    link2 ? `ln:${JSON.stringify(link2)}` : ""
+  ].join("");
 }, MAX_CACHE_SIZE = 1e4, BYTES_PER_ENTRY_ESTIMATE = 5000, hashParagraphFrame = (frame) => {
   const parts = [];
   if (frame.wrap !== undefined)
@@ -228517,20 +228562,7 @@ var Node$13 = class Node$14 {
             continue;
           for (const run2 of paragraphBlock.runs) {
             const text5 = "text" in run2 && typeof run2.text === "string" ? run2.text : "";
-            const bold = "bold" in run2 ? run2.bold : false;
-            const italic = "italic" in run2 ? run2.italic : false;
-            const color2 = "color" in run2 ? run2.color : undefined;
-            const fontSize = "fontSize" in run2 ? run2.fontSize : undefined;
-            const fontFamily = "fontFamily" in run2 ? run2.fontFamily : undefined;
-            const highlight = "highlight" in run2 ? run2.highlight : undefined;
-            const marks = [
-              bold ? "b" : "",
-              italic ? "i" : "",
-              color2 ?? "",
-              fontSize !== undefined ? `fs:${fontSize}` : "",
-              fontFamily ? `ff:${fontFamily}` : "",
-              highlight ? `hl:${highlight}` : ""
-            ].join("");
+            const marks = hashRunVisualMarks(run2);
             const commentHash = hasComments$1(run2) ? run2.comments.map((c) => `${c.commentId ?? ""}:${c.internal ? "1" : "0"}`).join("|") : "";
             let trackedKey = "";
             if (hasTrackedChange(run2)) {
@@ -228619,20 +228651,7 @@ var Node$13 = class Node$14 {
     if (run2.kind === "fieldAnnotation")
       return `fa:${fieldAnnotationKey(run2)}`;
     const text5 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
-    const bold = "bold" in run2 ? run2.bold : false;
-    const italic = "italic" in run2 ? run2.italic : false;
-    const color2 = "color" in run2 ? run2.color : undefined;
-    const fontSize = "fontSize" in run2 ? run2.fontSize : undefined;
-    const fontFamily = "fontFamily" in run2 ? run2.fontFamily : undefined;
-    const highlight = "highlight" in run2 ? run2.highlight : undefined;
-    const marks = [
-      bold ? "b" : "",
-      italic ? "i" : "",
-      color2 ?? "",
-      fontSize !== undefined ? `fs:${fontSize}` : "",
-      fontFamily ? `ff:${fontFamily}` : "",
-      highlight ? `hl:${highlight}` : ""
-    ].join("");
+    const marks = hashRunVisualMarks(run2);
     let trackedKey = "";
     if (hasTrackedChange(run2)) {
       const tc = run2.trackedChange;
@@ -229360,7 +229379,7 @@ var Node$13 = class Node$14 {
   for (let i4 = 0;i4 < a2.runs.length; i4 += 1) {
     const runA = a2.runs[i4];
     const runB = b$1.runs[i4];
-    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || fieldAnnotationKey(runA) !== fieldAnnotationKey(runB) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : undefined) !== ("color" in runB ? runB.color : undefined) || ("fontSize" in runA ? runA.fontSize : undefined) !== ("fontSize" in runB ? runB.fontSize : undefined) || ("fontFamily" in runA ? runA.fontFamily : undefined) !== ("fontFamily" in runB ? runB.fontFamily : undefined) || ("highlight" in runA ? runA.highlight : undefined) !== ("highlight" in runB ? runB.highlight : undefined) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB))
+    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || fieldAnnotationKey(runA) !== fieldAnnotationKey(runB) || hashRunVisualMarks(runA) !== hashRunVisualMarks(runB) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB))
       return false;
   }
   return true;
@@ -234205,9 +234224,9 @@ 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_GN_UTjOb_es = __esm(() => {
+var init_src_BK2GcXbz_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_C9MZOwsC_es();
+  init_SuperConverter_CrD9C1_e_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_Qqwopz80_es();
@@ -250769,9 +250788,6 @@ function print() { __p += __j.call(arguments, '') }
               map$12.appendMap(deletionStep.getMap());
               return;
             }
-            trackedMark.attrs.before.forEach((oldMark) => {
-              tr.step(new AddMarkStep(mappedFrom, mappedTo, state.schema.marks[oldMark.type].create(oldMark.attrs)));
-            });
             trackedMark.attrs.after.forEach((newMark) => {
               const liveMark = findMarkInRangeBySnapshot({
                 doc: tr.doc,
@@ -250783,6 +250799,9 @@ function print() { __p += __j.call(arguments, '') }
                 return;
               tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
             });
+            trackedMark.attrs.before.forEach((oldMark) => {
+              tr.step(new AddMarkStep(mappedFrom, mappedTo, state.schema.marks[oldMark.type].create(oldMark.attrs)));
+            });
             tr.step(new RemoveMarkStep(mappedFrom, mappedTo, trackedMark));
           });
           return dispatchTrackedChangeResolution({
@@ -267524,8 +267543,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_GN_UTjOb_es();
-  init_SuperConverter_C9MZOwsC_es();
+  init_src_BK2GcXbz_es();
+  init_SuperConverter_CrD9C1_e_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_40FWvL78_es();
   init_constants_Qqwopz80_es();
@@ -320803,6 +320822,12 @@ function resolveCollaborationProfile(input2, sessionId) {
     bootstrapSettlingMs: input2.bootstrapSettlingMs
   };
 }
+function buildShorthandCollaborationInput(params4) {
+  return parseCollaborationInput({
+    providerType: DEFAULT_SHORTHAND_COLLABORATION_PROVIDER_TYPE,
+    ...params4
+  });
+}
 function resolveCollaborationToken(profile) {
   if (!profile.tokenEnv)
     return;
@@ -320890,7 +320915,7 @@ function createCollaborationRuntime(profile) {
     }
   };
 }
-var DEFAULT_SYNC_TIMEOUT_MS = 1e4, SYNC_POLL_INTERVAL_MS = 25, ENV_VAR_NAME_PATTERN;
+var DEFAULT_SHORTHAND_COLLABORATION_PROVIDER_TYPE = "y-websocket", DEFAULT_SYNC_TIMEOUT_MS = 1e4, SYNC_POLL_INTERVAL_MS = 25, ENV_VAR_NAME_PATTERN;
 var init_collaboration = __esm(() => {
   init_hocuspocus_provider_esm();
   init_y_websocket();
@@ -326104,12 +326129,11 @@ async function runOpen(tokens, context) {
       payload.bootstrapSettlingMs = bootstrapSettlingMs;
     collaborationInput = parseCollaborationInput(payload);
   } else if (collabUrl) {
-    collaborationInput = parseCollaborationInput({
-      providerType: "hocuspocus",
+    collaborationInput = buildShorthandCollaborationInput({
       url: collabUrl,
       documentId: collabDocumentId,
-      ...onMissing != null ? { onMissing } : {},
-      ...bootstrapSettlingMs != null ? { bootstrapSettlingMs } : {}
+      onMissing,
+      bootstrapSettlingMs
     });
   } else if (collabDocumentId) {
     throw new CliError("MISSING_REQUIRED", "open: --collab-document-id requires --collab-url.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.4.0-next.12",
+  "version": "0.4.0-next.14",
   "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/pm-adapter": "0.0.0",
-    "superdoc": "1.21.0",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/super-editor": "0.0.1"
+    "@superdoc/pm-adapter": "0.0.0",
+    "@superdoc/super-editor": "0.0.1",
+    "superdoc": "1.21.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.4.0-next.12",
-    "@superdoc-dev/cli-darwin-x64": "0.4.0-next.12",
-    "@superdoc-dev/cli-linux-x64": "0.4.0-next.12",
-    "@superdoc-dev/cli-windows-x64": "0.4.0-next.12",
-    "@superdoc-dev/cli-linux-arm64": "0.4.0-next.12"
+    "@superdoc-dev/cli-darwin-arm64": "0.4.0-next.14",
+    "@superdoc-dev/cli-darwin-x64": "0.4.0-next.14",
+    "@superdoc-dev/cli-linux-arm64": "0.4.0-next.14",
+    "@superdoc-dev/cli-linux-x64": "0.4.0-next.14",
+    "@superdoc-dev/cli-windows-x64": "0.4.0-next.14"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",