@ai-matrx/office 0.8.9 → 0.8.11

package/CHANGELOG.md

@@ -1,13 +1,33 @@
 # Changelog
 
+## 0.8.11
+
+- Docs co-editing (C3): a collaborator's edit now moves this seat's caret with the characters (§6.8). The view port gains an optional `selection { get, set }`; `DocumentModel` moves body ranges through each applied remote edit (`moveRangesThroughBodyEdit`). Found in the live two-browser run: with the caret left at its old offset, the next keystrokes landed scattered. Consumer action: pass `selection` from Univer's `DocSelectionManagerService` in the view port.
+
 ### Unreleased
 
 - **`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.9
 
-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 14c15decf1 1c52fd1b8c -- apps/shared/office/src`
+
+Changed shipped source files (14):
+- `apps/shared/office/src/collab/sheets/transform/fuzz/seats.ts`
+- `apps/shared/office/src/collab/sheets/transform/transform.ts`
+- `apps/shared/office/src/core/document-page-style.ts`
+- `apps/shared/office/src/core/page-setup-apply.ts`
+- `apps/shared/office/src/docs/doc-edit-ops.ts`
+- `apps/shared/office/src/docs/doc-tools-core.ts`
+- `apps/shared/office/src/docs/document-write-validation.ts`
+- `apps/shared/office/src/sheets/import-workbook-file.ts`
+- `apps/shared/office/src/sheets/snapshot-grid.ts`
+- `apps/shared/office/src/sheets/xlsx-shared.ts`
+- `apps/shared/office/src/univer/collab/docs-ot/state-hash.ts`
+- `apps/shared/office/src/univer/collab/docs-ot/transform.ts`
+- ...and 2 more
 
 ## 0.8.8
 

package/dist/docs.cjs

@@ -22,6 +22,9 @@ var _chunkHX5TXQIXcjs = require('./chunk-HX5TXQIX.cjs');
 var _chunkNSU6EVJKcjs = require('./chunk-NSU6EVJK.cjs');
 require('./chunk-XAIKXHHJ.cjs');
 
+// src/docs/document-model.ts
+var _core = require('@univerjs/core');
+
 // src/univer/isSnapshotMutation.ts
 var MUTATION = 2;
 var NON_CONTENT_ID_PATTERN = /(scroll|selection|set-selections|viewport|zoom|hover|cursor|focus|activate)/i;
