@fluidframework/merge-tree 2.0.0-internal.8.0.0 → 2.0.0-rc.1.0.0

package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js

@@ -0,0 +1,178 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const constants_1 = require("../constants");
+const mergeTreeDeltaCallback_1 = require("../mergeTreeDeltaCallback");
+const ops_1 = require("../ops");
+const textSegment_1 = require("../textSegment");
+const mergeTree_1 = require("../mergeTree");
+const testUtils_1 = require("./testUtils");
+describe("MergeTree", () => {
+    let mergeTree;
+    const localClientId = 17;
+    let currentSequenceNumber;
+    beforeEach(() => {
+        mergeTree = new mergeTree_1.MergeTree();
+        (0, testUtils_1.insertSegments)({
+            mergeTree,
+            pos: 0,
+            segments: [textSegment_1.TextSegment.make("hello world!")],
+            refSeq: constants_1.UniversalSequenceNumber,
+            clientId: constants_1.LocalClientId,
+            seq: constants_1.UniversalSequenceNumber,
+            opArgs: undefined,
+        });
+        currentSequenceNumber = 0;
+        mergeTree.startCollaboration(localClientId, 
+        /* minSeq: */ currentSequenceNumber, 
+        /* currentSeq: */ currentSequenceNumber);
+    });
+    describe("markRangeRemoved", () => {
+        it("Event on Removal", () => {
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 4,
+                end: 6,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.REMOVE]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 2,
+            });
+        });
+        // Verify that zamboni unlinks a removed segment and raises the appropriate maintenance event.
+        it("Event on Unlink", () => {
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            const start = 4;
+            const end = 6;
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start,
+                end,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            // In order for the removed segment to unlinked by zamboni, we need to ACK the segment
+            // and advance the collaboration window's minSeq past the removedSeq.
+            mergeTree.ackPendingSegment({
+                op: {
+                    pos1: start,
+                    pos2: end,
+                    type: ops_1.MergeTreeDeltaType.REMOVE,
+                },
+                sequencedMessage: {
+                    sequenceNumber: ++currentSequenceNumber,
+                },
+            });
+            // Move currentSeq/minSeq past the seq# at which the removal was ACKed.
+            mergeTree.collabWindow.currentSeq = currentSequenceNumber;
+            mergeTree.setMinSeq(currentSequenceNumber);
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.REMOVE]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 2,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.UNLINK]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.ACKNOWLEDGED]: 1,
+            });
+        });
+        it("Remote Before Local", () => {
+            const remoteClientId = 35;
+            let remoteSequenceNumber = currentSequenceNumber;
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 4,
+                end: 6,
+                refSeq: remoteSequenceNumber,
+                clientId: remoteClientId,
+                seq: ++remoteSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 3,
+                end: 5,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.REMOVE]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 2,
+            });
+        });
+        it("Local Before Remote", () => {
+            const remoteClientId = 35;
+            let remoteSequenceNumber = currentSequenceNumber;
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 4,
+                end: 6,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 3,
+                end: 5,
+                refSeq: remoteSequenceNumber,
+                clientId: remoteClientId,
+                seq: ++remoteSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.REMOVE]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 2,
+            });
+        });
+        it("Local delete shadows remote", () => {
+            const remoteClientId = 35;
+            let remoteSequenceNumber = currentSequenceNumber;
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 3,
+                end: 6,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.markRangeRemoved)({
+                mergeTree,
+                start: 4,
+                end: 5,
+                refSeq: remoteSequenceNumber,
+                clientId: remoteClientId,
+                seq: ++remoteSequenceNumber,
+                overwrite: false,
+                opArgs: undefined,
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                /* MergeTreeDeltaType.REMOVE is absent as it should not be fired. */
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 2,
+            });
+        });
+    });
+});
+//# sourceMappingURL=mergeTree.markRangeRemoved.deltaCallback.spec.js.map

