@ai-matrx/office 0.8.17 → 0.8.18

package/dist/univer-collab.cjs

@@ -41,6 +41,7 @@ __export(collab_exports, {
   SHEETS_EDIT_GROUP: () => SHEETS_EDIT_GROUP,
   WorkbookCollabSession: () => WorkbookCollabSession,
   applyDocsOp: () => applyDocsOp,
+  asLoadedDocsSnapshot: () => asLoadedDocsSnapshot,
   canonicalDocsSnapshot: () => canonicalDocsSnapshot,
   canonicalDocsString: () => canonicalDocsString,
   canonicalKeys: () => canonicalKeys,
@@ -949,6 +950,104 @@ function invertDocsOp(op, preDoc) {
 }
 var DOCS_TRANSFORM_VERSION = "univer-1.0.4+docs-ot-r6";
 
+// src/univer/collab/docs-ot/state-hash.ts
+var import_core4 = require("@univerjs/core");
+
+// src/docs/sanitize-univer-doc-snapshot.ts
+var import_core2 = require("@univerjs/core");
+
+// src/core/document-page-style.ts
+var TRADITIONAL = 1;
+var PORTRAIT = 0;
+var PX_PER_INCH = 96;
+var DEFAULT_DOCUMENT_PAGE_STYLE = {
+  pageSize: { width: 816, height: 1056 },
+  documentFlavor: TRADITIONAL,
+  pageOrient: PORTRAIT,
+  marginTop: PX_PER_INCH,
+  marginBottom: PX_PER_INCH,
+  marginLeft: PX_PER_INCH,
+  marginRight: PX_PER_INCH,
+  // Univer applies no paragraph spacing to a paginated page by itself; without this every paragraph
+  // runs into the next (Google Docs' own default: 1.15 lines, 10px after).
+  defaultParagraphStyle: { spaceAbove: { v: 0 }, spaceBelow: { v: 10 }, lineSpacing: 1.15 }
+};
+function defaultDocumentPageStyle() {
+  return {
+    ...DEFAULT_DOCUMENT_PAGE_STYLE,
+    pageSize: { ...DEFAULT_DOCUMENT_PAGE_STYLE.pageSize },
+    defaultParagraphStyle: { ...DEFAULT_DOCUMENT_PAGE_STYLE.defaultParagraphStyle }
+  };
+}
+function isLegacySqueezedPageStyle(style) {
+  const size = style?.pageSize;
+  return !!size && size.width === 595 && size.height === 842 && style?.marginLeft === 90 && style?.marginRight === 90 && style?.marginTop === 72 && style?.marginBottom === 72;
+}
+var PAGE_COLORS = ["#ffffff", "#fff8e7", "#f3f3f3", "#e8f0fe", "#e6f4ea", "#fef7e0"];
+var DEFAULT_PAGE_COLOR = PAGE_COLORS[0];
+
+// src/docs/sanitize-univer-doc-snapshot.ts
+var NAMED_STYLE_STRING_TO_NUMBER = Object.fromEntries(
+  Object.entries(import_core2.NamedStyleType).filter(([key, val]) => typeof val === "number" && isNaN(Number(key))).map(([key, val]) => [key, val])
+);
+function sanitizeUniverDocSnapshot(snapshot, docId, opts = {}) {
+  restorePageStyle(snapshot, docId, opts.quiet === true);
+  ensureTextRuns(snapshot);
+  const paragraphs = snapshot?.body?.paragraphs;
+  if (!Array.isArray(paragraphs)) return snapshot;
+  let fixed = 0;
+  for (const paragraph of paragraphs) {
+    const style = paragraph?.paragraphStyle;
+    const value = style?.namedStyleType;
+    if (typeof value === "string") {
+      const numeric = NAMED_STYLE_STRING_TO_NUMBER[value];
+      if (numeric !== void 0) {
+        style.namedStyleType = numeric;
+        fixed += 1;
+      } else {
+        delete style.namedStyleType;
+        fixed += 1;
+      }
+    }
+  }
+  if (fixed > 0 && opts.quiet !== true) {
+    console.warn(
+      `[data-tables] RECOVERY: sanitized ${fixed} string namedStyleType value(s) to numeric NamedStyleType in document snapshot${docId ? ` ${docId}` : ""}. The snapshot was written with the wrong enum encoding (string instead of number) and would have crashed Univer's <ParagraphMenu>. Fix the snapshot writer to emit numeric NamedStyleType values.`
+    );
+  }
+  return snapshot;
+}
+function restorePageStyle(snapshot, docId, quiet = false) {
+  if (!snapshot || typeof snapshot !== "object") return;
+  const style = snapshot.documentStyle;
+  if (style?.pageSize?.width && isLegacySqueezedPageStyle(style)) {
+    const page = defaultDocumentPageStyle();
+    snapshot.documentStyle = { ...style, ...page, defaultParagraphStyle: style.defaultParagraphStyle ?? page.defaultParagraphStyle };
+    return;
+  }
+  if (style?.pageSize?.width) {
+    if (!style.documentFlavor) {
+      const page = defaultDocumentPageStyle();
+      Object.assign(style, { documentFlavor: page.documentFlavor });
+      if (page.defaultParagraphStyle) style.defaultParagraphStyle ??= page.defaultParagraphStyle;
+    }
+    return;
+  }
+  snapshot.documentStyle = {
+    ...defaultDocumentPageStyle(),
+    ...snapshot.documentStyle ?? {},
+    pageSize: defaultDocumentPageStyle().pageSize
+  };
+  if (quiet) return;
+  console.warn(
+    `[data-tables] RECOVERY: document snapshot${docId ? ` ${docId}` : ""} had no documentStyle.pageSize \u2014 restored the default Letter page geometry. Without a page box Univer lays the body out unbounded: text does not wrap and the viewport has no scrollable extent, so the document appears frozen. Fix the snapshot writer (agent/markdown converters must stamp DEFAULT_DOCUMENT_PAGE_STYLE).`
+  );
+}
+function ensureTextRuns(snapshot) {
+  const body = snapshot?.body;
+  if (body && typeof body === "object" && !Array.isArray(body.textRuns)) body.textRuns = [];
+}
+
 // src/univer/collab/docs-ot/state-hash.ts
 var DOC_LOCAL_KEYS = ["rev", "__matrxCollabCovered", "__collab", "disabled", "layoutState", "textRanges", "selections"];
 function sortDeep(v) {
@@ -1008,6 +1107,7 @@ function canonicalBody(body) {
   const b = { ...body };
   b.textRuns = canonicalRuns(b.textRuns);
   if (Array.isArray(b.paragraphs)) b.paragraphs = b.paragraphs.map(({ paragraphId: _p, ...p }) => p);
+  if (Array.isArray(b.sectionBreaks)) b.sectionBreaks = b.sectionBreaks.map(({ sectionId: _s, ...x }) => x);
   b.customRanges = foldPieces(b.customRanges, (r) => JSON.stringify([rootId(r.rangeId), r.rangeType, sortDeep(r.properties ?? {})])).map((r) => ({
     ...r,
     rangeId: rootId(r.rangeId)
@@ -1022,8 +1122,20 @@ function canonicalBody(body) {
   }
   return b;
 }
+function asLoadedDocsSnapshot(snapshot) {
+  const s = stampDeterministicIds(structuredClone(snapshot ?? {}));
+  delete s.id;
+  for (const k of DOC_LOCAL_KEYS) delete s[k];
+  sanitizeUniverDocSnapshot(s, void 0, { quiet: true });
+  const model = new import_core4.DocumentDataModel(s);
+  try {
+    return structuredClone(model.getSnapshot());
+  } finally {
+    model.dispose();
+  }
+}
 function canonicalDocsSnapshot(snapshot) {
-  const s = structuredClone(snapshot ?? {});
+  const s = asLoadedDocsSnapshot(snapshot);
   delete s.id;
   for (const k of DOC_LOCAL_KEYS) delete s[k];
   s.body = canonicalBody(s.body);
@@ -1232,7 +1344,10 @@ function openDocsOtRoom(o) {
       queue = next.filter((q) => !isNoopDocsOp(q));
       if (isNoopDocsOp(op)) return;
     }
-    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: m.cmd ?? RICH_TEXT_EDITING })) notice({ kind: "not_live" });
+    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: m.cmd ?? RICH_TEXT_EDITING })) {
+      notice({ kind: "not_live" });
+      session.rebuild("not_live");
+    }
   };
   const unsubLocal = port.onLocal(onLocal);
   const target = o.compositionTarget === void 0 ? typeof document !== "undefined" ? document : null : o.compositionTarget;
