@fluidframework/matrix 0.59.2001 → 0.59.3000

package/lib/undoprovider.js.map

@@ -1 +1 @@
-{"version":3,"file":"undoprovider.js","sourceRoot":"","sources":["../src/undoprovider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAmD,MAAM,4BAA4B,CAAC;AAE5G,OAAO,EAAU,aAAa,EAAE,MAAM,eAAe,CAAC;AAItD,MAAM,OAAO,kBAAkB;IAO3B,YACqB,OAAsB,EACtB,UAAiD,EACjD,UAAiD;QAFjD,YAAO,GAAP,OAAO,CAAe;QACtB,eAAU,GAAV,UAAU,CAAuC;QACjD,eAAU,GAAV,UAAU,CAAuC;IAClE,CAAC;IAEE,MAAM,CAAC,SAAsC,EAAE,MAAyC;;QAC3F,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,yFAAyF;YACzF,4FAA4F;YAC5F,EAAE;YACF,0FAA0F;YAC1F,4FAA4F;YAC5F,0BAA0B;YAC1B,EAAE;YACF,6FAA6F;YAC7F,oEAAoE;YAEpE,8FAA8F;YAC9F,4FAA4F;YAC5F,wCAAwC;YACxC,MAAM,aAAa,SAAG,IAAI,CAAC,YAAY,mCAAI,IAAI,aAAa,EAAE,CAAC;YAC/D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBACxB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACrC;YAED,+EAA+E;YAC/E,8EAA8E;YAC9E,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAC/D,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAEtE,QAAQ,SAAS,EAAE;gBACf;oBACI,IAAI,IAAI,CAAC,SAAS,mBAA8B,EAAE;wBAC9C,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;qBACvD;oBACD,MAAM;gBAEV,mBAA8B,CAAC,CAAC;oBAC5B,IAAI,IAAI,CAAC,SAAS,mBAA8B,EAAE;wBAC9C,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;qBACvD;oBACD,MAAM;iBACT;gBAED;oBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;aACxD;YAED,yFAAyF;YACzF,0FAA0F;YAC1F,SAAS;YACT,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;gBACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;aAC9B;SACJ;IACL,CAAC;IAEO,cAAc,CAAC,aAA4B,EAAE,QAA+C;QAChG,MAAM,UAAU,GAAG;YACf,MAAM,EAAE,GAAG,EAAE;gBACT,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAClE,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBAE/D,IAAI,CAAC,YAAY,GAAG,IAAI,aAAa,EAAE,CAAC;gBAExC,IAAI;oBACA,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;wBAC3B,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAuB,CAAC;wBAEhE,gFAAgF;wBAChF,gFAAgF;wBAChF,uEAAuE;wBACvE,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAEjD,QAAQ,CAAC,OAAO,CAAC,CAAC;qBACrB;iBACJ;wBAAS;oBACN,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC3B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;iBACjC;YACL,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;oBAC3B,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnD;YACL,CAAC;SACJ,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAEhD,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AAED,MAAM,OAAO,kBAAkB;IAC3B,YACqB,QAAuB,EACvB,MAAuB,EACvB,IAAuB,EACvB,IAAuB;QAHvB,aAAQ,GAAR,QAAQ,CAAe;QACvB,WAAM,GAAN,MAAM,CAAiB;QACvB,SAAI,GAAJ,IAAI,CAAmB;QACvB,SAAI,GAAJ,IAAI,CAAmB;QAExC,IAAI,CAAC,IAAI,GAAG,IAAI,kBAAkB,CAC9B,QAAQ;QACR,iBAAiB,CAAC,CAAC,OAA2B,EAAE,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC;QACD,iBAAiB,CAAC,CAAC,OAA2B,EAAE,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,kBAAkB,CAC9B,QAAQ;QACR,iBAAiB,CAAC,CAAC,OAA2B,EAAE,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC;QACD,iBAAiB,CAAC,CAAC,OAA2B,EAAE,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,CACJ,CAAC;IACN,CAAC;IAED,OAAO,CAAC,SAAiB,EAAE,SAAiB,EAAE,QAAuB;QACjE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,EACvD,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBACjC,MAAM,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACrC,QAAQ,CAAC,CAAC;gBAClB,CAAC;gBACD,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;aACpB,CAAC,CAAC;SACN;IACL,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport { TrackingGroup, MergeTreeDeltaOperationType, MergeTreeDeltaType } from \"@fluidframework/merge-tree\";\nimport { MatrixItem, SharedMatrix } from \"./matrix\";\nimport { Handle, isHandleValid } from \"./handletable\";\nimport { PermutationSegment, PermutationVector } from \"./permutationvector\";\nimport { IUndoConsumer } from \"./types\";\n\nexport class VectorUndoProvider {\n    // 'currentGroup' and 'currentOp' are used while applying an IRevertable.revert() to coalesce\n    // the recorded into a single IRevertable / tracking group as they move between the undo <->\n    // redo stacks.\n    private currentGroup?: TrackingGroup;\n    private currentOp?: MergeTreeDeltaType;\n\n    constructor(\n        private readonly manager: IUndoConsumer,\n        private readonly undoInsert: (segment: PermutationSegment) => void,\n        private readonly undoRemove: (segment: PermutationSegment) => void,\n    ) { }\n\n    public record(operation: MergeTreeDeltaOperationType, ranges: { segment: PermutationSegment }[]) {\n        if (ranges.length > 0) {\n            // Link each segment to a new TrackingGroup.  A TrackingGroup keeps track of the original\n            // set of linked segments, including any fragmentatiton that occurs due to future splitting.\n            //\n            // A TrackingGroup also prevents removed segments from being unlinked from the tree during\n            // Zamboni and guarantees segments will not be merged/coalesced with segments outside of the\n            // current tracking group.\n            //\n            // These properties allow us to rely on MergeTree.getPosition() to find the locations/lengths\n            // of all content contained within the tracking group in the future.\n\n            // If we are in the process of reverting, the `IRevertible.revert()` will provide the tracking\n            // group so that we can preserve the original segment ranges as a single op/group as we move\n            // ops between the undo <-> redo stacks.\n            const trackingGroup = this.currentGroup ?? new TrackingGroup();\n            for (const range of ranges) {\n                trackingGroup.link(range.segment);\n            }\n\n            // For SharedMatrix, each IRevertibles always holds a single row/col operation.\n            // Therefore, 'currentOp' must either be undefined or equal to the current op.\n            assert(this.currentOp === undefined || this.currentOp === operation,\n                0x02a /* \"On vector undo, unexpected 'currentOp' type/state!\" */);\n\n            switch (operation) {\n                case MergeTreeDeltaType.INSERT:\n                    if (this.currentOp !== MergeTreeDeltaType.INSERT) {\n                        this.pushRevertible(trackingGroup, this.undoInsert);\n                    }\n                    break;\n\n                case MergeTreeDeltaType.REMOVE: {\n                    if (this.currentOp !== MergeTreeDeltaType.REMOVE) {\n                        this.pushRevertible(trackingGroup, this.undoRemove);\n                    }\n                    break;\n                }\n\n                default:\n                    throw new Error(\"operation type not revertible\");\n            }\n\n            // If we are in the process of reverting, set 'currentOp' to remind ourselves not to push\n            // another revertible until `IRevertable.revert()` finishes the current op and clears this\n            // field.\n            if (this.currentGroup !== undefined) {\n                this.currentOp = operation;\n            }\n        }\n    }\n\n    private pushRevertible(trackingGroup: TrackingGroup, callback: (segment: PermutationSegment) => void) {\n        const revertible = {\n            revert: () => {\n                assert(this.currentGroup === undefined && this.currentOp === undefined,\n                    0x02b /* \"Must not nest calls to IRevertible.revert()\" */);\n\n                this.currentGroup = new TrackingGroup();\n\n                try {\n                    while (trackingGroup.size > 0) {\n                        const segment = trackingGroup.segments[0] as PermutationSegment;\n\n                        // Unlink 'segment' from the current tracking group before invoking the callback\n                        // to exclude the current undo/redo segment from those copied to the replacement\n                        // segment (if any). (See 'PermutationSegment.transferToReplacement()')\n                        segment.trackingCollection.unlink(trackingGroup);\n\n                        callback(segment);\n                    }\n                } finally {\n                    this.currentOp = undefined;\n                    this.currentGroup = undefined;\n                }\n            },\n            discard: () => {\n                while (trackingGroup.size > 0) {\n                    trackingGroup.unlink(trackingGroup.segments[0]);\n                }\n            },\n        };\n\n        this.manager.pushToCurrentOperation(revertible);\n\n        return revertible;\n    }\n}\n\nexport class MatrixUndoProvider<T> {\n    constructor(\n        private readonly consumer: IUndoConsumer,\n        private readonly matrix: SharedMatrix<T>,\n        private readonly rows: PermutationVector,\n        private readonly cols: PermutationVector,\n    ) {\n        rows.undo = new VectorUndoProvider(\n            consumer,\n            /* undoInsert: */ (segment: PermutationSegment) => {\n                const start = this.rows.getPosition(segment);\n                this.matrix.removeRows(start, segment.cachedLength);\n            },\n            /* undoRemove: */ (segment: PermutationSegment) => {\n                this.matrix._undoRemoveRows(segment);\n            },\n        );\n        cols.undo = new VectorUndoProvider(\n            consumer,\n            /* undoInsert: */ (segment: PermutationSegment) => {\n                const start = this.cols.getPosition(segment);\n                this.matrix.removeCols(start, segment.cachedLength);\n            },\n            /* undoRemove: */ (segment: PermutationSegment) => {\n                this.matrix._undoRemoveCols(segment);\n            },\n        );\n    }\n\n    cellSet(rowHandle: Handle, colHandle: Handle, oldValue: MatrixItem<T>) {\n        assert(isHandleValid(rowHandle) && isHandleValid(colHandle),\n            0x02c /* \"On cellSet(), invalid row and/or column handles!\" */);\n\n        if (this.consumer !== undefined) {\n            this.consumer.pushToCurrentOperation({\n                revert: () => {\n                    this.matrix.setCell(\n                        this.rows.handleToPosition(rowHandle),\n                        this.cols.handleToPosition(colHandle),\n                        oldValue);\n                },\n                discard: () => {},\n            });\n        }\n    }\n}\n"]}
+{"version":3,"file":"undoprovider.js","sourceRoot":"","sources":["../src/undoprovider.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport { TrackingGroup, MergeTreeDeltaOperationType, MergeTreeDeltaType } from \"@fluidframework/merge-tree\";\nimport { MatrixItem, SharedMatrix } from \"./matrix\";\nimport { Handle, isHandleValid } from \"./handletable\";\nimport { PermutationSegment, PermutationVector } from \"./permutationvector\";\nimport { IUndoConsumer } from \"./types\";\n\nexport class VectorUndoProvider {\n    // 'currentGroup' and 'currentOp' are used while applying an IRevertable.revert() to coalesce\n    // the recorded into a single IRevertable / tracking group as they move between the undo <->\n    // redo stacks.\n    private currentGroup?: TrackingGroup;\n    private currentOp?: MergeTreeDeltaType;\n\n    constructor(\n        private readonly manager: IUndoConsumer,\n        private readonly undoInsert: (segment: PermutationSegment) => void,\n        private readonly undoRemove: (segment: PermutationSegment) => void,\n    ) { }\n\n    public record(operation: MergeTreeDeltaOperationType, ranges: { segment: PermutationSegment; }[]) {\n        if (ranges.length > 0) {\n            // Link each segment to a new TrackingGroup.  A TrackingGroup keeps track of the original\n            // set of linked segments, including any fragmentatiton that occurs due to future splitting.\n            //\n            // A TrackingGroup also prevents removed segments from being unlinked from the tree during\n            // Zamboni and guarantees segments will not be merged/coalesced with segments outside of the\n            // current tracking group.\n            //\n            // These properties allow us to rely on MergeTree.getPosition() to find the locations/lengths\n            // of all content contained within the tracking group in the future.\n\n            // If we are in the process of reverting, the `IRevertible.revert()` will provide the tracking\n            // group so that we can preserve the original segment ranges as a single op/group as we move\n            // ops between the undo <-> redo stacks.\n            const trackingGroup = this.currentGroup ?? new TrackingGroup();\n            for (const range of ranges) {\n                trackingGroup.link(range.segment);\n            }\n\n            // For SharedMatrix, each IRevertibles always holds a single row/col operation.\n            // Therefore, 'currentOp' must either be undefined or equal to the current op.\n            assert(this.currentOp === undefined || this.currentOp === operation,\n                0x02a /* \"On vector undo, unexpected 'currentOp' type/state!\" */);\n\n            switch (operation) {\n                case MergeTreeDeltaType.INSERT:\n                    if (this.currentOp !== MergeTreeDeltaType.INSERT) {\n                        this.pushRevertible(trackingGroup, this.undoInsert);\n                    }\n                    break;\n\n                case MergeTreeDeltaType.REMOVE: {\n                    if (this.currentOp !== MergeTreeDeltaType.REMOVE) {\n                        this.pushRevertible(trackingGroup, this.undoRemove);\n                    }\n                    break;\n                }\n\n                default:\n                    throw new Error(\"operation type not revertible\");\n            }\n\n            // If we are in the process of reverting, set 'currentOp' to remind ourselves not to push\n            // another revertible until `IRevertable.revert()` finishes the current op and clears this\n            // field.\n            if (this.currentGroup !== undefined) {\n                this.currentOp = operation;\n            }\n        }\n    }\n\n    private pushRevertible(trackingGroup: TrackingGroup, callback: (segment: PermutationSegment) => void) {\n        const revertible = {\n            revert: () => {\n                assert(this.currentGroup === undefined && this.currentOp === undefined,\n                    0x02b /* \"Must not nest calls to IRevertible.revert()\" */);\n\n                this.currentGroup = new TrackingGroup();\n\n                try {\n                    while (trackingGroup.size > 0) {\n                        const segment = trackingGroup.segments[0] as PermutationSegment;\n\n                        // Unlink 'segment' from the current tracking group before invoking the callback\n                        // to exclude the current undo/redo segment from those copied to the replacement\n                        // segment (if any). (See 'PermutationSegment.transferToReplacement()')\n                        segment.trackingCollection.unlink(trackingGroup);\n\n                        callback(segment);\n                    }\n                } finally {\n                    this.currentOp = undefined;\n                    this.currentGroup = undefined;\n                }\n            },\n            discard: () => {\n                while (trackingGroup.size > 0) {\n                    trackingGroup.unlink(trackingGroup.segments[0]);\n                }\n            },\n        };\n\n        this.manager.pushToCurrentOperation(revertible);\n\n        return revertible;\n    }\n}\n\nexport class MatrixUndoProvider<T> {\n    constructor(\n        private readonly consumer: IUndoConsumer,\n        private readonly matrix: SharedMatrix<T>,\n        private readonly rows: PermutationVector,\n        private readonly cols: PermutationVector,\n    ) {\n        rows.undo = new VectorUndoProvider(\n            consumer,\n            /* undoInsert: */ (segment: PermutationSegment) => {\n                const start = this.rows.getPosition(segment);\n                this.matrix.removeRows(start, segment.cachedLength);\n            },\n            /* undoRemove: */ (segment: PermutationSegment) => {\n                this.matrix._undoRemoveRows(segment);\n            },\n        );\n        cols.undo = new VectorUndoProvider(\n            consumer,\n            /* undoInsert: */ (segment: PermutationSegment) => {\n                const start = this.cols.getPosition(segment);\n                this.matrix.removeCols(start, segment.cachedLength);\n            },\n            /* undoRemove: */ (segment: PermutationSegment) => {\n                this.matrix._undoRemoveCols(segment);\n            },\n        );\n    }\n\n    cellSet(rowHandle: Handle, colHandle: Handle, oldValue: MatrixItem<T>) {\n        assert(isHandleValid(rowHandle) && isHandleValid(colHandle),\n            0x02c /* \"On cellSet(), invalid row and/or column handles!\" */);\n\n        if (this.consumer !== undefined) {\n            this.consumer.pushToCurrentOperation({\n                revert: () => {\n                    this.matrix.setCell(\n                        this.rows.handleToPosition(rowHandle),\n                        this.cols.handleToPosition(colHandle),\n                        oldValue);\n                },\n                discard: () => {},\n            });\n        }\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/matrix",
-  "version": "0.59.2001",
+  "version": "0.59.3000",
   "description": "Distributed matrix",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -62,24 +62,25 @@
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
     "@fluidframework/core-interfaces": "^0.43.1000",
-    "@fluidframework/datastore-definitions": "^0.59.2001",
-    "@fluidframework/merge-tree": "^0.59.2001",
-    "@fluidframework/protocol-base": "^0.1036.2000",
+    "@fluidframework/datastore-definitions": "^0.59.3000",
+    "@fluidframework/merge-tree": "^0.59.3000",
+    "@fluidframework/protocol-base": "^0.1036.3000",
     "@fluidframework/protocol-definitions": "^0.1028.1000",
-    "@fluidframework/runtime-definitions": "^0.59.2001",
-    "@fluidframework/runtime-utils": "^0.59.2001",
-    "@fluidframework/shared-object-base": "^0.59.2001",
-    "@fluidframework/telemetry-utils": "^0.59.2001",
+    "@fluidframework/runtime-definitions": "^0.59.3000",
+    "@fluidframework/runtime-utils": "^0.59.3000",
+    "@fluidframework/shared-object-base": "^0.59.3000",
+    "@fluidframework/telemetry-utils": "^0.59.3000",
     "@tiny-calc/nano": "0.0.0-alpha.5",
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@fluid-internal/test-dds-utils": "^0.59.2001",
+    "@fluid-internal/test-dds-utils": "^0.59.3000",
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.28.1000",
-    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@0.59.1000",
-    "@fluidframework/mocha-test-setup": "^0.59.2001",
-    "@fluidframework/test-runtime-utils": "^0.59.2001",
+    "@fluidframework/build-tools": "^0.2.66793",
+    "@fluidframework/eslint-config-fluid": "^0.28.2000",
+    "@fluidframework/matrix-previous": "npm:@fluidframework/matrix@0.59.2000",
+    "@fluidframework/mocha-test-setup": "^0.59.3000",
+    "@fluidframework/test-runtime-utils": "^0.59.3000",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@tiny-calc/micro": "0.0.0-alpha.5",
@@ -106,12 +107,12 @@
     "rimraf": "^2.6.2",
     "source-map-support": "^0.5.16",
     "ts-node": "^7.0.1",
-    "typescript": "~4.1.3",
+    "typescript": "~4.5.5",
     "typescript-formatter": "7.1.0",
     "uuid": "^8.3.1"
   },
   "typeValidation": {
-    "version": "0.59.2000",
+    "version": "0.59.3000",
     "broken": {}
   }
 }