package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.markRangeRemoved.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.deltaCallback.spec.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 { strict as assert } from \"assert\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber } from \"../constants\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback\";\nimport { MergeTreeDeltaType } from \"../ops\";\nimport { TextSegment } from \"../textSegment\";\nimport { MergeTree } from \"../mergeTree\";\nimport { countOperations, insertSegments, markRangeRemoved } from \"./testUtils\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\tbeforeEach(() => {\n\t\tmergeTree = new MergeTree();\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(\"hello world!\")],\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined,\n\t\t});\n\t\tcurrentSequenceNumber = 0;\n\t\tmergeTree.startCollaboration(\n\t\t\tlocalClientId,\n\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t);\n\t});\n\n\tdescribe(\"markRangeRemoved\", () => {\n\t\tit(\"Event on Removal\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\t// Verify that zamboni unlinks a removed segment and raises the appropriate maintenance event.\n\t\tit(\"Event on Unlink\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tconst start = 4;\n\t\t\tconst end = 6;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart,\n\t\t\t\tend,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\t// In order for the removed segment to unlinked by zamboni, we need to ACK the segment\n\t\t\t// and advance the collaboration window's minSeq past the removedSeq.\n\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\top: {\n\t\t\t\t\tpos1: start,\n\t\t\t\t\tpos2: end,\n\t\t\t\t\ttype: MergeTreeDeltaType.REMOVE,\n\t\t\t\t},\n\t\t\t\tsequencedMessage: {\n\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t});\n\n\t\t\t// Move currentSeq/minSeq past the seq# at which the removal was ACKed.\n\t\t\tmergeTree.collabWindow.currentSeq = currentSequenceNumber;\n\t\t\tmergeTree.setMinSeq(currentSequenceNumber);\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t\t[MergeTreeMaintenanceType.UNLINK]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.ACKNOWLEDGED]: 1,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Remote Before Local\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local Before Remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local delete shadows remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t/* MergeTreeDeltaType.REMOVE is absent as it should not be fired. */\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\t});\n});\n"]}

package/dist/test/mergeTree.markRangeRemoved.spec.d.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+export {};
+//# sourceMappingURL=mergeTree.markRangeRemoved.spec.d.ts.map

package/dist/test/mergeTree.markRangeRemoved.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.markRangeRemoved.spec.d.ts","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/test/mergeTree.markRangeRemoved.spec.js