@@ -1294,7 +1409,7 @@ var import_awareness2 = require("y-protocols/awareness");
 var import_collab3 = require("@ai-matrx/data/realtime/collab");
 
 // src/docs/remote-carets.ts
-var import_core2 = require("@univerjs/core");
+var import_core5 = require("@univerjs/core");
 var CARET_HEARTBEAT_MS = 2e3;
 var CARET_STALE_MS = 12e3;
 var CARET_MAX_RANGES = 4;
@@ -1312,8 +1427,8 @@ function movePeerRangesThroughBodyEdit(ranges, actions) {
   const e = sub.e;
   return ranges.map((r) => {
     const collapsed = r.start === r.end;
-    const start = import_core2.TextX.transformPosition(e, r.start, false);
-    return { start, end: collapsed ? start : import_core2.TextX.transformPosition(e, r.end, true) };
+    const start = import_core5.TextX.transformPosition(e, r.start, false);
+    return { start, end: collapsed ? start : import_core5.TextX.transformPosition(e, r.end, true) };
   });
 }
 var sameRanges = (a, b) => a.length === b.length && a.every((r, i) => r.start === b[i].start && r.end === b[i].end);
@@ -1451,15 +1566,6 @@ async function documentUsesOrderedRoom(documentId, knob, isNewDocument) {
   if (knob === "new") return isNewDocument();
   return false;
 }
