@ai-matrx/office 0.8.44 → 0.8.45

package/dist/docs.cjs

@@ -322,9 +322,12 @@ var DocumentModel = (_class = class {
     const cs = view.port.commandService;
     if (typeof cs.beforeCommandExecuted !== "function" || typeof cs.onCommandExecuted !== "function") return () => {
     };
-    const before = cs.beforeCommandExecuted((info) => {
+    const before = cs.beforeCommandExecuted((info, options) => {
       if (info.type === COMMAND_TYPE) view.commands.push(info.id);
-      else if (info.id === RICH_TEXT_EDITING_ID && this.otListeners.size && !this.relaying) {
+      else if (info.id === RICH_TEXT_EDITING_ID && !this.relaying && !_optionalChain([options, 'optionalAccess', _29 => _29.fromCollab]) && !_optionalChain([options, 'optionalAccess', _30 => _30.onlyLocal])) {
+        keepInsideTheBody(info.params, () => view.port.snapshot());
+      }
+      if (info.id === RICH_TEXT_EDITING_ID && this.otListeners.size && !this.relaying) {
         try {
           const snap = view.port.snapshot();
           view.pre = snap ? structuredClone(snap) : null;
@@ -359,7 +362,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', _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));
+      return _nullishCoalesce(_nullishCoalesce(_optionalChain([view, 'access', _31 => _31.port, 'access', _32 => _32.unitId, 'optionalCall', _33 => _33()]), () => ( _optionalChain([view, 'access', _34 => _34.port, 'access', _35 => _35.snapshot, 'call', _36 => _36(), 'optionalAccess', _37 => _37.id]))), () => ( null));
     } catch (e6) {
       return null;
     }
@@ -393,7 +396,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', _36 => _36.deps, 'access', _37 => _37.onApplyFailed, 'optionalCall', _38 => _38(this.documentId, mutationId, error)]);
+      _optionalChain([this, 'access', _38 => _38.deps, 'access', _39 => _39.onApplyFailed, 'optionalCall', _40 => _40(this.documentId, mutationId, error)]);
     } catch (notifyError) {
       console.warn(`[document-model] the notice for ${this.documentId}'s failed apply also failed`, notifyError);
     }
@@ -421,7 +424,7 @@ var DocumentModel = (_class = class {
   async write(reason) {
     if (this.ot) {
       const wrote = await this.ot.write(reason);
-      if (wrote) _optionalChain([this, 'access', _39 => _39.deps, 'access', _40 => _40.onSaved, 'optionalCall', _41 => _41(this.documentId, reason === "manual" ? "manual" : "autosave")]);
+      if (wrote) _optionalChain([this, 'access', _41 => _41.deps, 'access', _42 => _42.onSaved, 'optionalCall', _43 => _43(this.documentId, reason === "manual" ? "manual" : "autosave")]);
       return wrote;
     }
     const snapshot = this.latest();
@@ -446,7 +449,7 @@ var DocumentModel = (_class = class {
       this.saving = false;
     }
     if (this.views.size === 0) this.stored = snapshot;
-    _optionalChain([this, 'access', _42 => _42.deps, 'access', _43 => _43.onSaved, 'optionalCall', _44 => _44(this.documentId, origin)]);
+    _optionalChain([this, 'access', _44 => _44.deps, 'access', _45 => _45.onSaved, 'optionalCall', _46 => _46(this.documentId, origin)]);
     return true;
   }
   hasUnsaved() {
@@ -489,7 +492,7 @@ var DocumentModel = (_class = class {
   replaceContent(row) {
     if (this.ot) return this.ot.replace(row.snapshot);
     this.show(row);
-    _optionalChain([this, 'access', _45 => _45.collab, 'optionalAccess', _46 => _46.announceReplaced, 'call', _47 => _47(row.id)]);
+    _optionalChain([this, 'access', _47 => _47.collab, 'optionalAccess', _48 => _48.announceReplaced, 'call', _49 => _49(row.id)]);
   }
   /** A peer replaced the document: show the newest save (once). */
   async onPeerReplaced() {
@@ -511,8 +514,8 @@ var DocumentModel = (_class = class {
     this.stored = snapshot;
     this.relaying = true;
     try {
-      for (const view of this.views.values()) view.port.remount(snapshot);
-      _optionalChain([this, 'access', _48 => _48.parked, 'optionalAccess', _49 => _49.remount, 'call', _50 => _50(snapshot)]);
+      for (const view of this.views.values()) remountKeepingCaret(view.port, snapshot);
+      _optionalChain([this, 'access', _50 => _50.parked, 'optionalAccess', _51 => _51.remount, 'call', _52 => _52(snapshot)]);
     } finally {
       this.relaying = false;
     }
@@ -586,7 +589,7 @@ var DocumentModel = (_class = class {
           const input = Array.isArray(params.actions) ? params.actions.length : 0;
           let sel = null;
           try {
-            sel = _nullishCoalesce(_optionalChain([view, 'access', _51 => _51.port, 'access', _52 => _52.selection, 'optionalAccess', _53 => _53.get, 'call', _54 => _54()]), () => ( null));
+            sel = _nullishCoalesce(_optionalChain([view, 'access', _53 => _53.port, 'access', _54 => _54.selection, 'optionalAccess', _55 => _55.get, 'call', _56 => _56()]), () => ( null));
           } catch (e7) {
             sel = null;
           }
@@ -597,7 +600,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', _55 => _55.port, 'access', _56 => _56.selection, 'optionalAccess', _57 => _57.set, 'call', _58 => _58(moved)]);
+              _optionalChain([view, 'access', _57 => _57.port, 'access', _58 => _58.selection, 'optionalAccess', _59 => _59.set, 'call', _60 => _60(moved)]);
             } catch (error) {
               console.warn(`[document-model] could not move this view's caret past a collaborator's edit`, error);
             }
@@ -615,8 +618,8 @@ var DocumentModel = (_class = class {
       this.savedFingerprint = contentFingerprint(s2);
       this.relaying = true;
       try {
-        for (const view of this.views.values()) view.port.remount(s2);
-        _optionalChain([this, 'access', _59 => _59.parked, 'optionalAccess', _60 => _60.remount, 'call', _61 => _61(s2)]);
+        for (const view of this.views.values()) remountKeepingCaret(view.port, s2);
+        _optionalChain([this, 'access', _61 => _61.parked, 'optionalAccess', _62 => _62.remount, 'call', _63 => _63(s2)]);
       } finally {
         this.relaying = false;
       }
@@ -625,7 +628,7 @@ var DocumentModel = (_class = class {
       const out = [];
       for (const view of this.views.values()) {
         const unitId = this.unitIdOf(view);
-        const service = _optionalChain([view, 'access', _62 => _62.port, 'access', _63 => _63.undoRedo, 'optionalCall', _64 => _64()]);
+        const service = _optionalChain([view, 'access', _64 => _64.port, 'access', _65 => _65.undoRedo, 'optionalCall', _66 => _66()]);
         if (!unitId || !service) continue;
         const port = view.port;
         out.push({
@@ -633,7 +636,7 @@ var DocumentModel = (_class = class {
           unitId,
           flushHistory: () => {
             try {
-              _optionalChain([port, 'access', _65 => _65.docHistory, 'optionalCall', _66 => _66(), 'optionalAccess', _67 => _67.flushPendingChanges, 'call', _68 => _68(unitId)]);
+              _optionalChain([port, 'access', _67 => _67.docHistory, 'optionalCall', _68 => _68(), 'optionalAccess', _69 => _69.flushPendingChanges, 'call', _70 => _70(unitId)]);
             } catch (error) {
               console.warn(`[document-model] could not close this view's typing burst before a collaborator's edit`, error);
             }
@@ -646,7 +649,7 @@ var DocumentModel = (_class = class {
     selection: () => {
       for (const view of this.views.values()) {
         try {
-          const sel = _optionalChain([view, 'access', _69 => _69.port, 'access', _70 => _70.selection, 'optionalAccess', _71 => _71.get, 'call', _72 => _72()]);
+          const sel = _optionalChain([view, 'access', _71 => _71.port, 'access', _72 => _72.selection, 'optionalAccess', _73 => _73.get, 'call', _74 => _74()]);
           if (sel) return sel;
         } catch (e8) {
         }
@@ -705,9 +708,9 @@ var DocumentModel = (_class = class {
    * so a collaborator's save still reaches the body a returning view boots from.
    */
   rest() {
-    _optionalChain([this, 'access', _73 => _73.collab, 'optionalAccess', _74 => _74.stop, 'call', _75 => _75()]);
+    _optionalChain([this, 'access', _75 => _75.collab, 'optionalAccess', _76 => _76.stop, 'call', _77 => _77()]);
     this.collab = null;
-    _optionalChain([this, 'access', _76 => _76.ot, 'optionalAccess', _77 => _77.stop, 'call', _78 => _78()]);
+    _optionalChain([this, 'access', _78 => _78.ot, 'optionalAccess', _79 => _79.stop, 'call', _80 => _80()]);
     this.ot = null;
     this.awareness = null;
   }
@@ -723,12 +726,68 @@ var DocumentModel = (_class = class {
         console.warn(`[document-model] could not dispose ${this.documentId}'s kept editor`, error);
       }
     }
-    _optionalChain([this, 'access', _79 => _79.realtimeClose, 'optionalCall', _80 => _80()]);
+    _optionalChain([this, 'access', _81 => _81.realtimeClose, 'optionalCall', _82 => _82()]);
     this.realtimeClose = null;
-    _optionalChain([this, 'access', _81 => _81.pageClose, 'optionalCall', _82 => _82()]);
+    _optionalChain([this, 'access', _83 => _83.pageClose, 'optionalCall', _84 => _84()]);
     this.pageClose = null;
   }
 }, _class);
+var lastTextOffset = (dataStream) => Math.max(0, dataStream.length - 2);
+function mapOffsetThroughReplace(before, after, offset) {
+  const max = Math.min(before.length, after.length);
+  let pre = 0;
+  while (pre < max && before[pre] === after[pre]) pre++;
+  let suf = 0;
+  while (suf < max - pre && before[before.length - 1 - suf] === after[after.length - 1 - suf]) suf++;
+  const at = offset <= pre ? offset : offset >= before.length - suf ? after.length - (before.length - offset) : after.length - suf;
+  return Math.max(0, Math.min(at, lastTextOffset(after)));
+}
+function remountKeepingCaret(port, snapshot) {
+  let sel = null;
+  let before = null;
+  try {
+    sel = _nullishCoalesce(_optionalChain([port, 'access', _85 => _85.selection, 'optionalAccess', _86 => _86.get, 'call', _87 => _87()]), () => ( null));
+    before = _nullishCoalesce(_optionalChain([port, 'access', _88 => _88.snapshot, 'call', _89 => _89(), 'optionalAccess', _90 => _90.body, 'optionalAccess', _91 => _91.dataStream]), () => ( null));
+  } catch (e9) {
+    sel = null;
+  }
+  port.remount(snapshot);
+  const after = _optionalChain([snapshot, 'access', _92 => _92.body, 'optionalAccess', _93 => _93.dataStream]);
+  if (!_optionalChain([sel, 'optionalAccess', _94 => _94.length]) || before == null || typeof after !== "string" || sel.some((r) => r.segmentId)) return;
+  try {
+    _optionalChain([port, 'access', _95 => _95.selection, 'optionalAccess', _96 => _96.set, 'call', _97 => _97(
+      sel.map((r) => ({ startOffset: mapOffsetThroughReplace(before, after, r.startOffset), endOffset: mapOffsetThroughReplace(before, after, r.endOffset) }))
+    )]);
+  } catch (error) {
+    console.warn("[document-model] could not carry this view's caret into the replaced document", error);
+  }
+}
+function keepInsideTheBody(params, current) {
+  const p = params;
+  if (!p || p.segmentId || !Array.isArray(p.actions) || p.actions[0] !== "body") return;
+  const sub = p.actions[1];
+  if (!sub || sub.et !== "text-x" || !Array.isArray(sub.e)) return;
+  let doc = null;
+  try {
+    doc = current();
+  } catch (e10) {
+    return;
+  }
+  const ds = _optionalChain([doc, 'optionalAccess', _98 => _98.body, 'optionalAccess', _99 => _99.dataStream]);
+  if (typeof ds !== "string" || !ds.endsWith("\r\n")) return;
+  const last = lastTextOffset(ds);
+  let pos = 0;
+  let past = false;
+  for (const a of sub.e) {
+    if (a.t === "i" && pos > last) past = true;
+    if (a.t !== "i") pos += a.len;
+  }
+  if (!past) return;
+  const inserts = sub.e.filter((a) => a.t === "i");
+  const plain = sub.e.every((a) => a.t === "i" || a.t === "r" && a.body == null);
+  console.warn("[document-model] an edit aimed past the end of the document was kept inside it", { at: pos, length: ds.length });
+  p.actions = inserts.length === 1 && plain ? ["body", { ...sub, e: [...last ? [{ t: "r", len: last }] : [], inserts[0]] }] : [];
+}
 function moveRangesThroughBodyEdit(ranges, actions) {
   const a = actions;
   if (!Array.isArray(a) || a[0] !== "body") return null;
@@ -1003,12 +1062,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', _83 => _83.caret]);
+  const c = _optionalChain([raw, 'optionalAccess', _100 => _100.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', _84 => _84.start]);
-    const e2 = _optionalChain([r, 'optionalAccess', _85 => _85.end]);
+    const s2 = _optionalChain([r, 'optionalAccess', _101 => _101.start]);
+    const e2 = _optionalChain([r, 'optionalAccess', _102 => _102.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 });
   }
@@ -1128,5 +1187,7 @@ var RemoteCaretBook = (_class2 = class {
 
 
 
-exports.CARET_HEARTBEAT_MS = CARET_HEARTBEAT_MS; exports.CARET_MAX_RANGES = CARET_MAX_RANGES; exports.CARET_STALE_MS = CARET_STALE_MS; exports.COMMENT_ANCHOR_LABEL_MAX = COMMENT_ANCHOR_LABEL_MAX; exports.COMMENT_ANCHOR_PART_PREFIX = COMMENT_ANCHOR_PART_PREFIX; exports.COMMENT_ANCHOR_RANGE_TYPE = COMMENT_ANCHOR_RANGE_TYPE; 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.RemoteCaretBook = RemoteCaretBook; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.addCommentAnchorActions = addCommentAnchorActions; exports.anchorIdOfPartAnchor = anchorIdOfPartAnchor; exports.bodyTextOf = bodyTextOf; exports.commentAnchorPartKey = commentAnchorPartKey; exports.commentAnchorsOf = commentAnchorsOf; exports.commentPartAnchor = commentPartAnchor; exports.configureDocsHost = _chunkXJBJKOUHcjs.configureDocsHost; exports.copyDocument = _chunkXJBJKOUHcjs.copyDocument; exports.createDocument = _chunkXJBJKOUHcjs.createDocument; exports.deleteDocument = _chunkXJBJKOUHcjs.deleteDocument; exports.discardFailedDocument = _chunkXJBJKOUHcjs.discardFailedDocument; exports.documentBodyWriteHandler = documentBodyWriteHandler; exports.documentSourceLabel = documentSourceLabel; exports.fitZoomRatio = fitZoomRatio; exports.getDocsHost = _chunkXJBJKOUHcjs.getDocsHost; exports.getDocument = _chunkXJBJKOUHcjs.getDocument; exports.getLatestDocumentSnapshot = _chunkXJBJKOUHcjs.getLatestDocumentSnapshot; exports.isDocsAnchorOnlyOp = isDocsAnchorOnlyOp; exports.listAccessibleDocuments = _chunkXJBJKOUHcjs.listAccessibleDocuments; exports.listDocumentSnapshots = _chunkXJBJKOUHcjs.listDocumentSnapshots; exports.listTrashedDocuments = _chunkXJBJKOUHcjs.listTrashedDocuments; exports.moveDocument = _chunkXJBJKOUHcjs.moveDocument; exports.movePeerRangesThroughBodyEdit = movePeerRangesThroughBodyEdit; exports.moveRangesThroughBodyEdit = moveRangesThroughBodyEdit; exports.newCommentAnchorId = newCommentAnchorId; exports.planBodyEdit = planBodyEdit; exports.publishedCaretFromSelection = publishedCaretFromSelection; exports.quoteOfCommentAnchor = quoteOfCommentAnchor; exports.removeCommentAnchorActions = removeCommentAnchorActions; exports.renameDocument = _chunkXJBJKOUHcjs.renameDocument; exports.restoreDocument = _chunkXJBJKOUHcjs.restoreDocument; exports.sanitizeUniverDocSnapshot = _chunkXJBJKOUHcjs.sanitizeUniverDocSnapshot; exports.saveDocumentSnapshot = _chunkXJBJKOUHcjs.saveDocumentSnapshot; exports.searchSymbols = searchSymbols; exports.updateDocumentDescription = _chunkXJBJKOUHcjs.updateDocumentDescription; exports.validateDocumentBody = validateDocumentBody; exports.validateDocumentDescription = validateDocumentDescription; exports.validateDocumentName = validateDocumentName; exports.writeBodyText = writeBodyText;
+
+
+exports.CARET_HEARTBEAT_MS = CARET_HEARTBEAT_MS; exports.CARET_MAX_RANGES = CARET_MAX_RANGES; exports.CARET_STALE_MS = CARET_STALE_MS; exports.COMMENT_ANCHOR_LABEL_MAX = COMMENT_ANCHOR_LABEL_MAX; exports.COMMENT_ANCHOR_PART_PREFIX = COMMENT_ANCHOR_PART_PREFIX; exports.COMMENT_ANCHOR_RANGE_TYPE = COMMENT_ANCHOR_RANGE_TYPE; 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.RemoteCaretBook = RemoteCaretBook; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.addCommentAnchorActions = addCommentAnchorActions; exports.anchorIdOfPartAnchor = anchorIdOfPartAnchor; exports.bodyTextOf = bodyTextOf; exports.commentAnchorPartKey = commentAnchorPartKey; exports.commentAnchorsOf = commentAnchorsOf; exports.commentPartAnchor = commentPartAnchor; exports.configureDocsHost = _chunkXJBJKOUHcjs.configureDocsHost; exports.copyDocument = _chunkXJBJKOUHcjs.copyDocument; exports.createDocument = _chunkXJBJKOUHcjs.createDocument; exports.deleteDocument = _chunkXJBJKOUHcjs.deleteDocument; exports.discardFailedDocument = _chunkXJBJKOUHcjs.discardFailedDocument; exports.documentBodyWriteHandler = documentBodyWriteHandler; exports.documentSourceLabel = documentSourceLabel; exports.fitZoomRatio = fitZoomRatio; exports.getDocsHost = _chunkXJBJKOUHcjs.getDocsHost; exports.getDocument = _chunkXJBJKOUHcjs.getDocument; exports.getLatestDocumentSnapshot = _chunkXJBJKOUHcjs.getLatestDocumentSnapshot; exports.isDocsAnchorOnlyOp = isDocsAnchorOnlyOp; exports.keepInsideTheBody = keepInsideTheBody; exports.listAccessibleDocuments = _chunkXJBJKOUHcjs.listAccessibleDocuments; exports.listDocumentSnapshots = _chunkXJBJKOUHcjs.listDocumentSnapshots; exports.listTrashedDocuments = _chunkXJBJKOUHcjs.listTrashedDocuments; exports.mapOffsetThroughReplace = mapOffsetThroughReplace; exports.moveDocument = _chunkXJBJKOUHcjs.moveDocument; exports.movePeerRangesThroughBodyEdit = movePeerRangesThroughBodyEdit; exports.moveRangesThroughBodyEdit = moveRangesThroughBodyEdit; exports.newCommentAnchorId = newCommentAnchorId; exports.planBodyEdit = planBodyEdit; exports.publishedCaretFromSelection = publishedCaretFromSelection; exports.quoteOfCommentAnchor = quoteOfCommentAnchor; exports.removeCommentAnchorActions = removeCommentAnchorActions; exports.renameDocument = _chunkXJBJKOUHcjs.renameDocument; exports.restoreDocument = _chunkXJBJKOUHcjs.restoreDocument; exports.sanitizeUniverDocSnapshot = _chunkXJBJKOUHcjs.sanitizeUniverDocSnapshot; exports.saveDocumentSnapshot = _chunkXJBJKOUHcjs.saveDocumentSnapshot; exports.searchSymbols = searchSymbols; exports.updateDocumentDescription = _chunkXJBJKOUHcjs.updateDocumentDescription; exports.validateDocumentBody = validateDocumentBody; exports.validateDocumentDescription = validateDocumentDescription; exports.validateDocumentName = validateDocumentName; exports.writeBodyText = writeBodyText;
 //# sourceMappingURL=docs.cjs.map