@ai-matrx/office 0.8.44 → 0.8.46

package/dist/univer-collab.js

@@ -1165,26 +1165,77 @@ function rebaseUndoStack(items, remote, stack) {
   const first = stack === "undo" ? "undoMutations" : "redoMutations";
   const second = stack === "undo" ? "redoMutations" : "undoMutations";
   let dropped = 0;
-  for (let i = items.length - 1; i >= 0; i--) {
+  let R = remote;
+  for (let i = items.length - 1; i >= 0 && !isNoopDocsOp(R); i--) {
     const item = items[i];
     try {
-      const a = threadThrough(item[first], remote);
+      const a = threadThrough(item[first], R);
       const b = threadThrough(item[second], a.after);
       if (a.next) item[first] = a.next;
       if (b.next) item[second] = b.next;
+      R = a.after;
     } catch {
       items.splice(i, 1);
       dropped++;
+      R = carryPast(item[first], R);
     }
   }
   return dropped;
 }
+function carryPast(list, remote) {
+  let R = remote;
+  for (const m of list ?? []) {
+    if (m.id !== RICH_TEXT_EDITING || isNoopDocsOp(R)) continue;
+    const own = m.params.actions;
+    if (touchesPageSetup(own) && touchesPageSetup(R)) continue;
+    R = transformDocsOp(R, own, "right").op;
+  }
+  return R;
+}
+var UNDO_COMMAND = "univer.command.undo";
+var REDO_COMMAND = "univer.command.redo";
 function openDocsOtRoom(o) {
   const { port } = o;
   let session = null;
   let composing = false;
   let queue = [];
   const drainWaiters = [];
+  let replay = null;
+  const noteHistoryStep = (m, inverse) => {
+    const side = m.cmd === UNDO_COMMAND ? "undo" : m.cmd === REDO_COMMAND ? "redo" : null;
+    if (!side) {
+      replay = null;
+      return;
+    }
+    for (const t of port.undoTargets()) {
+      const stacks = undoStacksOf(t.service);
+      const stack = stacks ? (side === "undo" ? stacks.undo : stacks.redo).get(t.unitId) : void 0;
+      const item = stack?.[stack.length - 1];
+      const list = item ? side === "undo" ? item.undoMutations : item.redoMutations : void 0;
+      const k = list ? list.findIndex((x) => x.params === m.params) : -1;
+      if (!item || !list || k < 0) continue;
+      if (k === 0 || !replay || replay.item !== item || replay.side !== side) {
+        const other = (side === "undo" ? item.redoMutations : item.undoMutations)?.[0]?.params ?? {};
+        const { textRanges: _t, layoutState: _l, actions: _a, ...template } = other;
+        replay = { item, side, inverses: [], template };
+      }
+      if (inverse === void 0 || list.some((x) => x.id !== RICH_TEXT_EDITING)) {
+        replay = null;
+        return;
+      }
+      replay.inverses.unshift(inverse);
+      if (k === list.length - 1) {
+        const rewritten = replay.inverses.filter((op) => !isNoopDocsOp(op)).map((op) => ({ id: RICH_TEXT_EDITING, params: { ...replay.template, segmentId: m.params?.segmentId ?? "", actions: op } }));
+        if (rewritten.length) {
+          if (side === "undo") item.redoMutations = rewritten;
+          else item.undoMutations = rewritten;
+        }
+        replay = null;
+      }
+      return;
+    }
+    replay = null;
+  };
   const notice = (n) => {
     try {
       o.onNotice?.(n);
@@ -1282,7 +1333,10 @@ function openDocsOtRoom(o) {
     }
     const p = m.params ?? {};
     const applied = p.actions ?? null;
-    if (isNoopDocsOp(applied)) return;
+    if (isNoopDocsOp(applied)) {
+      noteHistoryStep(m, null);
+      return;
+    }
     let op = normalizeDocsOp(structuredClone(applied));
     let inverse;
     try {
@@ -1290,6 +1344,7 @@ function openDocsOtRoom(o) {
     } catch {
       inverse = void 0;
     }
+    noteHistoryStep(m, inverse === void 0 ? void 0 : normalizeDocsOp(inverse));
     if (queue.length) {
       inverse = void 0;
       const next = [];
@@ -2781,6 +2836,18 @@ function transformCell(X, Y4, side) {
       if (styleKeys(xs).length !== styleKeys(kept ?? {}).length) xLost = true;
     }
   }
+  if (hasContent(X) && hasContent(Y4)) {
+    const has = (s) => !!s && typeof s === "object" && "n" in s;
+    const outS = out.s;
+    if (side === "left" && !has(X.s) && has(Y4.s) && X.s !== null) {
+      out.s = { ...outS && typeof outS === "object" ? outS : {}, n: null };
+    } else if (side === "right" && outS && typeof outS === "object" && "n" in outS) {
+      const rest = withoutStyleKeys(outS, /* @__PURE__ */ new Set(["n"]));
+      if (rest) out.s = rest;
+      else delete out.s;
+      xLost = true;
+    }
+  }
   return { entries: Object.keys(out).length ? [out, ...tail] : tail, xLost, yLost };
 }
 function transformCellsOverCells(x, y, side) {
@@ -3869,6 +3936,12 @@ function rebaseSheetUndoStack(items, remote, unitId) {
 function createSheetsOtAdapter(port, hooks = {}) {
   let queue = [];
   let draining = false;
+  const sameOp = (a, b) => JSON.stringify(canonicalKeys(a ?? [])) === JSON.stringify(canonicalKeys(b ?? []));
+  const commutesWithHeld = (op) => queue.every((q) => {
+    const a = transformSheetOp(op, q.op, "left");
+    const b = transformSheetOp(q.op, op, "right");
+    return !("barrier" in a) && !("barrier" in b) && sameOp(a.op, op) && sameOp(b.op, q.op);
+  });
   const lazy = typeof port.beforeUndo === "function";
   let pending = [];
   let pendingBase = 0;
@@ -3941,15 +4014,16 @@ function createSheetsOtAdapter(port, hooks = {}) {
     decode: decodeSheetOp,
     apply(op) {
       if (isNoopSheetOp(op)) return true;
-      if (port.busy() || queue.length) {
-        queue.push(op);
+      const hold = port.busy() || !!port.defers?.(op) || queue.length > 0 && !commutesWithHeld(op);
+      if (hold) {
+        queue.push({ op, rev: hooks.rev?.() ?? 0 });
         if (!draining) {
           draining = true;
           port.whenIdle(() => {
             draining = false;
             const held = queue;
             queue = [];
-            for (const q of held) applyNow(q);
+            for (const q of held) applyNow(q.op);
           });
         }
         return true;
@@ -3974,9 +4048,9 @@ function createSheetsOtAdapter(port, hooks = {}) {
     async hash() {
       if (port.busy() || queue.length) {
         await new Promise((resolve) => {
-          const done = setTimeout(resolve, 5e3);
+          const done = queue.length ? null : setTimeout(resolve, 5e3);
           port.whenIdle(() => {
-            clearTimeout(done);
+            if (done) clearTimeout(done);
             setTimeout(resolve, 0);
           });
         });
@@ -3987,15 +4061,17 @@ function createSheetsOtAdapter(port, hooks = {}) {
     rebaseLocalOverHeld(local) {
       let op = local;
       const next = [];
+      const overrode = [];
       for (const q of queue) {
-        const l2 = transformSheetOp(op, q, "left");
-        const q2 = transformSheetOp(q, op, "right");
+        const l2 = transformSheetOp(op, q.op, "left");
+        const q2 = transformSheetOp(q.op, op, "right");
         if ("barrier" in l2 || "barrier" in q2) return "barrier";
+        if (l2.lost.length && q.rev > 0) overrode.push({ rev: q.rev, lost: l2.lost });
         op = l2.op ?? [];
-        if (q2.op?.length) next.push(q2.op);
+        if (q2.op?.length) next.push({ op: q2.op, rev: q.rev });
       }
       queue = next;
-      return op;
+      return { op, overrode };
     },
     clearHeld() {
       queue = [];
@@ -4006,7 +4082,6 @@ function createSheetsOtAdapter(port, hooks = {}) {
 function openSheetsOtRoom(o) {
   const { port } = o;
   let session = null;
-  const adapter = createSheetsOtAdapter(port);
   const notice = (n) => {
     try {
       o.onNotice?.(n);
@@ -4014,6 +4089,29 @@ function openSheetsOtRoom(o) {
       console.warn("[sheets-ot] notice handler failed", err);
     }
   };
+  const adapter = createSheetsOtAdapter(port, { rev: () => session?.rev() ?? 0 });
+  let healing = null;
+  const HEALS = /* @__PURE__ */ new Set(["hash_mismatch", "save_hash_mismatch", "ack_mismatch"]);
+  const screen = () => {
+    try {
+      const s = port.snapshot();
+      return s ? canonicalSheetString(s) : null;
+    } catch {
+      return null;
+    }
+  };
+  const onIncident = (i) => {
+    if (HEALS.has(i.kind) && !healing) healing = { reason: i.kind, before: screen() };
+    o.onIncident?.(i);
+  };
+  const onStatus = (st) => {
+    if (st === "live" && healing) {
+      const h = healing;
+      healing = null;
+      if (h.before !== null && screen() !== h.before) notice({ kind: "resynced", reason: h.reason });
+    } else if (st === "read_only" || st === "closed") healing = null;
+    o.onStatus?.(st);
+  };
   const onLocal = (e) => {
     if (!session) return;
     if (e.kind === "not_shared") {
@@ -4033,6 +4131,7 @@ function openSheetsOtRoom(o) {
     }
     let op = e.mutations;
     let inverse = e.inverse;
+    let overrode = [];
     if (adapter.held()) {
       inverse = void 0;
       const r = adapter.rebaseLocalOverHeld(op);
@@ -4041,10 +4140,11 @@ function openSheetsOtRoom(o) {
         session.rebuild("held_barrier");
         return;
       }
-      op = r;
+      op = r.op;
+      overrode = r.overrode;
       if (!op.length) return;
     }
-    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: e.label ?? SHEETS_EDIT_GROUP })) notice({ kind: "not_live" });
+    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: e.label ?? SHEETS_EDIT_GROUP, ...overrode.length ? { overrode } : {} })) notice({ kind: "not_live" });
   };
   const unsubLocal = port.onLocal(onLocal);
   session = openOpSession2({
@@ -4054,8 +4154,8 @@ function openSheetsOtRoom(o) {
     clientId: o.clientId,
     ...o.presence ? { presence: o.presence } : {},
     onNotice: (n) => notice(n),
-    ...o.onIncident ? { onIncident: o.onIncident } : {},
-    ...o.onStatus ? { onStatus: o.onStatus } : {},
+    onIncident,
+    onStatus,
     ...o.offline ? { offline: o.offline } : {},
     ...o.onOffline ? { onOffline: o.onOffline } : {}
   });
@@ -4148,6 +4248,23 @@ function releaseUnitPluginState(cs, unitId, saved) {
 }
 
 // src/univer/collab/sheets-ot/univer-port.ts
+function filterServiceRange(service) {
+  return (unitId, subUnitId) => {
+    try {
+      const r = service()?.getFilterModel(unitId, subUnitId)?.getRange();
+      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn, ...r.rangeType !== void 0 ? { rangeType: r.rangeType } : {} } : null;
+    } catch {
+      return null;
+    }
+  };
+}
+function editorBridgeCell(bridge) {
+  return () => {
+    if (!bridge.isVisible()?.visible) return null;
+    const at = bridge.getEditLocation();
+    return at ? { sheetId: at.sheetId, row: at.row, col: at.column } : null;
+  };
+}
 var COMMAND = 0;
 var MUTATION = 2;
 var VALUES = "sheet.mutation.set-range-values";
@@ -4155,6 +4272,7 @@ var ADD_MERGE = "sheet.mutation.add-worksheet-merge";
 var REMOVE_MERGE = "sheet.mutation.remove-worksheet-merge";
 var SHEET_NAME = "sheet.mutation.set-worksheet-name";
 var INSERT_SHEET = "sheet.mutation.insert-sheet";
+var REMOVE_SHEET2 = "sheet.mutation.remove-sheet";
 var FILTER_RANGE = "sheet.mutation.set-filter-range";
 var RESHAPE = /* @__PURE__ */ new Set(["sheet.mutation.set-worksheet-row-count", "sheet.mutation.set-worksheet-column-count", "sheet.mutation.remove-sheet", INSERT_SHEET]);
 var UNDO = "univer.command.undo";
@@ -4174,6 +4292,18 @@ function univerSheetsOtPort(o) {
   const tracker = { stack: [], settle: () => settle() };
   let group = null;
   let applying = false;
+  let editorHold = false;
+  const edited = () => {
+    try {
+      return o.cellEditor?.() ?? null;
+    } catch {
+      return null;
+    }
+  };
+  const holding = () => {
+    if (editorHold && !edited()) editorHold = false;
+    return editorHold;
+  };
   const unitId = () => o.workbook()?.getUnitId() ?? null;
   const mine = (params) => {
     const u = unitId();
@@ -4202,7 +4332,7 @@ function univerSheetsOtPort(o) {
     if (!u || !o.filterRange) return null;
     try {
       const r = o.filterRange(u, sheet);
-      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn } : null;
+      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn, ...r.rangeType !== void 0 ? { rangeType: r.rangeType } : {} } : null;
     } catch {
       return null;
     }
@@ -4218,10 +4348,45 @@ function univerSheetsOtPort(o) {
       }
     }
   };
+  const sweepRemovedSheetRefs = (g) => {
+    const removed = g.mutations.filter((m) => m.id === REMOVE_SHEET2).map((m) => String(m.params.subUnitId ?? ""));
+    const wb = o.workbook();
+    const u = unitId();
+    if (!removed.length || !wb || !u) return;
+    const refSheets = {};
+    for (const [id, name] of Object.entries(g.sheets)) refSheets[name] = id;
+    for (const gone of removed) {
+      const name = g.sheets[gone];
+      if (!name) continue;
+      for (const ws of wb.getSheets()) {
+        const sheet = ws.getSheetId();
+        const cells = {};
+        ws.getCellMatrix?.().forValue((r, c, cell) => {
+          const f = cell?.f;
+          if (typeof f !== "string" || !f.includes(name)) return;
+          const out = rewriteFormula(f, { ownSheet: sheet, refSheets }, { kind: "remove-sheet", sheet: gone });
+          if (typeof out !== "string" && out.changed) (cells[r] ??= {})[c] = { f: out.text, si: null };
+        });
+        if (!Object.keys(cells).length) continue;
+        applying = true;
+        try {
+          cs.syncExecuteCommand(VALUES, { unitId: u, subUnitId: sheet, cellValue: json(cells) });
+        } finally {
+          applying = false;
+        }
+        const done = {};
+        for (const r of Object.keys(cells))
+          for (const c of Object.keys(cells[r])) (done[r] ??= {})[c] = completeCellContent(cells[r][c], json(ws.getCellRaw(Number(r), Number(c)) ?? null));
+        g.mutations.push({ id: VALUES, params: { subUnitId: sheet, cellValue: done } });
+        g.inverses.push(void 0);
+      }
+    }
+  };
   const flush = () => {
     const g = group;
     group = null;
     if (!g) return;
+    if (!g.notShared) sweepRemovedSheetRefs(g);
     if (g.notShared) emit({ kind: "not_shared", mutationId: g.notShared, label: g.label });
     else if (g.mutations.length) {
       const mutations = annotateSheetOps(annotateFormulas(g.mutations, g.sheets, g.names), g.order);
@@ -4233,7 +4398,7 @@ function univerSheetsOtPort(o) {
   };
   function settle() {
     if (tracker.stack.length === 0) flush();
-    if (tracker.stack.length === 0 && !group) for (const fn of idle.splice(0)) fn();
+    if (tracker.stack.length === 0 && !group && !holding()) for (const fn of idle.splice(0)) fn();
   }
   const before = cs.beforeCommandExecuted((info, options) => {
     if (info.id === UNDO || info.id === REDO) for (const fn of [...undoWatchers]) fn();
@@ -4247,6 +4412,7 @@ function univerSheetsOtPort(o) {
     const ws = o.workbook()?.getSheetBySheetId(String(p.subUnitId ?? ""));
     if (!ws) return;
     const record = { merges: json(ws.getMergeData() ?? []) };
+    if (!group) record.lone = openGroup(null);
     if (info.id === VALUES) {
       record.cells = /* @__PURE__ */ new Map();
       const cells = p.cellValue ?? {};
@@ -4283,6 +4449,7 @@ function univerSheetsOtPort(o) {
     }
   };
   const after = cs.onCommandExecuted((info) => {
+    if (editorHold && tracker.stack.length === 0 && !group && !edited()) settle();
     if (info.type !== COMMAND) return;
     const at = tracker.stack.lastIndexOf(info.id);
     if (at >= 0) tracker.stack.splice(at, 1);
@@ -4364,7 +4531,7 @@ function univerSheetsOtPort(o) {
           else {
             inv = {};
             if (CONTENT_KEYS.some((k) => k !== "t" && k in done)) Object.assign(inv, fullContent(p));
-            if ("s" in done) inv.s = p?.s ?? null;
+            if ("s" in done) inv.s = inverseStyle(p?.s, done.s);
           }
           (invCells[r] ??= {})[c] = inv;
         }
@@ -4402,7 +4569,7 @@ function univerSheetsOtPort(o) {
   };
   const collab = cs.onMutationExecutedForCollab((info, options) => {
     if (applying || flagged(options) || !mine(info.params)) return;
-    if (!group) group = openGroup(null);
+    if (!group) group = pre.get(info.params)?.lone ?? openGroup(null);
     const g = group;
     if (!g.notShared) {
       const r = capture(info);
@@ -4483,11 +4650,18 @@ function univerSheetsOtPort(o) {
       listeners.add(listener);
       return () => void listeners.delete(listener);
     },
+    // the editor hold is not "busy": only the ops that touch its cell wait (defers), the rest apply live
     busy: () => tracker.stack.length > 0 || group !== null,
+    defers(op) {
+      const at = edited();
+      if (!at || !op.some((m) => touchesEditedCell(m, at))) return false;
+      editorHold = true;
+      return true;
+    },
     /** The outermost commands still running here (why the port is busy), for logs. */
     running: () => [...tracker.stack, ...group && tracker.stack.length === 0 ? ["(group)"] : []],
     whenIdle(fn) {
-      if (tracker.stack.length === 0 && !group) fn();
+      if (tracker.stack.length === 0 && !group && !holding()) fn();
       else idle.push(fn);
     },
     applyRemote(m) {
@@ -4547,6 +4721,55 @@ function univerSheetsOtPort(o) {
     }
   };
 }
+function inverseStyle(prev, wrote) {
+  if (!prev || typeof prev !== "object") return null;
+  if (!wrote || typeof wrote !== "object") return prev;
+  const out = { ...prev };
+  for (const k of Object.keys(wrote)) if (!(k in out)) out[k] = null;
+  return out;
+}
+function touchesEditedCell(m, at) {
+  const p = m.params;
+  const sheet = String(p.subUnitId ?? p.sheetId ?? "");
+  if (sheet !== at.sheetId) return false;
+  if (m.id === VALUES) {
+    const row = p.cellValue?.[at.row];
+    return !!row && Object.prototype.hasOwnProperty.call(row, at.col);
+  }
+  if (m.id === REMOVE_SHEET2) return true;
+  if (m.id === "sheet.mutation.set-worksheet-row-count") return !(Number(p.rowCount) > at.row);
+  if (m.id === "sheet.mutation.set-worksheet-column-count") return !(Number(p.columnCount) > at.col);
+  const axis = axisOpOf(m);
+  if (axis) {
+    const i = axis.axis === "row" ? at.row : at.col;
+    return mapIndex(axis.op, i) !== i;
+  }
+  const ranges = [];
+  let unreadable = false;
+  const walk = (v, depth) => {
+    if (!v || typeof v !== "object" || depth > 6) return;
+    if (Array.isArray(v)) {
+      for (const x of v) walk(x, depth + 1);
+      return;
+    }
+    const o = v;
+    if (["startRow", "endRow", "startColumn", "endColumn"].some((k) => k in o)) {
+      const r = o;
+      if (![r.startRow, r.endRow, r.startColumn, r.endColumn].every((n) => typeof n === "number" && Number.isFinite(n)) && !(r.rangeType && r.rangeType > 0)) unreadable = true;
+      else ranges.push(r);
+      return;
+    }
+    if (typeof o.row === "number" && typeof o.col === "number") ranges.push({ startRow: o.row, endRow: o.row, startColumn: o.col, endColumn: o.col });
+    for (const x of Object.values(o)) walk(x, depth + 1);
+  };
+  walk(p, 0);
+  return unreadable || ranges.some((r) => covers(r, at));
+}
+function covers(r, at) {
+  const rows = r.rangeType === 2 || r.rangeType === 3 || r.startRow <= at.row && at.row <= r.endRow;
+  const cols = r.rangeType === 1 || r.rangeType === 3 || r.startColumn <= at.col && at.col <= r.endColumn;
+  return rows && cols;
+}
 function fullContent(cell) {
   const out = {};
   for (const k of CONTENT_KEYS) out[k] = cell && cell[k] !== void 0 ? cell[k] : null;
@@ -4857,6 +5080,7 @@ export {
   DOCS_COLLAB_PROTO,
   DOCS_TRANSFORM_VERSION,
   DOC_LOCAL_KEYS,
+  REDO_COMMAND,
   RICH_TEXT_EDITING,
   SENDER_VIEW_PARAMS,
   SHEETS_COLLAB_PROTO,
@@ -4864,6 +5088,7 @@ export {
   SHEETS_READABLE_PROTOS,
   SHEET_ROOM_EDITOR_PRESETS,
   SHEET_ROOM_PLUGIN_PACKAGES,
+  UNDO_COMMAND,
   WorkbookCollabSession,
   applyDocsOp,
   asLoadedDocsSnapshot,
@@ -4879,7 +5104,9 @@ export {
   documentOtFactory,
   documentUsesOrderedRoom,
   dropEmptyStyleRetains,
+  editorBridgeCell,
   encodeSheetOp,
+  filterServiceRange,
   invertDocsOp,
   isCellEditorScratch,
   isNoopDocsOp,
@@ -4897,6 +5124,7 @@ export {
   startWorkbookOtRoom,
   stripSenderView,
   takeCovered,
+  touchesEditedCell,
   transformDocsOp,
   transformSheetOp,
   transformTextX,