-function pickColor2(uid) {
-  const palette = ["#ef4444", "#f59e0b", "#10b981", "#3b82f6", "#8b5cf6", "#ec4899", "#14b8a6", "#f97316"];
-  let h = 2166136261;
-  for (let i = 0; i < uid.length; i++) {
-    h ^= uid.charCodeAt(i);
-    h = Math.imul(h, 16777619);
-  }
-  return palette[Math.abs(h) % palette.length] ?? "#ec4899";
-}
 function documentOtFactory(o) {
   return async (basePort, onAwareness) => {
     const latest = await getLatestDocumentSnapshot(o.documentId);
@@ -1473,7 +1579,8 @@ function documentOtFactory(o) {
     }
     const doc = new Y2.Doc();
     const awareness = new import_awareness2.Awareness(doc);
-    awareness.setLocalState({ uid: o.uid, clientId: o.clientId, name: o.displayName ?? o.uid.slice(0, 8), color: pickColor2(o.uid), ts: Date.now() });
+    awareness.setLocalState({ uid: o.uid, clientId: o.clientId, name: o.displayName ?? o.uid.slice(0, 8), ts: Date.now() });
+    const stopColor = (0, import_collab3.claimCollaboratorColor)(awareness, { uid: o.uid, clientId: o.clientId });
     const carets = new RemoteCaretBook(awareness.clientID);
     const emit = () => onAwareness({ states: new Map(awareness.getStates()), selfUid: o.uid, carets: carets.list() });
     const publishAwareness = () => {
@@ -1559,6 +1666,7 @@ function documentOtFactory(o) {
       replace: (snapshot) => room.replace(snapshot),
       stop: () => {
         clearInterval(caretTimer);
+        stopColor();
         room.stop();
         awareness.off("change", publishAwareness);
         provider.disconnect();
@@ -1880,7 +1988,7 @@ function transformAxis(x, y, side) {
 }
 
 // src/collab/sheets/transform/formula.ts
-var import_core3 = require("@univerjs/core");
+var import_core6 = require("@univerjs/core");
 var import_engine_formula = require("@univerjs/engine-formula");
 var import_sheets = require("@univerjs/sheets");
 var REF_ERROR = "#REF!";
@@ -1932,8 +2040,8 @@ function referencedSheetNames(text) {
   }
   return [...out];
 }
-var fullRowsRange = (start, count) => ({ startRow: start, endRow: start + count - 1, startColumn: 0, endColumn: FULL, rangeType: import_core3.RANGE_TYPE.ROW });
-var fullColsRange = (start, count) => ({ startRow: 0, endRow: FULL, startColumn: start, endColumn: start + count - 1, rangeType: import_core3.RANGE_TYPE.COLUMN });
+var fullRowsRange = (start, count) => ({ startRow: start, endRow: start + count - 1, startColumn: 0, endColumn: FULL, rangeType: import_core6.RANGE_TYPE.ROW });
+var fullColsRange = (start, count) => ({ startRow: 0, endRow: FULL, startColumn: start, endColumn: start + count - 1, rangeType: import_core6.RANGE_TYPE.COLUMN });
 var startV = (v) => Number.isNaN(v) || v == null ? -Infinity : v;
 var endV = (v) => Number.isNaN(v) || v == null ? Infinity : v;
 function startEnd(r) {
@@ -1942,9 +2050,9 @@ function startEnd(r) {
 function checkMoveEdge(origin, from) {
   const startRow = startV(origin.startRow), endRow = endV(origin.endRow), startColumn = startV(origin.startColumn), endColumn = endV(origin.endColumn);
   const fromStartRow = startV(from.startRow), fromEndRow = endV(from.endRow), fromStartColumn = startV(from.startColumn), fromEndColumn = endV(from.endColumn);
-  const rowsCover = () => origin.rangeType === import_core3.RANGE_TYPE.COLUMN && from.rangeType === import_core3.RANGE_TYPE.COLUMN || startRow >= fromStartRow && endRow <= fromEndRow;
-  const columnsCover = () => origin.rangeType === import_core3.RANGE_TYPE.ROW && from.rangeType === import_core3.RANGE_TYPE.ROW || startColumn >= fromStartColumn && endColumn <= fromEndColumn;
-  const allCover = () => origin.rangeType === import_core3.RANGE_TYPE.ALL && from.rangeType === import_core3.RANGE_TYPE.ALL;
+  const rowsCover = () => origin.rangeType === import_core6.RANGE_TYPE.COLUMN && from.rangeType === import_core6.RANGE_TYPE.COLUMN || startRow >= fromStartRow && endRow <= fromEndRow;
+  const columnsCover = () => origin.rangeType === import_core6.RANGE_TYPE.ROW && from.rangeType === import_core6.RANGE_TYPE.ROW || startColumn >= fromStartColumn && endColumn <= fromEndColumn;
+  const allCover = () => origin.rangeType === import_core6.RANGE_TYPE.ALL && from.rangeType === import_core6.RANGE_TYPE.ALL;
   if (rowsCover() && columnsCover() || allCover()) return 4;
   if (columnsCover() && startRow >= fromStartRow && startRow <= fromEndRow && endRow > fromEndRow) return 0;
   if (columnsCover() && endRow >= fromStartRow && endRow <= fromEndRow && startRow < fromStartRow) return 1;
@@ -1955,14 +2063,14 @@ function checkMoveEdge(origin, from) {
 function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
   const { startRow, endRow, startColumn, endColumn, rangeType } = startEnd(result);
   const f = startEnd(from);
-  const fromRangeType = from.rangeType ?? import_core3.RANGE_TYPE.NORMAL;
+  const fromRangeType = from.rangeType ?? import_core6.RANGE_TYPE.NORMAL;
   const t = startEnd(to);
   const rm = startEnd(remain);
   const o = startEnd(origin);
-  const originRangeType = origin.rangeType ?? import_core3.RANGE_TYPE.NORMAL;
+  const originRangeType = origin.rangeType ?? import_core6.RANGE_TYPE.NORMAL;
   const newRange = { ...origin };
-  const rowsCover = () => rangeType === import_core3.RANGE_TYPE.COLUMN && originRangeType === import_core3.RANGE_TYPE.COLUMN || startColumn >= o.startColumn && endColumn <= o.endColumn;
-  const columnsCover = () => rangeType === import_core3.RANGE_TYPE.ROW && originRangeType === import_core3.RANGE_TYPE.ROW || startRow >= o.startRow && endRow <= o.endRow;
+  const rowsCover = () => rangeType === import_core6.RANGE_TYPE.COLUMN && originRangeType === import_core6.RANGE_TYPE.COLUMN || startColumn >= o.startColumn && endColumn <= o.endColumn;
+  const columnsCover = () => rangeType === import_core6.RANGE_TYPE.ROW && originRangeType === import_core6.RANGE_TYPE.ROW || startRow >= o.startRow && endRow <= o.endRow;
   if (moveEdge === 0) {
     if (!rowsCover()) return void 0;
     if (startRow < o.startRow) newRange.startRow = startRow;
@@ -1985,7 +2093,7 @@ function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
     else return void 0;
   } else if (moveEdge === 4) {
     Object.assign(newRange, { startRow, startColumn, endRow, endColumn });
-  } else if (f.startColumn <= o.startColumn && f.endColumn >= o.endColumn || fromRangeType === import_core3.RANGE_TYPE.ROW && originRangeType === import_core3.RANGE_TYPE.ROW) {
+  } else if (f.startColumn <= o.startColumn && f.endColumn >= o.endColumn || fromRangeType === import_core6.RANGE_TYPE.ROW && originRangeType === import_core6.RANGE_TYPE.ROW) {
     const n = f.endRow - f.startRow + 1;
     if (from.endRow < o.startRow) {
       if (t.startRow >= o.startRow) newRange.startRow -= n;
@@ -1997,7 +2105,7 @@ function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
       if (t.startRow <= o.startRow) newRange.startRow += n;
       else if (t.startRow >= o.endRow) newRange.endRow -= n;
     }
-  } else if (f.startRow <= o.startRow && f.endRow >= o.endRow || fromRangeType === import_core3.RANGE_TYPE.COLUMN && originRangeType === import_core3.RANGE_TYPE.COLUMN) {
+  } else if (f.startRow <= o.startRow && f.endRow >= o.endRow || fromRangeType === import_core6.RANGE_TYPE.COLUMN && originRangeType === import_core6.RANGE_TYPE.COLUMN) {
     const n = f.endColumn - f.startColumn + 1;
     if (from.endColumn < o.startColumn) {
       if (t.startColumn >= o.startColumn) newRange.startColumn -= n;
@@ -2019,7 +2127,7 @@ function moveRange(range, axis, op) {
   const isRow = axis === "row";
   if (op.kind === "insert") {
     const r = isRow ? fullRowsRange(op.at, op.count) : fullColsRange(op.at, op.count);
-    const ops2 = isRow ? (0, import_sheets.handleInsertRow)({ id: import_sheets.EffectRefRangId.InsertRowCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core3.Direction.DOWN } }, range) : (0, import_sheets.handleInsertCol)({ id: import_sheets.EffectRefRangId.InsertColCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core3.Direction.RIGHT } }, range);
+    const ops2 = isRow ? (0, import_sheets.handleInsertRow)({ id: import_sheets.EffectRefRangId.InsertRowCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core6.Direction.DOWN } }, range) : (0, import_sheets.handleInsertCol)({ id: import_sheets.EffectRefRangId.InsertColCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core6.Direction.RIGHT } }, range);
     const res2 = (0, import_sheets.runRefRangeMutations)(ops2, range);
     return res2 == null ? void 0 : { ...range, ...res2 };
   }
@@ -2032,11 +2140,11 @@ function moveRange(range, axis, op) {
   const from = isRow ? fullRowsRange(op.from, op.count) : fullColsRange(op.from, op.count);
   const to = isRow ? fullRowsRange(op.to, op.count) : fullColsRange(op.to, op.count);
   const moveEdge = checkMoveEdge(range, from);
-  let remain = (0, import_core3.getIntersectRange)(range, from);
+  let remain = (0, import_core6.getIntersectRange)(range, from);
   if (isRow) {
     if (remain == null && (from.endRow < range.startRow && to.endRow <= range.startRow || from.startRow > range.endRow && to.startRow > range.endRow)) return void 0;
   } else if (remain == null && (from.endColumn < range.startColumn && to.endColumn <= range.startColumn || from.startColumn > range.endColumn && to.startColumn > range.endColumn)) return void 0;
-  remain ??= { startRow: range.startRow, endRow: range.endRow, startColumn: range.startColumn, endColumn: range.endColumn, rangeType: import_core3.RANGE_TYPE.NORMAL };
+  remain ??= { startRow: range.startRow, endRow: range.endRow, startColumn: range.startColumn, endColumn: range.endColumn, rangeType: import_core6.RANGE_TYPE.NORMAL };
   const ops = isRow ? (0, import_sheets.handleMoveRows)({ id: import_sheets.EffectRefRangId.MoveRowsCommandId, params: { toRange: to, fromRange: from } }, remain) : (0, import_sheets.handleMoveCols)({ id: import_sheets.EffectRefRangId.MoveColsCommandId, params: { toRange: to, fromRange: from } }, remain);
   const res = (0, import_sheets.runRefRangeMutations)(ops, remain);
   if (res == null) return REF_ERROR;
@@ -2067,7 +2175,7 @@ function rewriteFormula(text, ctx, change) {
       if (!sheetName) continue;
       token = (0, import_engine_formula.serializeRangeToRefString)({ range, sheetName: change.name, unitId });
     } else {
-      const moved = moveRange(import_core3.Rectangle.moveOffset(range, 0, 0), change.axis, change.op);
+      const moved = moveRange(import_core6.Rectangle.moveOffset(range, 0, 0), change.axis, change.op);
       if (moved === void 0) continue;
       token = moved === REF_ERROR ? REF_ERROR : (0, import_engine_formula.serializeRangeToRefString)({ range: moved, sheetName: target === ctx.ownSheet && !ctx.keepQualifier ? "" : sheetName, unitId });
     }
@@ -3338,7 +3446,7 @@ function univerSheetsOtPort(o) {
       const a = forApply(m);
       applying = true;
       try {
-        const ok2 = cs.syncExecuteCommand(a.id, { ...json(a.params), unitId: u }, { onlyLocal: true, fromCollab: true });
+        const ok2 = cs.syncExecuteCommand(a.id, { ...json(a.params), unitId: u }, { fromCollab: true });
         if (ok2 === false) throw new Error(`"${m.id}" was refused by the editor`);
       } finally {
         applying = false;
@@ -3512,7 +3620,7 @@ async function workbookUsesOrderedRoom(workbookId, knob, isNewWorkbook) {
   if (knob === "new") return isNewWorkbook();
   return false;
 }
-function pickColor3(uid) {
+function pickColor2(uid) {
   const palette = ["#ef4444", "#f59e0b", "#10b981", "#3b82f6", "#8b5cf6", "#ec4899", "#14b8a6", "#f97316"];
   let h = 2166136261;
   for (let i = 0; i < uid.length; i++) {
@@ -3537,7 +3645,7 @@ async function startWorkbookOtRoom(port, o) {
     uid: o.uid,
     clientId: o.clientId,
     name: o.displayName ?? o.uid.slice(0, 8),
-    color: pickColor3(o.uid),
+    color: pickColor2(o.uid),
     sheetId: null,
     row: null,
     col: null,