@ai-matrx/office 0.8.23 → 0.8.25

package/CHANGELOG.md

@@ -1,13 +1,12 @@
 # Changelog
 
-## 0.8.23
+## 0.8.25
 ### C9: comment anchors that follow concurrent edits
 
 - **Docs:** `addCommentAnchorActions(body, start, end, id)` anchors a passage with a `COMMENT` custom range (Univer's own builder, so the op has the link family's shape C0 proved); `commentAnchorsOf(body)` reads every anchor back (split pieces joined, Univer's inclusive end as `[start, end)`); `removeCommentAnchorActions` takes a cancelled draft's anchor out; `commentPartAnchor` / `anchorIdOfPartAnchor` are the thread's `part_anchor` (`anchor:<id>`, quote as `label`). Fuzz on the C0 corpora: anchor × every captured family and anchor × anchor, 0 divergences in 180,000 checks at 2,000 seeds; red check without a transform.
 - **Sheets:** `installSheetCommentAnchors(univer)` registers `matrx.mutation.set-comment-anchor`, the `SHEET_MATRX_COMMENT_ANCHORS_PLUGIN` resource and a listener that moves anchors through every applied row/column insert, remove and move (and drops them with their row, column or sheet). `transformCommentAnchor` (own file) is called first by `transformMutation`; the registry declares the id (family `anchor`), and the census exempts our own ids from the Univer scan. Fuzz: 40,000 checks, 0 divergences (it caught the same anchor id on two sheets being treated as one); two headless seats: B5 becomes B6 when a peer inserts a row above, survives save and reload, and is gone on both seats when its row is deleted. The fold installs the anchors too.
 - New export `./sheets/comment-anchors`. Consumer action: call `installSheetCommentAnchors(univer)` before creating a workbook unit that co-edits comments.
 
-## 0.8.22
 ### C5c: Sheets co-editing — merge divergence fixed, number formats, counts and sheets travel
 
 - **Merge divergence across chained row/column deletes, fixed at its cause.** Univer 1.0.4's structural commands only fix the merges that intersect the COMMAND's range on the other axis (any `-by-range` call with a partial range, an API call) and only while its ref-range registration is current (never refreshed after a content load or a remove-merge). A cut merge it skipped stayed put on the sender while every transform moved it, so seats ended a column apart (the session fuzz's merge at column -1 vs 0). Capture now completes the command (`mergeFixupsOwed`): the cut merges still on the sheet are removed right before the structural mutation and re-added at their model position right after it, in the traveling group and on the sender alike. Multi-seat session fuzz: 0 hash mismatches (was 2–18 per run).
@@ -21,19 +20,6 @@
 - `SHEETS_COLLAB_PROTO` = 2: a room opened by this build is raised to proto 2 (when its checkpoint is at head) and older tabs open it read-only, so seats with and without merge completion never share a room.
 - Consumer action: none.
 
-## 0.8.21
-### C5c: Sheets co-editing — merge divergence fixed, number formats, counts and sheets travel
-
-- **Merge divergence across chained row/column deletes, fixed at its cause.** Univer 1.0.4's structural commands only fix the merges that intersect the COMMAND's range on the other axis (any `-by-range` call with a partial range, an API call) and only while its ref-range registration is current (never refreshed after a content load or a remove-merge). A cut merge it skipped stayed put on the sender while every transform moved it, so seats ended a column apart (the session fuzz's merge at column -1 vs 0). Capture now completes the command (`mergeFixupsOwed`): the cut merges still on the sheet are removed right before the structural mutation and re-added at their model position right after it, in the traveling group and on the sender alike. Multi-seat session fuzz: 0 hash mismatches (was 2–18 per run).
-- **Number formats travel** (`sheet.mutation.set.numfmt` / `remove.numfmt`, family `numfmt`): typing a date or a currency no longer rolls back. Ranges follow row/column inserts, removes and moves cell by cell; against another write of the style key `n` (a numfmt, a style with `n`, a style clear, a cell delete) the later-committed op wins.
-- **Row/column counts travel** (`set-worksheet-row-count` / `-column-count`, family `count`): a concurrent insert/remove on that axis shifts the count; two counts at once, the larger wins. "Refresh from table" growing a sheet is no longer rolled back.
-- **Sheets: add, remove, order travel** (family `sheet`): the sheet order is transformed as one more axis. Capture records a removed sheet's index and how many sheets are left (`annotateSheetOps`, side-car `sheetIndex`, `sheetsLeft`); an insert-sheet's styles are inlined (`inlineSheetStyles`). An edit to a sheet removed at the same time is dropped and its author told; a formula naming a removed sheet, and two removes that would leave no sheet, are barriers.
-- **Selections: a seat's own row/column/count/sheet change keeps its selection inside the sheet** (API calls set no selection; the editor crashed with "Range is out of bounds"); a remote count/sheet change clamps it too.
-- **Transform speed:** the group transform walks the OT grid iteratively; untouched cell ops pass through by identity (no overlap, no formula, change elsewhere); barrier checks are cached per op; undo-stack rebase reuses each list's traveling shape and compares by identity.
-- **Tests:** new chained TP1 fuzz (`sheet-transform-chain-fuzz.test.ts`, 3–5 real commands per side, plus capture fidelity); the multi-seat session fuzz is seed-repeatable (`createSheetsOtAdapter` hook `stateHash`, a synchronous hash in tests) and asserts zero incidents. `SHEET_TRANSFORMER_VERSION` = `c5c-1`.
-- `SHEETS_COLLAB_PROTO` = 2: a room opened by this build is raised to proto 2 (when its checkpoint is at head) and older tabs open it read-only, so seats with and without merge completion never share a room.
-- Consumer action: none.
-
 ## 0.8.20
 
 SOURCE CHANGED WITH NO RELEASE NOTE. This release shipped source changes that nobody described in an Unreleased entry,

package/dist/univer-collab.cjs

@@ -60,6 +60,7 @@ __export(collab_exports, {
   isNoopDocsOp: () => isNoopDocsOp,
   moveSelectionsThrough: () => moveSelectionsThrough,
   normalizeDocsOp: () => normalizeDocsOp,
+  offlineTextOfGroups: () => offlineTextOfGroups,
   openDocsOtRoom: () => openDocsOtRoom,
   openSheetsOtRoom: () => openSheetsOtRoom,
   rebaseSheetUndoStack: () => rebaseSheetUndoStack,
@@ -1370,7 +1371,9 @@ function openDocsOtRoom(o) {
     ...o.presence ? { presence: o.presence } : {},
     onNotice: (n) => notice(n),
     ...o.onIncident ? { onIncident: o.onIncident } : {},
-    ...o.onStatus ? { onStatus: o.onStatus } : {}
+    ...o.onStatus ? { onStatus: o.onStatus } : {},
+    ...o.offline ? { offline: o.offline } : {},
+    ...o.onOffline ? { onOffline: o.onOffline } : {}
   });
   const isSaver = () => {
     if (!o.presence) return true;
@@ -1638,7 +1641,9 @@ function documentOtFactory(o) {
       replace: ({ snapshot, stateHash, clientId }) => (0, import_collab3.collabReplace)(client, { roomId: o.documentId, snapshot, stateHash, origin: "restore", clientId }),
       ...o.onNotice ? { onNotice: o.onNotice } : {},
       ...o.onIncident ? { onIncident: o.onIncident } : {},
-      ...o.onStatus ? { onStatus: o.onStatus } : {}
+      ...o.onStatus ? { onStatus: o.onStatus } : {},
+      offline: (0, import_collab3.browserOfflineOptions)(`${o.documentId}:${o.uid}`),
+      ...o.onOffline ? { onOffline: o.onOffline } : {}
     });
     await room.session.ready;
     let lastKey = "";
@@ -3559,17 +3564,65 @@ function rebaseSheetUndoStack(items, remote, unitId) {
 function createSheetsOtAdapter(port, hooks = {}) {
   let queue = [];
   let draining = false;
+  const lazy = typeof port.beforeUndo === "function";
+  let pending = [];
+  let pendingBase = 0;
+  let applied = 0;
+  let currentAt = /* @__PURE__ */ new WeakMap();
+  const PENDING_CAP = 2e3;
+  const now = () => typeof performance !== "undefined" ? performance.now() : Date.now();
+  const stacksOfTargets = () => port.undoTargets().flatMap((t) => {
+    const stacks = undoStacksOf2(t.service);
+    return stacks ? [stacks.undo, stacks.redo].map((map) => ({ items: map.get(t.unitId), unitId: t.unitId, isUndo: map === stacks.undo })) : [];
+  });
+  const markNew = (items) => {
+    for (let i = items.length - 1; i >= 0 && !currentAt.has(items[i]); i--) currentAt.set(items[i], applied);
+  };
+  const catchUpItem = (item, unitId) => {
+    const from = currentAt.get(item) ?? applied;
+    for (let k = from - pendingBase; k < pending.length; k++) if (rebaseSheetUndoStack([item], pending[k], unitId) > 0) return false;
+    currentAt.set(item, applied);
+    return true;
+  };
+  const catchUp = () => {
+    if (!pending.length) return;
+    const t0 = now();
+    let dropped = 0;
+    for (const { items, unitId } of stacksOfTargets()) {
+      if (!items?.length) continue;
+      for (let i = items.length - 1; i >= 0; i--)
+        if (!catchUpItem(items[i], unitId)) {
+          items.splice(i, 1);
+          dropped++;
+        }
+    }
+    pending = [];
+    pendingBase = applied;
+    hooks.onUndoWork?.(now() - t0, "catch_up");
+    if (dropped) hooks.onUndoRebased?.(dropped);
+  };
+  if (lazy) port.beforeUndo(catchUp);
   const applyNow = (op) => {
     for (const m of op) port.applyRemote(m);
+    const t0 = now();
     let dropped = 0;
-    for (const t of port.undoTargets()) {
-      const stacks = undoStacksOf2(t.service);
-      if (!stacks) continue;
-      for (const map of [stacks.undo, stacks.redo]) {
-        const items = map.get(t.unitId);
-        if (items?.length) dropped += rebaseSheetUndoStack(items, op, t.unitId);
+    if (!lazy) {
+      for (const { items, unitId } of stacksOfTargets()) if (items?.length) dropped += rebaseSheetUndoStack(items, op, unitId);
+    } else if (!isNoopSheetOp(op)) {
+      for (const { items, unitId, isUndo } of stacksOfTargets()) {
+        if (!items?.length) continue;
+        markNew(items);
+        const top = items[items.length - 1];
+        if (isUndo && (!catchUpItem(top, unitId) || rebaseSheetUndoStack([top], op, unitId) > 0)) {
+          items.pop();
+          dropped++;
+        } else if (isUndo) currentAt.set(top, applied + 1);
       }
+      pending.push(op);
+      applied++;
+      if (pending.length > PENDING_CAP) catchUp();
     }
+    hooks.onUndoWork?.(now() - t0, "remote");
     hooks.onUndoRebased?.(dropped);
     port.markDirty();
   };
@@ -3607,6 +3660,9 @@ function createSheetsOtAdapter(port, hooks = {}) {
         stacks?.undo.delete(t.unitId);
         stacks?.redo.delete(t.unitId);
       }
+      pending = [];
+      pendingBase = applied;
+      currentAt = /* @__PURE__ */ new WeakMap();
     },
     snapshot: () => port.snapshot(),
     async hash() {
@@ -3693,7 +3749,9 @@ function openSheetsOtRoom(o) {
     ...o.presence ? { presence: o.presence } : {},
     onNotice: (n) => notice(n),
     ...o.onIncident ? { onIncident: o.onIncident } : {},
-    ...o.onStatus ? { onStatus: o.onStatus } : {}
+    ...o.onStatus ? { onStatus: o.onStatus } : {},
+    ...o.offline ? { offline: o.offline } : {},
+    ...o.onOffline ? { onOffline: o.onOffline } : {}
   });
   const isSaver = () => {
     if (!o.presence) return true;
@@ -3724,6 +3782,65 @@ function openSheetsOtRoom(o) {
   };
 }
 
+// src/univer/collab/sheets-ot/plugin-teardown.ts
+var perSheetList = (data) => Object.entries(data).flatMap(([sheet, list]) => Array.isArray(list) ? [[sheet, list.filter((x) => !!x && typeof x === "object")]] : []);
+var PLUGIN_TEARDOWNS = [
+  {
+    resource: "SHEET_CONDITIONAL_FORMATTING_PLUGIN",
+    removals: (unitId, data) => perSheetList(data).flatMap(
+      ([subUnitId, rules]) => rules.filter((r) => typeof r.cfId === "string").map((r) => ({ id: "sheet.mutation.delete-conditional-rule", params: { unitId, subUnitId, cfId: r.cfId } }))
+    )
+  },
+  {
+    resource: "SHEET_DATA_VALIDATION_PLUGIN",
+    removals: (unitId, data) => perSheetList(data).flatMap(([subUnitId, rules]) => {
+      const ids = rules.map((r) => r.uid).filter((u) => typeof u === "string");
+      return ids.length ? [{ id: "data-validation.mutation.removeRule", params: { unitId, subUnitId, ruleId: ids, source: "command" } }] : [];
+    })
+  },
+  {
+    resource: "SHEET_NOTE_PLUGIN",
+    removals: (unitId, data) => Object.entries(data).flatMap(
+      ([sheetId, rows]) => Object.entries(rows ?? {}).flatMap(
+        ([row, cols]) => Object.entries(cols ?? {}).map(([col, note]) => ({
+          id: "sheet.mutation.remove-note",
+          params: { unitId, sheetId, row: Number(row), col: Number(col), ...note && typeof note.id === "string" ? { noteId: note.id } : {}, silent: true }
+        }))
+      )
+    )
+  }
+];
+function resourcesOf(saved) {
+  const out = /* @__PURE__ */ new Map();
+  const list = saved?.resources;
+  for (const r of Array.isArray(list) ? list : []) {
+    if (!r?.name) continue;
+    try {
+      const data = typeof r.data === "string" ? r.data ? JSON.parse(r.data) : null : r.data;
+      if (data && typeof data === "object") out.set(r.name, data);
+    } catch {
+    }
+  }
+  return out;
+}
+function releaseUnitPluginState(cs, unitId, saved) {
+  const resources = resourcesOf(saved);
+  let ran = 0;
+  for (const t of PLUGIN_TEARDOWNS) {
+    const data = resources.get(t.resource);
+    if (!data) continue;
+    for (const m of t.removals(unitId, data)) {
+      try {
+        cs.syncExecuteCommand(m.id, m.params, { onlyLocal: true });
+        ran++;
+      } catch (err) {
+        console.warn(`[sheets-ot] could not release ${t.resource} state before a reload`, err);
+      }
+    }
+  }
+  return ran;
+}
+
 // src/univer/collab/sheets-ot/univer-port.ts
 var COMMAND = 0;
 var MUTATION = 2;
@@ -3733,6 +3850,8 @@ var REMOVE_MERGE = "sheet.mutation.remove-worksheet-merge";
 var SHEET_NAME = "sheet.mutation.set-worksheet-name";
 var INSERT_SHEET = "sheet.mutation.insert-sheet";
 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";
+var REDO = "univer.command.redo";
 var DEPTH_GUARD = /* @__PURE__ */ Symbol.for("ai-matrx.office.sheets.command-depth-guard");
 var json = (v) => v === void 0 ? v : JSON.parse(JSON.stringify(v));
 var flagged = (options) => {
@@ -3742,6 +3861,7 @@ var flagged = (options) => {
 function univerSheetsOtPort(o) {
   const cs = o.commandService;
   const listeners = /* @__PURE__ */ new Set();
+  const undoWatchers = /* @__PURE__ */ new Set();
   const idle = [];
   const pre = /* @__PURE__ */ new WeakMap();
   const tracker = { stack: [], settle: () => settle() };
@@ -3798,6 +3918,7 @@ function univerSheetsOtPort(o) {
     if (tracker.stack.length === 0 && !group) 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();
     if (info.type === COMMAND) {
       if (tracker.stack.length === 0 && !group) group = openGroup(info.id);
       tracker.stack.push(info.id);
@@ -4043,6 +4164,8 @@ function univerSheetsOtPort(o) {
       group = null;
       applying = true;
       try {
+        const u = unitId();
+        if (u) releaseUnitPluginState(cs, u, o.saveUnit?.(u) ?? null);
         o.load(snapshot);
       } finally {
         applying = false;
@@ -4053,8 +4176,13 @@ function univerSheetsOtPort(o) {
       const service = o.undoRedo?.();
       return u && service ? [{ service, unitId: u }] : [];
     },
+    beforeUndo(fn) {
+      undoWatchers.add(fn);
+      return () => void undoWatchers.delete(fn);
+    },
     markDirty: () => o.markDirty(),
     dispose() {
+      undoWatchers.clear();
       before.dispose();
       after.dispose();
       collab.dispose();
@@ -4132,6 +4260,53 @@ function moveSelectionsThrough(selections, m, maxRows, maxCols) {
   return selections.map((s) => ({ ...s, range: box(s.range, s.range.rangeType), ...s.primary ? { primary: box(s.primary) } : {} }));
 }
 
+// src/univer/collab/offline-text.ts
+var colName3 = (c) => {
+  let n = c;
+  let s = "";
+  do {
+    s = String.fromCharCode(65 + n % 26) + s;
+    n = Math.floor(n / 26) - 1;
+  } while (n >= 0);
+  return s;
+};
+function collectDocText(v, out) {
+  if (Array.isArray(v)) {
+    for (const x of v) collectDocText(x, out);
+    return;
+  }
+  if (!v || typeof v !== "object") return;
+  const o = v;
+  if (typeof o.dataStream === "string" && o.dataStream.length) out.push(o.dataStream);
+  for (const k of Object.keys(o)) if (k !== "dataStream") collectDocText(o[k], out);
+}
+function collectCells(cellValue, out) {
+  if (!cellValue || typeof cellValue !== "object") return;
+  for (const [r, cols] of Object.entries(cellValue)) {
+    if (!cols || typeof cols !== "object") continue;
+    for (const [c, cell] of Object.entries(cols)) {
+      const x = cell;
+      const val = x?.f ?? x?.v;
+      if (val !== void 0 && val !== null && val !== "") out.push(`${colName3(Number(c))}${Number(r) + 1}: ${String(val)}`);
+    }
+  }
+}
+function offlineTextOfGroups(buffers) {
+  const docs = [];
+  const cells = [];
+  for (const groups of buffers) {
+    for (const g of groups) {
+      for (const m of g.mutations) {
+        const p = m.params;
+        if (p && "cellValue" in p) collectCells(p.cellValue, cells);
+        else collectDocText(p, docs);
+      }
+    }
+  }
+  const text = docs.join("").replace(/\r/g, "\n").replace(/\u0000/g, "");
+  return [text, cells.join("\n")].filter((s) => s.length > 0).join("\n");
+}
+
 // src/sheets/workbook-ot-room.ts
 var Y3 = __toESM(require("yjs"), 1);
 var import_awareness3 = require("y-protocols/awareness");
@@ -4234,6 +4409,7 @@ async function startWorkbookOtRoom(port, o) {
   await provider.connect();
   publishAwareness();
   const client = db4();
+  const offline = (0, import_collab6.browserOfflineOptions)(`${o.workbookId}:${o.uid}`);
   const room = openSheetsOtRoom({
     port,
     clientId: o.clientId,
@@ -4254,7 +4430,9 @@ async function startWorkbookOtRoom(port, o) {
     replace: ({ snapshot, stateHash, clientId }) => (0, import_collab6.collabReplace)(client, { roomId: o.workbookId, snapshot, stateHash, origin: "restore", clientId }),
     ...o.onNotice ? { onNotice: o.onNotice } : {},
     ...o.onIncident ? { onIncident: o.onIncident } : {},
-    ...o.onStatus ? { onStatus: o.onStatus } : {}
+    ...o.onStatus ? { onStatus: o.onStatus } : {},
+    ...offline ? { offline } : {},
+    ...o.onOffline ? { onOffline: o.onOffline } : {}
   });
   await room.session.ready;
   return {