@ai-matrx/office 0.8.16 → 0.8.17

package/CHANGELOG.md

@@ -1,10 +1,36 @@
 # Changelog
 
-## 0.8.16
+## 0.8.17
 
 UNVERIFIED: this release has no Unreleased entry and the source comparison could not be made (the caller supplied no source comparison). Whether source changed is unknown; consumer action is unknown.
 Check the package's gitHead on npm against this version's gitHead: `git diff <previous gitHead> <this gitHead> -- apps/shared/office/src`.
 
+## 0.8.16
+
+SOURCE CHANGED WITH NO RELEASE NOTE. This release shipped source changes that nobody described in an Unreleased entry,
+so they may include breaking API changes. Consumer action is UNKNOWN: read the diff before upgrading.
+Diff: `git diff 50c68fc222 f8e2208b71 -- apps/shared/office/src`
+
+Changed shipped source files (2):
+- `apps/shared/office/src/docs/remote-carets.ts`
+- `apps/shared/office/src/univer/collab/sheets-ot/univer-port.ts`
+
+## 0.8.15
+
+SOURCE CHANGED WITH NO RELEASE NOTE. This release shipped source changes that nobody described in an Unreleased entry,
+so they may include breaking API changes. Consumer action is UNKNOWN: read the diff before upgrading.
+Diff: `git diff 6d605b00d1 50c68fc222 -- apps/shared/office/src`
+
+Changed shipped source files (8):
+- `apps/shared/office/src/collab/sheets/transform/fuzz/seats.ts`
+- `apps/shared/office/src/collab/sheets/transform/fuzz/state-hash.ts`
+- `apps/shared/office/src/sheets/workbook-ot-room.ts`
+- `apps/shared/office/src/univer/collab/index.ts`
+- `apps/shared/office/src/univer/collab/sheets-ot/index.ts`
+- `apps/shared/office/src/univer/collab/sheets-ot/room.ts`
+- `apps/shared/office/src/univer/collab/sheets-ot/state-hash.ts`
+- `apps/shared/office/src/univer/collab/sheets-ot/univer-port.ts`
+
 ## 0.8.14
 
 - **`/collab/sheets-transform` covers formulas (C5b; still inert, no consumer).** A formula typed on one seat now has its references rewritten by a concurrent row/column insert, removal or move and by a concurrent sheet rename, in both commit orders, exactly as Univer's own `@univerjs/sheets-formula` interceptor rewrites them: A1 references, ranges, absolute and mixed markers, whole rows and columns, cross-sheet references, references into a removed range (`#REF!`), array formulas (`ref` range moves; dynamic arrays are plain formulas). Defined names (`formula.mutation.set-defined-name` / `remove-defined-name`) are covered: their ranges follow structural edits and renames, a renamed name is renamed inside concurrent formulas, a removed one becomes `#REF!`. A rewrite a structural op carries for formulas that already existed (`derived`) never outranks a person's concurrent write to the same cell or name. Shared formulas (`si`) stay barriers (the failing case is in `sheet-formula-hard-cases.test.ts`). Rewrites match real sheets-formula 1.0.4 on 476 oracle cases (`fixtures/sheets-formula-oracle.json`, made by `spikes/c5b-probe/oracle.mjs`). Pairwise TP1 fuzz: 20 families (210 pairs) at 4,000 seeds each, both orders, 0 divergences, 0 throws. New exports: `annotateFormulas`, `forApply`, `SIDE_CAR_PARAMS`, `rewriteFormula`, `formulaBarrier`, `isFormulaText`, `refSheetsFor`, `refSheetsAfter`, `REF_ERROR` and the `RefChange`/`RefSheets`/`FormulaCtx` types. `CONTENT_KEYS` gains `ref`, `xf`, `ft`, `fd`; `SHEET_TRANSFORMER_VERSION` is `c5b-1`. `@univerjs/engine-formula` moves from devDependencies to dependencies (the lexer runs in shipped code). Consumer action: none (nothing imports this section yet). For C6: capture must call `annotateFormulas` on each group (sheet id → name, defined-name id → name, read before the command) and apply through `forApply`; the canonical sheet hash must sort the defined-names resource by id.
