@ai-matrx/office 0.8.37 → 0.8.38

package/CHANGELOG.md

@@ -1,9 +1,22 @@
 # Changelog
 
+## 0.8.38
+
+**Undo and redo never touch other people's text in a co-edited document.** The room rebased both sides of every
+undo item (and every mutation of a batched item) against the same collaborator edit, so undo → a peer types →
+redo → undo deleted the peer's letters on every seat. Each side now meets the edit in the order it applies, each
+mutation in turn, and Univer's still-open typing burst is stacked before a collaborator's edit applies
+(`DocumentViewPort.docHistory`, new and optional). Consumer action: pass `docHistory` (the view's
+`DocStateChangeManagerService`) from the editor that attaches a view.
+
 ## 0.8.37
 
-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`.
+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 1700d8bdd6 c1e46e1043 -- apps/shared/office/src`
+
+Changed shipped source files (1):
+- `apps/shared/office/src/collab/sheets/transform/registry.ts`
 
 ## 0.8.36
 

package/dist/docs.cjs

@@ -291,15 +291,15 @@ var DocumentModel = (_class = class {
     return editor;
   }
   onViewMutation(viewId, info, options) {
-    if (this.relaying || _optionalChain([options, 'optionalAccess', _19 => _19.fromCollab]) || _optionalChain([options, 'optionalAccess', _20 => _20.fromChangeset])) return;
+    if (this.relaying || _optionalChain([options, 'optionalAccess', _23 => _23.fromCollab]) || _optionalChain([options, 'optionalAccess', _24 => _24.fromChangeset])) return;
     const view = this.views.get(viewId);
     if (!view) return;
     const editable = view.port.editable();
-    if (!editable && !(_optionalChain([view, 'access', _21 => _21.port, 'access', _22 => _22.commentOnly, 'optionalCall', _23 => _23()]) === true && isCommentAnchorMutation(info))) return;
+    if (!editable && !(_optionalChain([view, 'access', _25 => _25.port, 'access', _26 => _26.commentOnly, 'optionalCall', _27 => _27()]) === true && isCommentAnchorMutation(info))) return;
     this.lastEditedView = viewId;
     this.relay(info, viewId);
     for (const listener of this.collabListeners) listener(info, options);
-    if (this.otListeners.size && !_optionalChain([options, 'optionalAccess', _24 => _24.onlyLocal])) {
+    if (this.otListeners.size && !_optionalChain([options, 'optionalAccess', _28 => _28.onlyLocal])) {
       const m = {
         id: info.id,
         params: info.params,
@@ -359,7 +359,7 @@ var DocumentModel = (_class = class {
   /** The unit id a view's document has (what a replayed mutation must be addressed to). */
   unitIdOf(view) {
     try {
-      return _nullishCoalesce(_nullishCoalesce(_optionalChain([view, 'access', _25 => _25.port, 'access', _26 => _26.unitId, 'optionalCall', _27 => _27()]), () => ( _optionalChain([view, 'access', _28 => _28.port, 'access', _29 => _29.snapshot, 'call', _30 => _30(), 'optionalAccess', _31 => _31.id]))), () => ( null));
+      return _nullishCoalesce(_nullishCoalesce(_optionalChain([view, 'access', _29 => _29.port, 'access', _30 => _30.unitId, 'optionalCall', _31 => _31()]), () => ( _optionalChain([view, 'access', _32 => _32.port, 'access', _33 => _33.snapshot, 'call', _34 => _34(), 'optionalAccess', _35 => _35.id]))), () => ( null));
     } catch (e6) {
       return null;
     }
@@ -393,7 +393,7 @@ var DocumentModel = (_class = class {
   /** A view could not follow an edit: say so, then show the saved version (unless this tab has unsaved edits of its own). */
   applyFailed(mutationId, error) {
     try {
-      _optionalChain([this, 'access', _32 => _32.deps, 'access', _33 => _33.onApplyFailed, 'optionalCall', _34 => _34(this.documentId, mutationId, error)]);
+      _optionalChain([this, 'access', _36 => _36.deps, 'access', _37 => _37.onApplyFailed, 'optionalCall', _38 => _38(this.documentId, mutationId, error)]);
     } catch (notifyError) {
       console.warn(`[document-model] the notice for ${this.documentId}'s failed apply also failed`, notifyError);
     }
@@ -421,7 +421,7 @@ var DocumentModel = (_class = class {
   async write(reason) {
     if (this.ot) {
       const wrote = await this.ot.write(reason);
-      if (wrote) _optionalChain([this, 'access', _35 => _35.deps, 'access', _36 => _36.onSaved, 'optionalCall', _37 => _37(this.documentId, reason === "manual" ? "manual" : "autosave")]);
+      if (wrote) _optionalChain([this, 'access', _39 => _39.deps, 'access', _40 => _40.onSaved, 'optionalCall', _41 => _41(this.documentId, reason === "manual" ? "manual" : "autosave")]);
       return wrote;
     }
     const snapshot = this.latest();
@@ -446,7 +446,7 @@ var DocumentModel = (_class = class {
       this.saving = false;
     }
     if (this.views.size === 0) this.stored = snapshot;
-    _optionalChain([this, 'access', _38 => _38.deps, 'access', _39 => _39.onSaved, 'optionalCall', _40 => _40(this.documentId, origin)]);
+    _optionalChain([this, 'access', _42 => _42.deps, 'access', _43 => _43.onSaved, 'optionalCall', _44 => _44(this.documentId, origin)]);
     return true;
   }
   hasUnsaved() {
@@ -489,7 +489,7 @@ var DocumentModel = (_class = class {
   replaceContent(row) {
     if (this.ot) return this.ot.replace(row.snapshot);
     this.show(row);
-    _optionalChain([this, 'access', _41 => _41.collab, 'optionalAccess', _42 => _42.announceReplaced, 'call', _43 => _43(row.id)]);
+    _optionalChain([this, 'access', _45 => _45.collab, 'optionalAccess', _46 => _46.announceReplaced, 'call', _47 => _47(row.id)]);
   }
   /** A peer replaced the document: show the newest save (once). */
   async onPeerReplaced() {
@@ -512,7 +512,7 @@ var DocumentModel = (_class = class {
     this.relaying = true;
     try {
       for (const view of this.views.values()) view.port.remount(snapshot);
-      _optionalChain([this, 'access', _44 => _44.parked, 'optionalAccess', _45 => _45.remount, 'call', _46 => _46(snapshot)]);
+      _optionalChain([this, 'access', _48 => _48.parked, 'optionalAccess', _49 => _49.remount, 'call', _50 => _50(snapshot)]);
     } finally {
       this.relaying = false;
     }
@@ -586,7 +586,7 @@ var DocumentModel = (_class = class {
           const input = Array.isArray(params.actions) ? params.actions.length : 0;
           let sel = null;
           try {
-            sel = _nullishCoalesce(_optionalChain([view, 'access', _47 => _47.port, 'access', _48 => _48.selection, 'optionalAccess', _49 => _49.get, 'call', _50 => _50()]), () => ( null));
+            sel = _nullishCoalesce(_optionalChain([view, 'access', _51 => _51.port, 'access', _52 => _52.selection, 'optionalAccess', _53 => _53.get, 'call', _54 => _54()]), () => ( null));
           } catch (e7) {
             sel = null;
           }
@@ -597,7 +597,7 @@ var DocumentModel = (_class = class {
           const moved = sel && sel.length && sel.every((r) => !r.segmentId) ? moveRangesThroughBodyEdit(sel, params.actions) : null;
           if (moved) {
             try {
-              _optionalChain([view, 'access', _51 => _51.port, 'access', _52 => _52.selection, 'optionalAccess', _53 => _53.set, 'call', _54 => _54(moved)]);
+              _optionalChain([view, 'access', _55 => _55.port, 'access', _56 => _56.selection, 'optionalAccess', _57 => _57.set, 'call', _58 => _58(moved)]);
             } catch (error) {
               console.warn(`[document-model] could not move this view's caret past a collaborator's edit`, error);
             }
@@ -616,7 +616,7 @@ var DocumentModel = (_class = class {
       this.relaying = true;
       try {
         for (const view of this.views.values()) view.port.remount(s2);
-        _optionalChain([this, 'access', _55 => _55.parked, 'optionalAccess', _56 => _56.remount, 'call', _57 => _57(s2)]);
+        _optionalChain([this, 'access', _59 => _59.parked, 'optionalAccess', _60 => _60.remount, 'call', _61 => _61(s2)]);
       } finally {
         this.relaying = false;
       }
@@ -625,8 +625,20 @@ var DocumentModel = (_class = class {
       const out = [];
       for (const view of this.views.values()) {
         const unitId = this.unitIdOf(view);
-        const service = _optionalChain([view, 'access', _58 => _58.port, 'access', _59 => _59.undoRedo, 'optionalCall', _60 => _60()]);
-        if (unitId && service) out.push({ service, unitId });
+        const service = _optionalChain([view, 'access', _62 => _62.port, 'access', _63 => _63.undoRedo, 'optionalCall', _64 => _64()]);
+        if (!unitId || !service) continue;
+        const port = view.port;
+        out.push({
+          service,
+          unitId,
+          flushHistory: () => {
+            try {
+              _optionalChain([port, 'access', _65 => _65.docHistory, 'optionalCall', _66 => _66(), 'optionalAccess', _67 => _67.flushPendingChanges, 'call', _68 => _68(unitId)]);
+            } catch (error) {
+              console.warn(`[document-model] could not close this view's typing burst before a collaborator's edit`, error);
+            }
+          }
+        });
       }
       return out;
     },
@@ -634,7 +646,7 @@ var DocumentModel = (_class = class {
     selection: () => {
       for (const view of this.views.values()) {
         try {
-          const sel = _optionalChain([view, 'access', _61 => _61.port, 'access', _62 => _62.selection, 'optionalAccess', _63 => _63.get, 'call', _64 => _64()]);
+          const sel = _optionalChain([view, 'access', _69 => _69.port, 'access', _70 => _70.selection, 'optionalAccess', _71 => _71.get, 'call', _72 => _72()]);
           if (sel) return sel;
         } catch (e8) {
         }
@@ -693,9 +705,9 @@ var DocumentModel = (_class = class {
    * so a collaborator's save still reaches the body a returning view boots from.
    */
   rest() {
-    _optionalChain([this, 'access', _65 => _65.collab, 'optionalAccess', _66 => _66.stop, 'call', _67 => _67()]);
+    _optionalChain([this, 'access', _73 => _73.collab, 'optionalAccess', _74 => _74.stop, 'call', _75 => _75()]);
     this.collab = null;
-    _optionalChain([this, 'access', _68 => _68.ot, 'optionalAccess', _69 => _69.stop, 'call', _70 => _70()]);
+    _optionalChain([this, 'access', _76 => _76.ot, 'optionalAccess', _77 => _77.stop, 'call', _78 => _78()]);
     this.ot = null;
     this.awareness = null;
   }
@@ -711,9 +723,9 @@ var DocumentModel = (_class = class {
         console.warn(`[document-model] could not dispose ${this.documentId}'s kept editor`, error);
       }
     }
-    _optionalChain([this, 'access', _71 => _71.realtimeClose, 'optionalCall', _72 => _72()]);
+    _optionalChain([this, 'access', _79 => _79.realtimeClose, 'optionalCall', _80 => _80()]);
     this.realtimeClose = null;
-    _optionalChain([this, 'access', _73 => _73.pageClose, 'optionalCall', _74 => _74()]);
+    _optionalChain([this, 'access', _81 => _81.pageClose, 'optionalCall', _82 => _82()]);
     this.pageClose = null;
   }
 }, _class);
@@ -991,12 +1003,12 @@ function movePeerRangesThroughBodyEdit(ranges, actions) {
 }
 var sameRanges = (a, b) => a.length === b.length && a.every((r, i) => r.start === b[i].start && r.end === b[i].end);
 function readCaret(raw) {
-  const c = _optionalChain([raw, 'optionalAccess', _75 => _75.caret]);
+  const c = _optionalChain([raw, 'optionalAccess', _83 => _83.caret]);
   if (!c || !Array.isArray(c.ranges) || typeof c.at !== "number") return null;
   const ranges = [];
   for (const r of c.ranges.slice(0, CARET_MAX_RANGES)) {
-    const s2 = _optionalChain([r, 'optionalAccess', _76 => _76.start]);
-    const e2 = _optionalChain([r, 'optionalAccess', _77 => _77.end]);
+    const s2 = _optionalChain([r, 'optionalAccess', _84 => _84.start]);
+    const e2 = _optionalChain([r, 'optionalAccess', _85 => _85.end]);
     if (typeof s2 !== "number" || typeof e2 !== "number" || !Number.isFinite(s2) || !Number.isFinite(e2) || s2 < 0 || e2 < 0) return null;
     ranges.push({ start: s2, end: e2 });
   }