package/src/handlecache.ts

@@ -12,7 +12,7 @@ import { PermutationVector, PermutationSegment } from "./permutationvector";
 import { ensureRange } from "./range";
 
 /**
- * Used by PermutationVector to cache position -> handle lookups.
+ * Used by PermutationVector to cache position -\> handle lookups.
  *
  * Perf: Possibly, this should eventually be inlined into PermutationVector itself, but
  *       so far there's no measurable perf penalty for being a separate object (node 12 x64)

package/src/matrix.ts

@@ -44,16 +44,16 @@ const enum SnapshotPath {
 }
 
 interface ISetOp<T> {
-    type: MatrixOp.set,
-    row: number,
-    col: number,
-    value: MatrixItem<T>,
+    type: MatrixOp.set;
+    row: number;
+    col: number;
+    value: MatrixItem<T>;
 }
 
 interface ISetOpMetadata {
-    rowHandle: Handle,
-    colHandle: Handle,
-    localSeq: number,
+    rowHandle: Handle;
+    colHandle: Handle;
+    localSeq: number;
 }
 
 /**
@@ -78,8 +78,7 @@ export class SharedMatrix<T = any>
     extends SharedObject
     implements IMatrixProducer<MatrixItem<T>>,
     IMatrixReader<MatrixItem<T>>,
-    IMatrixWriter<MatrixItem<T>>
-{
+    IMatrixWriter<MatrixItem<T>> {
     private readonly consumers = new Set<IMatrixConsumer<MatrixItem<T>>>();
 
     public static getFactory() { return new SharedMatrixFactory(); }
@@ -564,10 +563,10 @@ export class SharedMatrix<T = any>
 
         switch (contents.target) {
             case SnapshotPath.cols:
-                this.cols.applyMsg(msg);
+                this.cols.applyMsg(msg, local);
                 break;
             case SnapshotPath.rows:
-                this.rows.applyMsg(msg);
+                this.rows.applyMsg(msg, local);
                 break;
             default: {
                 assert(contents.type === MatrixOp.set,
@@ -687,7 +686,55 @@ export class SharedMatrix<T = any>
         return `${s}\n`;
     }
 
-    protected applyStashedOp() {
-        throw new Error("not implemented");
+    /**
+     * {@inheritDoc @fluidframework/shared-object-base#SharedObjectCore.applyStashedOp}
+     */
+    protected applyStashedOp(content: any): unknown {
+        if (content.target === SnapshotPath.cols || content.target === SnapshotPath.rows) {
+            const op = content as IMergeTreeOp;
+            const currentVector = content.target === SnapshotPath.cols ? this.cols : this.rows;
+            const oppositeVector = content.target === SnapshotPath.cols ? this.rows : this.cols;
+            const metadata = currentVector.applyStashedOp(op);
+            const localSeq = currentVector.getCollabWindow().localSeq;
+            const oppositeWindow = oppositeVector.getCollabWindow();
+
+            assert(
+                localSeq > oppositeWindow.localSeq,
+                0x2d9,
+                /* "The 'localSeq' of the vector applying stashed op must > the 'localSeq' of the other vector." */
+            );
+
+            oppositeWindow.localSeq = localSeq;
+
+            return metadata;
+        } else {
+            assert(content.type === MatrixOp.set, 0x2da /* "Unknown SharedMatrix 'op' type." */);
+
+            const setOp = content as ISetOp<T>;
+            const rowHandle = this.rows.getAllocatedHandle(setOp.row);
+            const colHandle = this.cols.getAllocatedHandle(setOp.col);
+            if (this.undo !== undefined) {
+                let oldValue = this.cells.getCell(rowHandle, colHandle);
+                if (oldValue === null) {
+                    oldValue = undefined;
+                }
+
+                this.undo.cellSet(
+                    rowHandle,
+                    colHandle,
+                    oldValue);
+            }
+
+            this.cells.setCell(rowHandle, colHandle, setOp.value);
+            const localSeq = this.nextLocalSeq();
+            const metadata: ISetOpMetadata = {
+                rowHandle,
+                colHandle,
+                localSeq,
+            };
+
+            this.pending.setCell(rowHandle, colHandle, localSeq);
+            return metadata;
+        }
     }
 }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/matrix";