@@ -188,13 +191,13 @@ var DocumentModel = (_class = class {
     return editor;
   }
   onViewMutation(viewId, info, options) {
-    if (this.relaying || _optionalChain([options, 'optionalAccess', _7 => _7.fromCollab]) || _optionalChain([options, 'optionalAccess', _8 => _8.fromChangeset])) return;
+    if (this.relaying || _optionalChain([options, 'optionalAccess', _15 => _15.fromCollab]) || _optionalChain([options, 'optionalAccess', _16 => _16.fromChangeset])) return;
     const view = this.views.get(viewId);
     if (!view || !view.port.editable()) return;
     this.lastEditedView = viewId;
     this.relay(info, viewId);
     for (const listener of this.collabListeners) listener(info, options);
-    if (this.otListeners.size && !_optionalChain([options, 'optionalAccess', _9 => _9.onlyLocal])) {
+    if (this.otListeners.size && !_optionalChain([options, 'optionalAccess', _17 => _17.onlyLocal])) {
       const m = {
         id: info.id,
         params: info.params,
@@ -223,7 +226,7 @@ var DocumentModel = (_class = class {
         try {
           const snap = view.port.snapshot();
           view.pre = snap ? structuredClone(snap) : null;
-        } catch (e3) {
+        } catch (e4) {
           view.pre = null;
         }
       }
@@ -254,8 +257,8 @@ 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', _10 => _10.port, 'access', _11 => _11.unitId, 'optionalCall', _12 => _12()]), () => ( _optionalChain([view, 'access', _13 => _13.port, 'access', _14 => _14.snapshot, 'call', _15 => _15(), 'optionalAccess', _16 => _16.id]))), () => ( null));
-    } catch (e4) {
+      return _nullishCoalesce(_nullishCoalesce(_optionalChain([view, 'access', _18 => _18.port, 'access', _19 => _19.unitId, 'optionalCall', _20 => _20()]), () => ( _optionalChain([view, 'access', _21 => _21.port, 'access', _22 => _22.snapshot, 'call', _23 => _23(), 'optionalAccess', _24 => _24.id]))), () => ( null));
+    } catch (e5) {
       return null;
     }
   }
@@ -288,7 +291,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', _17 => _17.deps, 'access', _18 => _18.onApplyFailed, 'optionalCall', _19 => _19(this.documentId, mutationId, error)]);
+      _optionalChain([this, 'access', _25 => _25.deps, 'access', _26 => _26.onApplyFailed, 'optionalCall', _27 => _27(this.documentId, mutationId, error)]);
     } catch (notifyError) {
       console.warn(`[document-model] the notice for ${this.documentId}'s failed apply also failed`, notifyError);
     }
@@ -316,7 +319,7 @@ var DocumentModel = (_class = class {
   async write(reason) {
     if (this.ot) {
       const wrote = await this.ot.write(reason);
-      if (wrote) _optionalChain([this, 'access', _20 => _20.deps, 'access', _21 => _21.onSaved, 'optionalCall', _22 => _22(this.documentId, reason === "manual" ? "manual" : "autosave")]);
+      if (wrote) _optionalChain([this, 'access', _28 => _28.deps, 'access', _29 => _29.onSaved, 'optionalCall', _30 => _30(this.documentId, reason === "manual" ? "manual" : "autosave")]);
       return wrote;
     }
     const snapshot = this.latest();
@@ -341,7 +344,7 @@ var DocumentModel = (_class = class {
       this.saving = false;
     }
     if (this.views.size === 0) this.stored = snapshot;
-    _optionalChain([this, 'access', _23 => _23.deps, 'access', _24 => _24.onSaved, 'optionalCall', _25 => _25(this.documentId, origin)]);
+    _optionalChain([this, 'access', _31 => _31.deps, 'access', _32 => _32.onSaved, 'optionalCall', _33 => _33(this.documentId, origin)]);
     return true;
   }
   hasUnsaved() {
@@ -384,7 +387,7 @@ var DocumentModel = (_class = class {
   replaceContent(row) {
     if (this.ot) return this.ot.replace(row.snapshot);
     this.show(row);
-    _optionalChain([this, 'access', _26 => _26.collab, 'optionalAccess', _27 => _27.announceReplaced, 'call', _28 => _28(row.id)]);
+    _optionalChain([this, 'access', _34 => _34.collab, 'optionalAccess', _35 => _35.announceReplaced, 'call', _36 => _36(row.id)]);
   }
   /** A peer replaced the document: show the newest save (once). */
   async onPeerReplaced() {
@@ -407,7 +410,7 @@ var DocumentModel = (_class = class {
     this.relaying = true;
     try {
       for (const view of this.views.values()) view.port.remount(snapshot);
-      _optionalChain([this, 'access', _29 => _29.parked, 'optionalAccess', _30 => _30.remount, 'call', _31 => _31(snapshot)]);
+      _optionalChain([this, 'access', _37 => _37.parked, 'optionalAccess', _38 => _38.remount, 'call', _39 => _39(snapshot)]);
     } finally {
       this.relaying = false;
     }
@@ -479,10 +482,24 @@ var DocumentModel = (_class = class {
         for (const view of this.views.values()) {
           const unitId = this.unitIdOf(view);
           const input = Array.isArray(params.actions) ? params.actions.length : 0;
+          let sel = null;
+          try {
+            sel = _nullishCoalesce(_optionalChain([view, 'access', _40 => _40.port, 'access', _41 => _41.selection, 'optionalAccess', _42 => _42.get, 'call', _43 => _43()]), () => ( null));
+          } catch (e6) {
+            sel = null;
+          }
           const p = { ...params, ...unitId ? { unitId } : {}, textRanges: null, noNeedSetTextRange: true };
           const ok = view.port.commandService.syncExecuteCommand(id, p, { onlyLocal: true, fromCollab: true });
           if (ok === false) throw new Error(`"${id}" was refused by the editor`);
           if (input > 0 && Array.isArray(p.actions) && p.actions.length === 0) throw new Error(`"${id}" was emptied by the editor`);
+          const moved = sel && sel.length && sel.every((r) => !r.segmentId) ? moveRangesThroughBodyEdit(sel, params.actions) : null;
+          if (moved) {
+            try {
+              _optionalChain([view, 'access', _44 => _44.port, 'access', _45 => _45.selection, 'optionalAccess', _46 => _46.set, 'call', _47 => _47(moved)]);
+            } catch (error) {
+              console.warn(`[document-model] could not move this view's caret past a collaborator's edit`, error);
+            }
+          }
         }
       } finally {
         this.relaying = false;
@@ -497,7 +514,7 @@ var DocumentModel = (_class = class {
       this.relaying = true;
       try {
         for (const view of this.views.values()) view.port.remount(s2);
-        _optionalChain([this, 'access', _32 => _32.parked, 'optionalAccess', _33 => _33.remount, 'call', _34 => _34(s2)]);
+        _optionalChain([this, 'access', _48 => _48.parked, 'optionalAccess', _49 => _49.remount, 'call', _50 => _50(s2)]);
       } finally {
         this.relaying = false;
       }
@@ -506,7 +523,7 @@ var DocumentModel = (_class = class {
       const out = [];
       for (const view of this.views.values()) {
         const unitId = this.unitIdOf(view);
-        const service = _optionalChain([view, 'access', _35 => _35.port, 'access', _36 => _36.undoRedo, 'optionalCall', _37 => _37()]);
+        const service = _optionalChain([view, 'access', _51 => _51.port, 'access', _52 => _52.undoRedo, 'optionalCall', _53 => _53()]);
         if (unitId && service) out.push({ service, unitId });
       }
       return out;
@@ -564,9 +581,9 @@ var DocumentModel = (_class = class {
    * so a collaborator's save still reaches the body a returning view boots from.
    */
   rest() {
-    _optionalChain([this, 'access', _38 => _38.collab, 'optionalAccess', _39 => _39.stop, 'call', _40 => _40()]);
+    _optionalChain([this, 'access', _54 => _54.collab, 'optionalAccess', _55 => _55.stop, 'call', _56 => _56()]);
     this.collab = null;
-    _optionalChain([this, 'access', _41 => _41.ot, 'optionalAccess', _42 => _42.stop, 'call', _43 => _43()]);
+    _optionalChain([this, 'access', _57 => _57.ot, 'optionalAccess', _58 => _58.stop, 'call', _59 => _59()]);
     this.ot = null;
     this.awareness = null;
   }
@@ -582,12 +599,20 @@ var DocumentModel = (_class = class {
         console.warn(`[document-model] could not dispose ${this.documentId}'s kept editor`, error);
       }
     }
-    _optionalChain([this, 'access', _44 => _44.realtimeClose, 'optionalCall', _45 => _45()]);
+    _optionalChain([this, 'access', _60 => _60.realtimeClose, 'optionalCall', _61 => _61()]);
     this.realtimeClose = null;
-    _optionalChain([this, 'access', _46 => _46.pageClose, 'optionalCall', _47 => _47()]);
+    _optionalChain([this, 'access', _62 => _62.pageClose, 'optionalCall', _63 => _63()]);
     this.pageClose = null;
   }
 }, _class);
+function moveRangesThroughBodyEdit(ranges, actions) {
+  const a = actions;
+  if (!Array.isArray(a) || a[0] !== "body") return null;
+  const sub = a[1];
+  if (!sub || sub.et !== "text-x" || !Array.isArray(sub.e)) return null;
+  const e2 = sub.e;
+  return ranges.map((r) => ({ startOffset: _core.TextX.transformPosition(e2, r.startOffset, false), endOffset: _core.TextX.transformPosition(e2, r.endOffset, false) }));
+}
 function contentFingerprint(snapshot) {
   const { id: _id, rev: _rev, ...content } = snapshot;
   return JSON.stringify(content);
@@ -860,5 +885,6 @@ function documentBodyWriteHandler(deps) {
 
 
 
-exports.DOCUMENT_BODY_MAX_LENGTH = DOCUMENT_BODY_MAX_LENGTH; exports.DOCUMENT_DESCRIPTION_MAX_LENGTH = DOCUMENT_DESCRIPTION_MAX_LENGTH; exports.DOCUMENT_NAME_MAX_LENGTH = DOCUMENT_NAME_MAX_LENGTH; exports.DOCUMENT_SAVE_DELAY_MS = DOCUMENT_SAVE_DELAY_MS; exports.DocumentModel = DocumentModel; exports.EMOJI_GROUPS = EMOJI_GROUPS; exports.MIN_FIT_ZOOM = MIN_FIT_ZOOM; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.bodyTextOf = bodyTextOf; exports.configureDocsHost = _chunkHX5TXQIXcjs.configureDocsHost; exports.copyDocument = _chunkHX5TXQIXcjs.copyDocument; exports.createDocument = _chunkHX5TXQIXcjs.createDocument; exports.deleteDocument = _chunkHX5TXQIXcjs.deleteDocument; exports.discardFailedDocument = _chunkHX5TXQIXcjs.discardFailedDocument; exports.documentBodyWriteHandler = documentBodyWriteHandler; exports.documentSourceLabel = documentSourceLabel; exports.fitZoomRatio = fitZoomRatio; exports.getDocsHost = _chunkHX5TXQIXcjs.getDocsHost; exports.getDocument = _chunkHX5TXQIXcjs.getDocument; exports.getLatestDocumentSnapshot = _chunkHX5TXQIXcjs.getLatestDocumentSnapshot; exports.listAccessibleDocuments = _chunkHX5TXQIXcjs.listAccessibleDocuments; exports.listDocumentSnapshots = _chunkHX5TXQIXcjs.listDocumentSnapshots; exports.listTrashedDocuments = _chunkHX5TXQIXcjs.listTrashedDocuments; exports.moveDocument = _chunkHX5TXQIXcjs.moveDocument; exports.planBodyEdit = planBodyEdit; exports.renameDocument = _chunkHX5TXQIXcjs.renameDocument; exports.restoreDocument = _chunkHX5TXQIXcjs.restoreDocument; exports.sanitizeUniverDocSnapshot = _chunkHX5TXQIXcjs.sanitizeUniverDocSnapshot; exports.saveDocumentSnapshot = _chunkHX5TXQIXcjs.saveDocumentSnapshot; exports.searchSymbols = searchSymbols; exports.updateDocumentDescription = _chunkHX5TXQIXcjs.updateDocumentDescription; exports.validateDocumentBody = validateDocumentBody; exports.validateDocumentDescription = validateDocumentDescription; exports.validateDocumentName = validateDocumentName; exports.writeBodyText = writeBodyText;
+
+exports.DOCUMENT_BODY_MAX_LENGTH = DOCUMENT_BODY_MAX_LENGTH; exports.DOCUMENT_DESCRIPTION_MAX_LENGTH = DOCUMENT_DESCRIPTION_MAX_LENGTH; exports.DOCUMENT_NAME_MAX_LENGTH = DOCUMENT_NAME_MAX_LENGTH; exports.DOCUMENT_SAVE_DELAY_MS = DOCUMENT_SAVE_DELAY_MS; exports.DocumentModel = DocumentModel; exports.EMOJI_GROUPS = EMOJI_GROUPS; exports.MIN_FIT_ZOOM = MIN_FIT_ZOOM; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.bodyTextOf = bodyTextOf; exports.configureDocsHost = _chunkHX5TXQIXcjs.configureDocsHost; exports.copyDocument = _chunkHX5TXQIXcjs.copyDocument; exports.createDocument = _chunkHX5TXQIXcjs.createDocument; exports.deleteDocument = _chunkHX5TXQIXcjs.deleteDocument; exports.discardFailedDocument = _chunkHX5TXQIXcjs.discardFailedDocument; exports.documentBodyWriteHandler = documentBodyWriteHandler; exports.documentSourceLabel = documentSourceLabel; exports.fitZoomRatio = fitZoomRatio; exports.getDocsHost = _chunkHX5TXQIXcjs.getDocsHost; exports.getDocument = _chunkHX5TXQIXcjs.getDocument; exports.getLatestDocumentSnapshot = _chunkHX5TXQIXcjs.getLatestDocumentSnapshot; exports.listAccessibleDocuments = _chunkHX5TXQIXcjs.listAccessibleDocuments; exports.listDocumentSnapshots = _chunkHX5TXQIXcjs.listDocumentSnapshots; exports.listTrashedDocuments = _chunkHX5TXQIXcjs.listTrashedDocuments; exports.moveDocument = _chunkHX5TXQIXcjs.moveDocument; exports.moveRangesThroughBodyEdit = moveRangesThroughBodyEdit; exports.planBodyEdit = planBodyEdit; exports.renameDocument = _chunkHX5TXQIXcjs.renameDocument; exports.restoreDocument = _chunkHX5TXQIXcjs.restoreDocument; exports.sanitizeUniverDocSnapshot = _chunkHX5TXQIXcjs.sanitizeUniverDocSnapshot; exports.saveDocumentSnapshot = _chunkHX5TXQIXcjs.saveDocumentSnapshot; exports.searchSymbols = searchSymbols; exports.updateDocumentDescription = _chunkHX5TXQIXcjs.updateDocumentDescription; exports.validateDocumentBody = validateDocumentBody; exports.validateDocumentDescription = validateDocumentDescription; exports.validateDocumentName = validateDocumentName; exports.writeBodyText = writeBodyText;
 //# sourceMappingURL=docs.cjs.map