@@ -0,0 +1,130 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const constants_1 = require("../constants");
+const opBuilder_1 = require("../opBuilder");
+const textSegment_1 = require("../textSegment");
+const testClient_1 = require("./testClient");
+describe("MergeTree.markRangeRemoved", () => {
+    let client;
+    beforeEach(() => {
+        client = new testClient_1.TestClient();
+        client.startOrUpdateCollaboration("local");
+        for (const char of "hello world") {
+            client.applyMsg(client.makeOpMessage(client.insertTextLocal(client.getLength(), char), client.getCurrentSeq() + 1));
+        }
+        assert_1.strict.equal(client.getText(), "hello world");
+    });
+    it("local remove followed by local insert", () => {
+        client.removeRangeLocal(0, client.getLength());
+        assert_1.strict.equal(client.getText(), "");
+        client.insertTextLocal(0, "text");
+        assert_1.strict.equal(client.getText(), "text");
+    });
+    it("local insert followed by local remove", () => {
+        client.insertTextLocal(0, "text");
+        assert_1.strict.equal(client.getText(), "texthello world");
+        client.removeRangeLocal(0, client.getLength());
+        assert_1.strict.equal(client.getText(), "");
+    });
+    it("remote remove followed by local insert", () => {
+        client.applyMsg(client.makeOpMessage((0, opBuilder_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote"));
+        assert_1.strict.equal(client.getText(), "");
+        client.insertTextLocal(0, "text");
+        assert_1.strict.equal(client.getText(), "text");
+    });
+    it("local remove followed by remote insert", () => {
+        client.removeRangeLocal(0, client.getLength());
+        assert_1.strict.equal(client.getText(), "");
+        client.applyMsg(client.makeOpMessage((0, opBuilder_1.createInsertSegmentOp)(0, textSegment_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote"));
+        assert_1.strict.equal(client.getText(), "text");
+    });
+    it("local remove followed by remote overlapping remove", () => {
+        const originalSeq = client.getCurrentSeq();
+        let seq = originalSeq;
+        const remoteDeleteMessage = client.makeOpMessage((0, opBuilder_1.createRemoveRangeOp)(0, client.getLength()), ++seq, undefined, "remote");
+        const segmentExpectedRemovedSeq = seq;
+        const { segment } = client.getContainingSegment(0);
+        (0, assert_1.strict)(segment !== undefined, "expected to find segment");
+        const localDeleteMessage = client.makeOpMessage(client.removeRangeLocal(0, client.getLength()), ++seq, originalSeq /* refSeq */);
+        assert_1.strict.equal(client.getText(), "");
+        assert_1.strict.equal(segment.removedSeq, constants_1.UnassignedSequenceNumber);
+        (0, assert_1.strict)(segment.localRemovedSeq !== undefined);
+        const expectedLocalRemovedSeq = segment.localRemovedSeq;
+        client.applyMsg(remoteDeleteMessage);
+        assert_1.strict.equal(segment.removedSeq, segmentExpectedRemovedSeq);
+        assert_1.strict.equal(segment.localRemovedSeq, expectedLocalRemovedSeq);
+        assert_1.strict.equal(client.getText(), "");
+        // localRemovedSeq should remain on the segment until the local removal has been acked.
+        // This ensures there's enough information to determine segment length in the case of
+        // reconnect.
+        client.applyMsg(localDeleteMessage);
+        assert_1.strict.equal(segment.removedSeq, segmentExpectedRemovedSeq);
+        assert_1.strict.equal(segment.localRemovedSeq, undefined);
+        assert_1.strict.equal(client.getText(), "");
+    });
+    it("remote remove followed by remote insert", () => {
+        const removeMsg = client.makeOpMessage((0, opBuilder_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote2");
+        const insertMsg = client.makeOpMessage((0, opBuilder_1.createInsertSegmentOp)(0, textSegment_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 2, client.mergeTree.collabWindow.currentSeq, "remote");
+        client.applyMsg(removeMsg);
+        client.applyMsg(insertMsg);
+        assert_1.strict.equal(client.getText(), "text");
+    });
+    it("remote insert followed by remote remove", () => {
+        const insertMsg = client.makeOpMessage((0, opBuilder_1.createInsertSegmentOp)(0, textSegment_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote");
+        const removeMsg = client.makeOpMessage((0, opBuilder_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 2, client.mergeTree.collabWindow.currentSeq, "remote2");
+        client.applyMsg(insertMsg);
+        client.applyMsg(removeMsg);
+        assert_1.strict.equal(client.getText(), "text");
+    });
+    it("local and remote clients race to insert at position of removed segment", () => {
+        // Note: This test constructs its own TestClients to avoid being initialized with "hello world".
+        // First we run through the ops from the perspective of a passive observer (i.e., all operations are remote).
+        const expected = new testClient_1.TestClient();
+        expected.startOrUpdateCollaboration("3");
+        {
+            let seq = 0;
+            // Client 1 locally inserts and removes the letter "a".
+            expected.insertTextRemote(0, "a", undefined, ++seq, 
+            /* refSeq: */ 0, 
+            /* longClientId: */ "1");
+            expected.removeRangeRemote(0, 1, ++seq, /* refSeq: */ 0, /* longClientId: */ "1");
+            const refSeqAt2 = expected.getCurrentSeq();
+            // In parallel, Client 2 inserted "x" without knowledge of Client 1's insertion/removal.
+            expected.insertTextRemote(0, "X", undefined, ++seq, 
+            /* refSeq: */ 0, 
+            /* longClientId: */ "2");
+            // Client 1 inserts "c" having received acks for its own edits, but has not yet having
+            // observed the insertion of "X" from client 2.
+            expected.insertTextRemote(0, "c", undefined, ++seq, refSeqAt2, /* longClientId: */ "1");
+        }
+        // Next, we run through the same sequence from the perspective of client 1:
+        const actual = new testClient_1.TestClient();
+        actual.startOrUpdateCollaboration("1");
+        {
+            let seq = 0;
+            // Client 1 locally inserts and removes the letter "a".
+            const op1 = actual.insertTextLocal(0, "a");
+            const op2 = actual.removeRangeLocal(0, 1);
+            // Client 1 receives ACKs for op1 and op2.
+            actual.applyMsg(actual.makeOpMessage(op1, ++seq, /* refSeq: */ 0));
+            actual.applyMsg(actual.makeOpMessage(op2, ++seq, /* refSeq: */ 0));
+            const refSeqAt2 = actual.getCurrentSeq();
+            // Client 1 locally inserts "c".
+            const op4 = actual.insertTextLocal(0, "c");
+            // Client 1 then processes the parallel insertion of "X" from Client 2 at refSeq=0
+            actual.insertTextRemote(0, "X", undefined, ++seq, 
+            /* refSeq: */ 0, 
+            /* longClientId: */ "2");
+            // Finally, client 1 receives the ack for its insertion of "c".
+            actual.applyMsg(actual.makeOpMessage(op4, ++seq, refSeqAt2));
+        }
+        assert_1.strict.equal(actual.getText(), expected.getText());
+    });
+});
+//# sourceMappingURL=mergeTree.markRangeRemoved.spec.js.map

package/dist/test/mergeTree.markRangeRemoved.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.markRangeRemoved.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.spec.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/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"assert\";\nimport { UnassignedSequenceNumber } from \"../constants\";\nimport { createInsertSegmentOp, createRemoveRangeOp } from \"../opBuilder\";\nimport { TextSegment } from \"../textSegment\";\nimport { TestClient } from \"./testClient\";\n\ndescribe(\"MergeTree.markRangeRemoved\", () => {\n\tlet client: TestClient;\n\tbeforeEach(() => {\n\t\tclient = new TestClient();\n\t\tclient.startOrUpdateCollaboration(\"local\");\n\t\tfor (const char of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), char),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.equal(client.getText(), \"hello world\");\n\t});\n\n\tit(\"local remove followed by local insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local insert followed by local remove\", () => {\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"texthello world\");\n\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by local insert\", () => {\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote overlapping remove\", () => {\n\t\tconst originalSeq = client.getCurrentSeq();\n\t\tlet seq = originalSeq;\n\t\tconst remoteDeleteMessage = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t++seq,\n\t\t\tundefined,\n\t\t\t\"remote\",\n\t\t);\n\t\tconst segmentExpectedRemovedSeq = seq;\n\t\tconst { segment } = client.getContainingSegment(0);\n\t\tassert(segment !== undefined, \"expected to find segment\");\n\t\tconst localDeleteMessage = client.makeOpMessage(\n\t\t\tclient.removeRangeLocal(0, client.getLength()),\n\t\t\t++seq,\n\t\t\toriginalSeq /* refSeq */,\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\t\tassert.equal(segment.removedSeq, UnassignedSequenceNumber);\n\t\tassert(segment.localRemovedSeq !== undefined);\n\t\tconst expectedLocalRemovedSeq = segment.localRemovedSeq;\n\n\t\tclient.applyMsg(remoteDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, expectedLocalRemovedSeq);\n\t\tassert.equal(client.getText(), \"\");\n\n\t\t// localRemovedSeq should remain on the segment until the local removal has been acked.\n\t\t// This ensures there's enough information to determine segment length in the case of\n\t\t// reconnect.\n\t\tclient.applyMsg(localDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, undefined);\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by remote insert\", () => {\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tclient.applyMsg(removeMsg);\n\t\tclient.applyMsg(insertMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"remote insert followed by remote remove\", () => {\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tclient.applyMsg(insertMsg);\n\t\tclient.applyMsg(removeMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local and remote clients race to insert at position of removed segment\", () => {\n\t\t// Note: This test constructs its own TestClients to avoid being initialized with \"hello world\".\n\n\t\t// First we run through the ops from the perspective of a passive observer (i.e., all operations are remote).\n\t\tconst expected = new TestClient();\n\t\texpected.startOrUpdateCollaboration(\"3\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"a\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"1\",\n\t\t\t);\n\t\t\texpected.removeRangeRemote(0, 1, ++seq, /* refSeq: */ 0, /* longClientId: */ \"1\");\n\t\t\tconst refSeqAt2 = expected.getCurrentSeq();\n\n\t\t\t// In parallel, Client 2 inserted \"x\" without knowledge of Client 1's insertion/removal.\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Client 1 inserts \"c\" having received acks for its own edits, but has not yet having\n\t\t\t// observed the insertion of \"X\" from client 2.\n\t\t\texpected.insertTextRemote(0, \"c\", undefined, ++seq, refSeqAt2, /* longClientId: */ \"1\");\n\t\t}\n\n\t\t// Next, we run through the same sequence from the perspective of client 1:\n\t\tconst actual = new TestClient();\n\t\tactual.startOrUpdateCollaboration(\"1\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\tconst op1 = actual.insertTextLocal(0, \"a\")!;\n\t\t\tconst op2 = actual.removeRangeLocal(0, 1);\n\n\t\t\t// Client 1 receives ACKs for op1 and op2.\n\t\t\tactual.applyMsg(actual.makeOpMessage(op1, ++seq, /* refSeq: */ 0));\n\t\t\tactual.applyMsg(actual.makeOpMessage(op2, ++seq, /* refSeq: */ 0));\n\t\t\tconst refSeqAt2 = actual.getCurrentSeq();\n\n\t\t\t// Client 1 locally inserts \"c\".\n\t\t\tconst op4 = actual.insertTextLocal(0, \"c\");\n\n\t\t\t// Client 1 then processes the parallel insertion of \"X\" from Client 2 at refSeq=0\n\t\t\tactual.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Finally, client 1 receives the ack for its insertion of \"c\".\n\t\t\tactual.applyMsg(actual.makeOpMessage(op4, ++seq, refSeqAt2));\n\t\t}\n\n\t\tassert.equal(actual.getText(), expected.getText());\n\t});\n});\n"]}

package/dist/test/mergeTree.walk.spec.d.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+export {};
+//# sourceMappingURL=mergeTree.walk.spec.d.ts.map

package/dist/test/mergeTree.walk.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.walk.spec.d.ts","sourceRoot":"","sources":["../../src/test/mergeTree.walk.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/test/mergeTree.walk.spec.js

@@ -0,0 +1,63 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const mergeTreeNodes_1 = require("../mergeTreeNodes");
+const textSegment_1 = require("../textSegment");
+const constants_1 = require("../constants");
+const mergeTree_1 = require("../mergeTree");
+const mergeTreeNodeWalk_1 = require("../mergeTreeNodeWalk");
+const testUtils_1 = require("./testUtils");
+const localClientId = 17;
+describe("MergeTree walks", () => {
+    let mergeTree;
+    beforeEach(() => {
+        let initialText = "0";
+        mergeTree = new mergeTree_1.MergeTree();
+        mergeTree.insertSegments(0, [textSegment_1.TextSegment.make(initialText)], constants_1.UniversalSequenceNumber, constants_1.LocalClientId, constants_1.UniversalSequenceNumber, undefined);
+        for (let i = 1; i < mergeTreeNodes_1.MaxNodesInBlock * mergeTreeNodes_1.MaxNodesInBlock; i++) {
+            const text = i.toString();
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: mergeTree.getLength(constants_1.UniversalSequenceNumber, localClientId),
+                refSeq: constants_1.UniversalSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UniversalSequenceNumber,
+                text,
+                props: undefined,
+                opArgs: undefined,
+            });
+            initialText += text;
+        }
+    });
+    describe("walkAllChildSegments", () => {
+        function* getAllDescendantBlocks(block) {
+            yield block;
+            for (let i = 0; i < block.childCount; i++) {
+                const child = block.children[i];
+                if (!child.isLeaf()) {
+                    yield* getAllDescendantBlocks(child);
+                }
+            }
+        }
+        it("visits only descendants", () => {
+            for (const block of getAllDescendantBlocks(mergeTree.root)) {
+                let walkedAnySegments = false;
+                (0, mergeTreeNodeWalk_1.walkAllChildSegments)(block, (seg) => {
+                    walkedAnySegments = true;
+                    let current = seg.parent;
+                    while (current !== block && current !== undefined) {
+                        current = current.parent;
+                    }
+                    (0, assert_1.strict)(current === block, "Expected all visited segments to be descendants");
+                    return true;
+                });
+                (0, assert_1.strict)(walkedAnySegments, "Walk should have hit segments");
+            }
+        });
+    });
+});
+//# sourceMappingURL=mergeTree.walk.spec.js.map

package/dist/test/mergeTree.walk.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.walk.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.walk.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,mCAA0C;AAC1C,sDAA6E;AAC7E,gDAA6C;AAC7C,4CAAsE;AACtE,4CAAyC;AACzC,4DAA4D;AAC5D,2CAAyC;AAEzC,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,SAAoB,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE;QACf,IAAI,WAAW,GAAG,GAAG,CAAC;QACtB,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAC5B,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,yBAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,mCAAuB,EACvB,yBAAa,EACb,mCAAuB,EACvB,SAAS,CACT,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gCAAe,GAAG,gCAAe,EAAE,CAAC,EAAE,EAAE;YAC3D,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAA,sBAAU,EAAC;gBACV,SAAS;gBACT,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,mCAAuB,EAAE,aAAa,CAAC;gBAChE,MAAM,EAAE,mCAAuB;gBAC/B,QAAQ,EAAE,aAAa;gBACvB,GAAG,EAAE,mCAAuB;gBAC5B,IAAI;gBACJ,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,WAAW,IAAI,IAAI,CAAC;SACpB;IACF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACrC,QAAQ,CAAC,CAAC,sBAAsB,CAAC,KAAkB;YAClD,MAAM,KAAK,CAAC;YACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;oBACpB,KAAK,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;iBACrC;aACD;QACF,CAAC;QAED,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;YAClC,KAAK,MAAM,KAAK,IAAI,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBAC3D,IAAI,iBAAiB,GAAG,KAAK,CAAC;gBAC9B,IAAA,wCAAoB,EAAC,KAAK,EAAE,CAAC,GAAe,EAAE,EAAE;oBAC/C,iBAAiB,GAAG,IAAI,CAAC;oBACzB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;oBACzB,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,SAAS,EAAE;wBAClD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;qBACzB;oBACD,IAAA,eAAM,EAAC,OAAO,KAAK,KAAK,EAAE,iDAAiD,CAAC,CAAC;oBAC7E,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC,CAAC;gBACH,IAAA,eAAM,EAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAC;aAC3D;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { IMergeBlock, IMergeLeaf, MaxNodesInBlock } from \"../mergeTreeNodes\";\nimport { TextSegment } from \"../textSegment\";\nimport { LocalClientId, UniversalSequenceNumber } from \"../constants\";\nimport { MergeTree } from \"../mergeTree\";\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk\";\nimport { insertText } from \"./testUtils\";\n\nconst localClientId = 17;\n\ndescribe(\"MergeTree walks\", () => {\n\tlet mergeTree: MergeTree;\n\tbeforeEach(() => {\n\t\tlet initialText = \"0\";\n\t\tmergeTree = new MergeTree();\n\t\tmergeTree.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(initialText)],\n\t\t\tUniversalSequenceNumber,\n\t\t\tLocalClientId,\n\t\t\tUniversalSequenceNumber,\n\t\t\tundefined,\n\t\t);\n\t\tfor (let i = 1; i < MaxNodesInBlock * MaxNodesInBlock; i++) {\n\t\t\tconst text = i.toString();\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\ttext,\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tinitialText += text;\n\t\t}\n\t});\n\n\tdescribe(\"walkAllChildSegments\", () => {\n\t\tfunction* getAllDescendantBlocks(block: IMergeBlock): Iterable<IMergeBlock> {\n\t\t\tyield block;\n\t\t\tfor (let i = 0; i < block.childCount; i++) {\n\t\t\t\tconst child = block.children[i];\n\t\t\t\tif (!child.isLeaf()) {\n\t\t\t\t\tyield* getAllDescendantBlocks(child);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tit(\"visits only descendants\", () => {\n\t\t\tfor (const block of getAllDescendantBlocks(mergeTree.root)) {\n\t\t\t\tlet walkedAnySegments = false;\n\t\t\t\twalkAllChildSegments(block, (seg: IMergeLeaf) => {\n\t\t\t\t\twalkedAnySegments = true;\n\t\t\t\t\tlet current = seg.parent;\n\t\t\t\t\twhile (current !== block && current !== undefined) {\n\t\t\t\t\t\tcurrent = current.parent;\n\t\t\t\t\t}\n\t\t\t\t\tassert(current === block, \"Expected all visited segments to be descendants\");\n\t\t\t\t\treturn true;\n\t\t\t\t});\n\t\t\t\tassert(walkedAnySegments, \"Walk should have hit segments\");\n\t\t\t}\n\t\t});\n\t});\n});\n"]}

package/dist/test/mergeTree.zamboni.spec.d.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+export {};
+//# sourceMappingURL=mergeTree.zamboni.spec.d.ts.map

package/dist/test/mergeTree.zamboni.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.zamboni.spec.d.ts","sourceRoot":"","sources":["../../src/test/mergeTree.zamboni.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/test/mergeTree.zamboni.spec.js

@@ -0,0 +1,52 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const zamboni_1 = require("../zamboni");
+const testClient_1 = require("./testClient");
+describe("Zamboni Logic", () => {
+    let client;
+    const localUserLongId = "localUser";
+    beforeEach(() => {
+        client = new testClient_1.TestClient();
+        for (const c of "hello world") {
+            client.insertTextLocal(client.getLength(), c);
+        }
+        client.startOrUpdateCollaboration(localUserLongId);
+    });
+    it("packParent with no children segments", () => {
+        client.applyMsg(client.makeOpMessage(client.removeRangeLocal(0, client.getLength() - 1), 1));
+        (0, zamboni_1.packParent)(client.mergeTree.root, client.mergeTree);
+        assert_1.strict.equal(client.mergeTree.root.cachedLength, 1);
+        client.applyMsg(client.makeOpMessage(client.removeRangeLocal(0, client.getLength()), client.getCurrentSeq(), client.getCurrentSeq(), undefined, client.getCurrentSeq()));
+        assert_1.strict.equal(client.mergeTree.root.cachedLength ?? 0, 0);
+        (0, zamboni_1.packParent)(client.mergeTree.root, client.mergeTree);
+        assert_1.strict.equal(client.mergeTree.root.childCount, 0);
+    });
+    it("zamboni with no segments to scour", () => {
+        const cachedLength = client.mergeTree.root.cachedLength;
+        const childCount = client.mergeTree.root.childCount;
+        (0, zamboni_1.zamboniSegments)(client.mergeTree);
+        assert_1.strict.equal(cachedLength, client.mergeTree.root.cachedLength);
+        assert_1.strict.equal(childCount, client.mergeTree.root.childCount);
+    });
+    it("zamboni with one segment to scour", () => {
+        const initialChildCount = client.mergeTree.root.children[0].childCount;
+        const initialCachedLength = client.mergeTree.root.cachedLength ?? 0;
+        client.removeRangeLocal(0, 1);
+        (0, zamboni_1.zamboniSegments)(client.mergeTree);
+        assert_1.strict.equal(client.mergeTree.root.cachedLength, initialCachedLength - 1);
+        assert_1.strict.equal(client.mergeTree.root.children[0].childCount, initialChildCount);
+    });
+    it("zamboni with many segments to scour", () => {
+        client.removeRangeLocal(0, 6);
+        assert_1.strict.equal(client.mergeTree.root.children[0].cachedLength, 0);
+        (0, zamboni_1.zamboniSegments)(client.mergeTree);
+        (0, zamboni_1.packParent)(client.mergeTree.root, client.mergeTree);
+        assert_1.strict.equal(client.mergeTree.root.childCount, 1);
+    });
+});
+//# sourceMappingURL=mergeTree.zamboni.spec.js.map

package/dist/test/mergeTree.zamboni.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.zamboni.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.zamboni.spec.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 { strict as assert } from \"assert\";\nimport { IMergeBlock } from \"../mergeTreeNodes\";\nimport { zamboniSegments, packParent } from \"../zamboni\";\nimport { TestClient } from \"./testClient\";\n\ndescribe(\"Zamboni Logic\", () => {\n\tlet client: TestClient;\n\tconst localUserLongId = \"localUser\";\n\tbeforeEach(() => {\n\t\tclient = new TestClient();\n\t\tfor (const c of \"hello world\") {\n\t\t\tclient.insertTextLocal(client.getLength(), c);\n\t\t}\n\t\tclient.startOrUpdateCollaboration(localUserLongId);\n\t});\n\tit(\"packParent with no children segments\", () => {\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(client.removeRangeLocal(0, client.getLength() - 1), 1),\n\t\t);\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\t\tassert.equal(client.mergeTree.root.cachedLength, 1);\n\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tclient.removeRangeLocal(0, client.getLength()),\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\tundefined,\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t),\n\t\t);\n\t\tassert.equal(client.mergeTree.root.cachedLength ?? 0, 0);\n\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.childCount, 0);\n\t});\n\tit(\"zamboni with no segments to scour\", () => {\n\t\tconst cachedLength = client.mergeTree.root.cachedLength;\n\t\tconst childCount = client.mergeTree.root.childCount;\n\n\t\tzamboniSegments(client.mergeTree);\n\n\t\tassert.equal(cachedLength, client.mergeTree.root.cachedLength);\n\t\tassert.equal(childCount, client.mergeTree.root.childCount);\n\t});\n\tit(\"zamboni with one segment to scour\", () => {\n\t\tconst initialChildCount = (client.mergeTree.root.children[0] as IMergeBlock).childCount;\n\t\tconst initialCachedLength = client.mergeTree.root.cachedLength ?? 0;\n\t\tclient.removeRangeLocal(0, 1);\n\t\tzamboniSegments(client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.cachedLength, initialCachedLength - 1);\n\t\tassert.equal(\n\t\t\t(client.mergeTree.root.children[0] as IMergeBlock).childCount,\n\t\t\tinitialChildCount,\n\t\t);\n\t});\n\tit(\"zamboni with many segments to scour\", () => {\n\t\tclient.removeRangeLocal(0, 6);\n\n\t\tassert.equal(client.mergeTree.root.children[0].cachedLength, 0);\n\n\t\tzamboniSegments(client.mergeTree);\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.childCount, 1);\n\t});\n});\n"]}

package/dist/test/mergeTreeOperationRunner.d.ts

@@ -0,0 +1,63 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { IRandom } from "@fluid-private/stochastic-test-utils";
+import { IMergeTreeOp } from "../ops";
+import { SegmentGroup } from "../mergeTreeNodes";
+import { TestClient } from "./testClient";
+import { TestClientLogger } from "./testClientLogger";
+export type TestOperation = (client: TestClient, opStart: number, opEnd: number, random: IRandom) => IMergeTreeOp | undefined;
+export declare const removeRange: TestOperation;
+export declare const obliterateRange: TestOperation;
+export declare const annotateRange: TestOperation;
+export declare const insertAtRefPos: TestOperation;
+export declare const insert: TestOperation;
+export interface IConfigRange {
+    min: number;
+    max: number;
+    growthFunc?: (input: number) => number;
+}
+export declare function doOverRange(range: IConfigRange, defaultGrowthFunc: (input: number) => number, doAction: (current: number) => void): void;
+export declare function resolveRange(range: IConfigRange, defaultGrowthFunc: (input: number) => number): number[];
+export declare function resolveRanges<T extends object>(ranges: T, defaultGrowthFunc: (input: number) => number): ResolvedRanges<T>;
+type ReplaceRangeWith<T, TReplace> = T extends {
+    min: number;
+    max: number;
+} ? TReplace : never;
+type RangePropertyNames<T> = {
+    [K in keyof T]-?: T[K] extends IConfigRange ? K : never;
+}[keyof T];
+type PickFromRanges<T> = {
+    [K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number>;
+};
+type ResolvedRanges<T> = {
+    [K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number[]>;
+};
+interface ProvidesGrowthFunc {
+    growthFunc: (input: number) => number;
+}
+export declare function doOverRanges<T extends ProvidesGrowthFunc>(ranges: T, doAction: (selection: PickFromRanges<T>, description: string) => void): void;
+export interface IMergeTreeOperationRunnerConfig {
+    readonly rounds: number;
+    readonly opsPerRoundRange: IConfigRange;
+    readonly incrementalLog?: boolean;
+    readonly operations: readonly TestOperation[];
+    growthFunc(input: number): number;
+    resultsFilePostfix?: string;
+}
+export interface ReplayGroup {
+    msgs: ISequencedDocumentMessage[];
+    initialText: string;
+    resultText: string;
+    seq: number;
+}
+export declare const replayResultsPath: string;
+export declare function runMergeTreeOperationRunner(random: IRandom, startingSeq: number, clients: readonly TestClient[], minLength: number, config: IMergeTreeOperationRunnerConfig, apply?: ApplyMessagesFn): number;
+export declare function generateOperationMessagesForClients(random: IRandom, startingSeq: number, clients: readonly TestClient[], logger: TestClientLogger, opsPerRound: number, minLength: number, operations: readonly TestOperation[]): [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][];
+export declare function generateClientNames(): string[];
+type ApplyMessagesFn = (startingSeq: number, messageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][], clients: readonly TestClient[], logger: TestClientLogger, random: IRandom) => number;
+export declare function applyMessages(startingSeq: number, messageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][], clients: readonly TestClient[], logger: TestClientLogger): number;
+export {};
+//# sourceMappingURL=mergeTreeOperationRunner.d.ts.map

package/dist/test/mergeTreeOperationRunner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTreeOperationRunner.d.ts","sourceRoot":"","sources":["../../src/test/mergeTreeOperationRunner.ts"],"names":[],"mappings":"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"}