-export const pkgVersion = "0.59.2001";
+export const pkgVersion = "0.59.3000";

package/src/productSet.ts

@@ -298,7 +298,7 @@ function compareSubspace<T>(
 }
 
 const tryUnionSubspaces = (() => {
-    const cache: { left?: unknown; right?: unknown; res?: unknown } = {};
+    const cache: { left?: unknown; right?: unknown; res?: unknown; } = {};
     return <T>(
         productOperations: ProductOperations<T>,
         left: Subspace<T>,

package/src/range.ts

@@ -4,7 +4,7 @@
  */
 
  /**
-  * Ensures that 0 <= 'value' < 'limit'.  Throws a RangeError otherwise.
+  * Ensures that 0 \<= 'value' \< 'limit'.  Throws a RangeError otherwise.
   */
 export function ensureRange(value: number, limit: number) {
     // Coerce 'value' to Uint32 so that we can range check with a single branch.

package/src/undoprovider.ts

@@ -23,7 +23,7 @@ export class VectorUndoProvider {
         private readonly undoRemove: (segment: PermutationSegment) => void,
     ) { }
 
-    public record(operation: MergeTreeDeltaOperationType, ranges: { segment: PermutationSegment }[]) {
+    public record(operation: MergeTreeDeltaOperationType, ranges: { segment: PermutationSegment; }[]) {
         if (ranges.length > 0) {
             // Link each segment to a new TrackingGroup.  A TrackingGroup keeps track of the original
             // set of linked segments, including any fragmentatiton that occurs due to future splitting.