@ai-matrx/office 0.8.35 → 0.8.37

package/dist/univer-collab.d.cts

@@ -569,7 +569,7 @@ type SheetOp = SheetMutation[] | null;
  * The room's protocol (§6.4): Univer 1.0.4 + transformer `SHEET_TRANSFORMER_VERSION`. Any Univer or transformer
  * change raises it; a room at another proto opens read-only for this build.
  */
-declare const SHEETS_COLLAB_PROTO = 3;
+declare const SHEETS_COLLAB_PROTO = 4;
 /**
  * Every Sheets protocol this package still reads (the fold, the server): each proto's transforms are a superset of
  * the one before, so a room still at an older protocol folds here. Raising the proto appends, never replaces.

package/dist/univer-collab.d.ts

@@ -569,7 +569,7 @@ type SheetOp = SheetMutation[] | null;
  * The room's protocol (§6.4): Univer 1.0.4 + transformer `SHEET_TRANSFORMER_VERSION`. Any Univer or transformer
  * change raises it; a room at another proto opens read-only for this build.
  */
-declare const SHEETS_COLLAB_PROTO = 3;
+declare const SHEETS_COLLAB_PROTO = 4;
 /**
  * Every Sheets protocol this package still reads (the fold, the server): each proto's transforms are a superset of
  * the one before, so a room still at an older protocol folds here. Raising the proto appends, never replaces.

package/dist/univer-collab.js

@@ -1824,6 +1824,13 @@ var SHEET_MUTATIONS = {
   "data-validation.mutation.updateRule": covered("dv", "ruleId", "payload", "source", "derived"),
   "data-validation.mutation.removeRule": covered("dv", "ruleId", "source", "derived"),
   "sheet.mutation.set-filter-range": covered("filter", "range", "derived"),
+  // C5f: Univer's cell notes. Their transform is built (comment-anchor-transform.ts `transformCellNote`, pairwise and
+  // chained fuzz green) but the session fuzz still diverges on note cells (seed 1015, 6 seats: a note at column 5 on
+  // one seat, 8 on another), so they stay barriers until that seed is green. Covered form, for the next lane:
+  //   covered("note", "sheetId", "row", "col", "note" | "noteId", "newPosition", "silent", "derived")
+  "sheet.mutation.update-note": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
+  "sheet.mutation.remove-note": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
+  "sheet.mutation.update-note-position": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
   "sheet.mutation.set-filter-criteria": covered("filter", "col", "criteria", "reCalc", "derived"),
   "sheet.mutation.remove-filter": covered("filter", "derived"),
   "sheet.mutation.add-table": barrier("C5c", RESOURCE),
@@ -1836,9 +1843,6 @@ var SHEET_MUTATIONS = {
   "sheets.mutation.update-hyper-link": barrier("C5c", RESOURCE),
   "sheets.mutation.update-hyper-link-ref": barrier("C5c", RESOURCE),
   "sheets.mutation.update-rich-hyper-link": barrier("C5c", RESOURCE),
-  "sheet.mutation.update-note": barrier("C5c", RESOURCE),
-  "sheet.mutation.remove-note": barrier("C5c", RESOURCE),
-  "sheet.mutation.update-note-position": barrier("C5c", RESOURCE),
   "sheet.mutation.set-drawing-apply": barrier("C5c", RESOURCE),
   "sheet.mutation.set-worksheet-background-image": barrier("C5c", RESOURCE),
   "sheet.mutation.add-range-theme": barrier("C5c", RESOURCE),
@@ -2262,7 +2266,88 @@ var label = (m) => {
   const c = cellOf(m);
   return `${String(m.params.subUnitId ?? "")}!${c ? sheetCellName(c) : "?"} comment`;
 };
+var UPDATE_NOTE = "sheet.mutation.update-note";
+var REMOVE_NOTE = "sheet.mutation.remove-note";
+var UPDATE_NOTE_POSITION = "sheet.mutation.update-note-position";
+var NOTE_IDS = /* @__PURE__ */ new Set([UPDATE_NOTE, REMOVE_NOTE, UPDATE_NOTE_POSITION]);
+var isNoteMutation = (id) => NOTE_IDS.has(id);
+var cellAt = (row, col) => typeof row === "number" && typeof col === "number" ? { row, col } : null;
+function noteRef(m) {
+  const p = m.params;
+  const sheet = String(p.sheetId ?? "");
+  if (m.id === UPDATE_NOTE) return { role: "write", sheet, id: p.note?.id ? String(p.note.id) : null, cell: cellAt(p.row, p.col) };
+  if (m.id === UPDATE_NOTE_POSITION) return { role: "move", sheet, id: p.noteId ? String(p.noteId) : null, cell: cellAt(p.newPosition?.row, p.newPosition?.col) };
+  return { role: "remove", sheet, id: p.noteId ? String(p.noteId) : null, cell: p.noteId ? null : cellAt(p.row, p.col) };
+}
+var noteDerived = (m) => m.params.derived === true;
+var noteLabel = (n) => `${n.sheet}!${n.cell ? sheetCellName(n.cell) : "?"} note`;
+var tellNote = (m, n) => noteDerived(m) ? [] : [noteLabel(n)];
+var noteBarrier = (reason) => ({ barrier: true, reason: `note: ${reason}` });
+var removeNoteOf = (sheet, id) => ({ id: REMOVE_NOTE, params: { sheetId: sheet, noteId: id, derived: true } });
+var moveNoteTo = (sheet, id, cell) => ({
+  id: UPDATE_NOTE_POSITION,
+  params: { sheetId: sheet, noteId: id, newPosition: { row: cell.row, col: cell.col }, derived: true }
+});
+var onSheet = (m, sheet) => String(m.params.subUnitId ?? "") === sheet;
+function transformCellNote(x, y, side) {
+  const xn = isNoteMutation(x.id);
+  const yn = isNoteMutation(y.id);
+  if (!xn && !yn) return null;
+  if (!xn) {
+    const n2 = noteRef(y);
+    if (n2.role === "remove" || !n2.cell || !onSheet(x, n2.sheet)) return ok([x]);
+    if (x.id === REMOVE_SHEET) return n2.id ? ok([removeNoteOf(n2.sheet, n2.id), x]) : ok([x]);
+    if (!structuralAxisOp(x.id, x.params)) return ok([x]);
+    if (!n2.id) return noteBarrier("a note without an id against a row or column change");
+    const moved = moveSheetAnchorCell(n2.cell, n2.sheet, x.id, x.params);
+    if (!moved) return ok([x, removeNoteOf(n2.sheet, n2.id)]);
+    return moved === n2.cell ? ok([x]) : ok([x, moveNoteTo(n2.sheet, n2.id, moved)]);
+  }
+  const n = noteRef(x);
+  if (!yn) {
+    if (!onSheet(y, n.sheet)) return ok([x]);
+    if (y.id === REMOVE_SHEET) return ok([], [], tellNote(x, n));
+    if (!structuralAxisOp(y.id, y.params)) return ok([x]);
+    if (n.role === "write" && !n.id) return noteBarrier("a note without an id against a row or column change");
+    const p = x.params;
+    const from = cellAt(p.row, p.col);
+    const fromMoved = from ? moveSheetAnchorCell(from, n.sheet, y.id, y.params) : null;
+    if (n.role === "remove") {
+      if (n.id) return ok([x]);
+      return fromMoved ? ok([{ id: x.id, params: { ...p, row: fromMoved.row, col: fromMoved.col } }]) : ok([]);
+    }
+    const moved = n.cell ? moveSheetAnchorCell(n.cell, n.sheet, y.id, y.params) : null;
+    if (n.role === "write") {
+      if (!moved) return ok([], [], tellNote(x, n));
+      return ok([moved === n.cell ? x : { id: x.id, params: { ...p, row: moved.row, col: moved.col } }]);
+    }
+    if (!moved) return n.id ? ok([removeNoteOf(n.sheet, n.id)], [], tellNote(x, n)) : ok([], [], tellNote(x, n));
+    const params = { ...p, newPosition: { ...p.newPosition, row: moved.row, col: moved.col } };
+    if (fromMoved) Object.assign(params, { row: fromMoved.row, col: fromMoved.col });
+    return ok([{ id: x.id, params }]);
+  }
+  const m = noteRef(y);
+  if (n.sheet !== m.sheet) return ok([x]);
+  if (!n.id || !m.id) return noteBarrier("a note change addressed by cell against another note change on its sheet");
+  if (n.id !== m.id) {
+    const sameCell = n.cell && m.cell && n.cell.row === m.cell.row && n.cell.col === m.cell.col;
+    return sameCell ? noteBarrier("two notes written to one cell at once") : ok([x]);
+  }
+  if (n.role === "remove") return ok([x]);
+  if (m.role === "remove") return ok([], [], tellNote(x, n));
+  if (n.role === "write" && m.role === "move") {
+    return m.cell ? ok([{ id: x.id, params: { ...x.params, row: m.cell.row, col: m.cell.col } }]) : ok([x]);
+  }
+  if (n.role === "move" && m.role === "write") return ok([x]);
+  const dx = noteDerived(x);
+  const dy = noteDerived(y);
+  if (dx && dy) return ok([x]);
+  const xWins = dx !== dy ? !dx : side === "left";
+  return xWins ? ok([x], tellNote(y, m)) : ok([], [], tellNote(x, n));
+}
 function transformCommentAnchor(x, y, side) {
+  const note = transformCellNote(x, y, side);
+  if (note) return note;
   const xa = x.id === SET_SHEET_COMMENT_ANCHOR;
   const ya = y.id === SET_SHEET_COMMENT_ANCHOR;
   if (!xa && !ya) return null;
@@ -2383,7 +2468,7 @@ registerRangedResource({
 });
 
 // src/collab/sheets/transform/transform.ts
-var SHEET_TRANSFORMER_VERSION = "c5d-1";
+var SHEET_TRANSFORMER_VERSION = "c5f-1";
 var ID = {
   values: "sheet.mutation.set-range-values",
   insertRow: "sheet.mutation.insert-row",
@@ -2472,6 +2557,21 @@ function buildStructural(template, axis, op) {
   const start = op.kind === "insert" ? op.at : op.start;
   return { id: template.id, params: { ...p, range: { ...p.range, [a0]: start, [a1]: start + op.count - 1 } } };
 }
+function crossThrough(x, sy) {
+  const [a0, a1] = S(sy.axis);
+  const p = x.params;
+  const params = { ...p };
+  for (const k of ["range", "sourceRange", "targetRange"]) {
+    const r = p[k];
+    if (!r || typeof r[a0] !== "number" || typeof r[a1] !== "number") continue;
+    const spans = spanThrough(sy.op, r[a0], r[a1]);
+    if (!spans.length) continue;
+    const lo = r[a0] === 0 ? 0 : Math.min(...spans.map(([l]) => l));
+    const hi = Math.max(...spans.map(([, h]) => h));
+    params[k] = { ...r, [a0]: lo, [a1]: hi };
+  }
+  return { id: x.id, params };
+}
 function univerMutationInfo(axis, op) {
   const FULL2 = { startRow: 0, endRow: Number.MAX_SAFE_INTEGER, startColumn: 0, endColumn: Number.MAX_SAFE_INTEGER };
   const start = op.kind === "insert" ? op.at : op.start;
@@ -3195,7 +3295,7 @@ function annotateSheetOpsInOrder(group, sheetOrder) {
   let structural = false;
   return group.map((m0) => {
     if (structuralOf(m0)) structural = true;
-    const m = structural && rangedSpecOf(m0.id) && !isDerived(m0) ? { id: m0.id, params: { ...m0.params, derived: true } } : m0;
+    const m = structural && (rangedSpecOf(m0.id) || isNoteMutation(m0.id)) && !isDerived(m0) ? { id: m0.id, params: { ...m0.params, derived: true } } : m0;
     if (m.id === ID.insertSheet) {
       const index = typeof m.params.index === "number" ? Math.min(m.params.index, order.length) : order.length;
       order.splice(index, 0, sheetIdOf(m));
@@ -3442,7 +3542,7 @@ function transformMutation(x, y, side) {
   const np = numfmtPair(x, y, side, sx, sy);
   if (np) return np;
   if (sx && sy) {
-    if (sx.axis !== sy.axis) return ok2([x]);
+    if (sx.axis !== sy.axis) return ok2([crossThrough(x, sy)]);
     const out = transformAxis(sx.op, sy.op, side);
     if (!out) return barrier2(`${x.id} over ${y.id}: moved blocks overlap in part, or the block would split`);
     const dropped = out.length === 0 && sx.op.kind === "move" ? [`${sheetOf(x)}: moved ${sx.axis}s`] : [];
@@ -3664,8 +3764,8 @@ async function sheetsStateHash(snapshot) {
 }
 
 // src/univer/collab/sheets-ot/room.ts
-var SHEETS_COLLAB_PROTO = 3;
-var SHEETS_READABLE_PROTOS = [2, SHEETS_COLLAB_PROTO];
+var SHEETS_COLLAB_PROTO = 4;
+var SHEETS_READABLE_PROTOS = [2, 3, SHEETS_COLLAB_PROTO];
 var SHEETS_EDIT_GROUP = "sheets.edit";
 var flip2 = (side) => side === "left" ? "right" : "left";
 var isNoopSheetOp = (op) => op == null || op.length === 0;