@ai-matrx/office 0.8.0 → 0.8.2

package/dist/univer-collab.d.cts

@@ -373,6 +373,12 @@ interface DocsOtRoom {
     isSaver(): boolean;
     stop(): void;
 }
+/**
+ * Keys in one canonical order. The log stores groups as jsonb, which returns object keys in its own order, so an
+ * op read back from the door is the same op with its keys moved. The session compares wire forms (its ack check)
+ * through `encode`, so `encode` must not depend on key order or every acknowledgement looks like a mismatch.
+ */
+declare function canonicalKeys<T>(v: T): T;
 interface UndoItem {
     unitID?: string;
     undoMutations?: Array<{
@@ -461,4 +467,4 @@ interface DocumentOtFactoryOptions {
 /** The `DocumentModel.startOtRoom` factory for one document. */
 declare function documentOtFactory(o: DocumentOtFactoryOptions): DocumentOtFactory;
 
-export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type OpenDocsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, WorkbookCollabSession, type WorkbookCollabSessionOptions, applyDocsOp, canonicalDocsSnapshot, canonicalDocsString, composeDocsOps, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, invertDocsOp, isCellEditorScratch, isNoopDocsOp, normalizeDocsOp, openDocsOtRoom, rebaseUndoStack, stampCovered, stampDeterministicIds, stripSenderView, takeCovered, transformDocsOp, transformTextX, undoStacksOf };
+export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type OpenDocsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, WorkbookCollabSession, type WorkbookCollabSessionOptions, applyDocsOp, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, composeDocsOps, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, invertDocsOp, isCellEditorScratch, isNoopDocsOp, normalizeDocsOp, openDocsOtRoom, rebaseUndoStack, stampCovered, stampDeterministicIds, stripSenderView, takeCovered, transformDocsOp, transformTextX, undoStacksOf };

package/dist/univer-collab.d.ts

@@ -373,6 +373,12 @@ interface DocsOtRoom {
     isSaver(): boolean;
     stop(): void;
 }
+/**
+ * Keys in one canonical order. The log stores groups as jsonb, which returns object keys in its own order, so an
+ * op read back from the door is the same op with its keys moved. The session compares wire forms (its ack check)
+ * through `encode`, so `encode` must not depend on key order or every acknowledgement looks like a mismatch.
+ */
+declare function canonicalKeys<T>(v: T): T;
 interface UndoItem {
     unitID?: string;
     undoMutations?: Array<{
@@ -461,4 +467,4 @@ interface DocumentOtFactoryOptions {
 /** The `DocumentModel.startOtRoom` factory for one document. */
 declare function documentOtFactory(o: DocumentOtFactoryOptions): DocumentOtFactory;
 
-export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type OpenDocsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, WorkbookCollabSession, type WorkbookCollabSessionOptions, applyDocsOp, canonicalDocsSnapshot, canonicalDocsString, composeDocsOps, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, invertDocsOp, isCellEditorScratch, isNoopDocsOp, normalizeDocsOp, openDocsOtRoom, rebaseUndoStack, stampCovered, stampDeterministicIds, stripSenderView, takeCovered, transformDocsOp, transformTextX, undoStacksOf };
+export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type OpenDocsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, WorkbookCollabSession, type WorkbookCollabSessionOptions, applyDocsOp, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, composeDocsOps, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, invertDocsOp, isCellEditorScratch, isNoopDocsOp, normalizeDocsOp, openDocsOtRoom, rebaseUndoStack, stampCovered, stampDeterministicIds, stripSenderView, takeCovered, transformDocsOp, transformTextX, undoStacksOf };

package/dist/univer-collab.js

@@ -976,6 +976,15 @@ function stampDeterministicIds(snapshot) {
 import { isOpBarrier, openOpSession } from "@ai-matrx/data/realtime/collab";
 var RICH_TEXT_EDITING = "doc.mutation.rich-text-editing";
 var DOCS_COLLAB_PROTO = 1;
+function canonicalKeys(v) {
+  if (Array.isArray(v)) return v.map(canonicalKeys);
+  if (v && typeof v === "object") {
+    const out = {};
+    for (const k of Object.keys(v).sort()) out[k] = canonicalKeys(v[k]);
+    return out;
+  }
+  return v;
+}
 function branches(op) {
   if (!Array.isArray(op) || op.length === 0) return [];
   return Array.isArray(op[0]) ? op : [op];
@@ -1066,7 +1075,7 @@ function openDocsOtRoom(o) {
     },
     compose: (a, b) => composeDocsOps(a, b),
     isNoop: (op) => isNoopDocsOp(op),
-    encode: (op) => [{ cmd: "docs.edit", mutations: [{ id: RICH_TEXT_EDITING, params: { segmentId: "", actions: op } }] }],
+    encode: (op) => [{ cmd: "docs.edit", mutations: [{ id: RICH_TEXT_EDITING, params: { segmentId: "", actions: canonicalKeys(op) } }] }],
     decode(groups) {
       let op = null;
       for (const g of groups) {
@@ -1357,6 +1366,7 @@ export {
   applyDocsOp,
   canonicalDocsSnapshot,
   canonicalDocsString,
+  canonicalKeys,
   composeDocsOps,
   docsStateHash,
   documentOtFactory,