@@ -17,6 +43,8 @@ Check the package's gitHead on npm against this version's gitHead: `git diff <pr
 
 ### Unreleased
 
+- **Sheets co-editing on the ordered log (C6).** `@ai-matrx/office/univer/collab` adds the Sheets room: `openSheetsOtRoom` (the C2 session over the C5a/C5b group transform, saves at a quiet point with a matching hash, restore through `collab_replace`, undo items rebased over every remote op), `univerSheetsOtPort` (capture: onlyLocal/fromCollab filtered, grouped by outermost command with a try/finally depth guard on both execute paths, params allowlist, completeCellContent, exact merge removals, style objects never ids, whole-style overrides restated as merges, annotateFormulas, inverses from the applied params against a pre-state copy; a barrier or unknown id is `not_shared` and rolls the seat back), `sheetsStateHash` / `canonicalSheet` (merges as a set, defined names by id; the transform fuzz now hashes through it), and `startWorkbookOtRoom` / `workbookUsesOrderedRoom` (the `udt_workbook_snapshots` store, the C1 doors, presence). A remote row/column insert, remove or move carries this seat's selection along and never leaves it past the sheet's edge (the port's `selections` option; a stale whole-row selection after a peer's column delete crashed the editor in the live run). Flip is per room exactly like Docs. Consumer action: matrx-frontend's WorkbookEditor opens it when the workbook's room exists or `collab.ot_rooms` says so (shipped with this release); every other consumer: none.
+
 - **`Workbook` and `DocumentRow` carry `test_expires_at` / `test_run_id`** — the `workbench.udt_workbooks` / `udt_documents` rows gained these test-fixture columns; the hand-written types now match the generated row again (matrx-frontend `features/data-tables/office-types-agree.ts`). Consumer action: none (a literal building one of these rows must add the two fields, `null` for real records).
 
 ## 0.8.13

package/dist/univer-collab.cjs

@@ -57,6 +57,7 @@ __export(collab_exports, {
   invertDocsOp: () => invertDocsOp,
   isCellEditorScratch: () => isCellEditorScratch,
   isNoopDocsOp: () => isNoopDocsOp,
+  moveSelectionsThrough: () => moveSelectionsThrough,
   normalizeDocsOp: () => normalizeDocsOp,
   openDocsOtRoom: () => openDocsOtRoom,
   openSheetsOtRoom: () => openSheetsOtRoom,
@@ -3303,12 +3304,30 @@ function univerSheetsOtPort(o) {
     }
     if (lone && tracker.stack.length === 0) settle();
   });
+  const followSelection = (m) => {
+    const sel = o.selections;
+    if (!sel || !axisOpOf(m)) return;
+    try {
+      const sheet = String(m.params.subUnitId ?? "");
+      if (sel.sheetId() !== sheet) return;
+      const ws = o.workbook()?.getSheetBySheetId(sheet);
+      const current = sel.get();
+      if (!ws || !current?.length) return;
+      const rows = ws.getMaxRows?.() ?? Number.MAX_SAFE_INTEGER;
+      const cols = ws.getMaxColumns?.() ?? Number.MAX_SAFE_INTEGER;
+      sel.set(moveSelectionsThrough(json(current), m, rows, cols));
+    } catch (err) {
+      console.warn("[sheets-ot] could not move this seat's selection past a collaborator's row or column change", err);
+    }
+  };
   return {
     onLocal(listener) {
       listeners.add(listener);
       return () => void listeners.delete(listener);
     },
     busy: () => tracker.stack.length > 0 || group !== null,
+    /** 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();
       else idle.push(fn);
@@ -3324,6 +3343,7 @@ function univerSheetsOtPort(o) {
       } finally {
         applying = false;
       }
+      followSelection(m);
     },
     snapshot() {
       const wb = o.workbook();
@@ -3361,6 +3381,68 @@ function fullContent(cell) {
   if (out.v === null) delete out.t;
   return out;
 }
+function axisOpOf(m) {
+  const p = m.params;
+  const span = (r, axis) => axis === "row" ? [r.startRow, r.endRow - r.startRow + 1] : [r.startColumn, r.endColumn - r.startColumn + 1];
+  switch (m.id) {
+    case "sheet.mutation.insert-row": {
+      const [at, count] = span(p.range, "row");
+      return { axis: "row", op: { kind: "insert", at, count } };
+    }
+    case "sheet.mutation.insert-col": {
+      const [at, count] = span(p.range, "col");
+      return { axis: "col", op: { kind: "insert", at, count } };
+    }
+    case "sheet.mutation.remove-rows": {
+      const [start, count] = span(p.range, "row");
+      return { axis: "row", op: { kind: "remove", start, count } };
+    }
+    case "sheet.mutation.remove-col": {
+      const [start, count] = span(p.range, "col");
+      return { axis: "col", op: { kind: "remove", start, count } };
+    }
+    case "sheet.mutation.move-rows": {
+      const [from, count] = span(p.sourceRange, "row");
+      return { axis: "row", op: { kind: "move", from, count, to: p.targetRange.startRow } };
+    }
+    case "sheet.mutation.move-columns": {
+      const [from, count] = span(p.sourceRange, "col");
+      return { axis: "col", op: { kind: "move", from, count, to: p.targetRange.startColumn } };
+    }
+    default:
+      return null;
+  }
+}
+function moveSelectionsThrough(selections, m, maxRows, maxCols) {
+  const a = axisOpOf(m);
+  const clamp = (v, max) => Math.max(0, Math.min(v, Math.max(0, max - 1)));
+  const through = (i, axis) => {
+    if (typeof i !== "number") return i;
+    let next = i;
+    if (a && a.axis === axis) {
+      const mapped = mapIndex(a.op, i);
+      next = mapped ?? (a.op.kind === "remove" ? a.op.start : i);
+    }
+    return clamp(next, axis === "row" ? maxRows : maxCols);
+  };
+  const box = (r, rangeType) => {
+    const out = { ...r };
+    for (const k of ["startRow", "endRow", "actualRow"]) if (k in out) out[k] = through(out[k], "row");
+    for (const k of ["startColumn", "endColumn", "actualColumn"]) if (k in out) out[k] = through(out[k], "col");
+    if (typeof out.startRow === "number" && typeof out.endRow === "number" && out.endRow < out.startRow) out.endRow = out.startRow;
+    if (typeof out.startColumn === "number" && typeof out.endColumn === "number" && out.endColumn < out.startColumn) out.endColumn = out.startColumn;
+    if (rangeType === 1 || rangeType === 3) {
+      out.startColumn = 0;
+      out.endColumn = Math.max(0, maxCols - 1);
+    }
+    if (rangeType === 2 || rangeType === 3) {
+      out.startRow = 0;
+      out.endRow = Math.max(0, maxRows - 1);
+    }
+    return out;
+  };
+  return selections.map((s) => ({ ...s, range: box(s.range, s.range.rangeType), ...s.primary ? { primary: box(s.primary) } : {} }));
+}
 
 // src/sheets/workbook-ot-room.ts
 var Y3 = __toESM(require("yjs"), 1);