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

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

@@ -0,0 +1,126 @@
+"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 mergeTree_1 = require("../mergeTree");
+const ops_1 = require("../ops");
+const textSegment_1 = require("../textSegment");
+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("insertText", () => {
+        it("Insert starting text", () => {
+            let eventCalled = 0;
+            mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
+                eventCalled++;
+            };
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: 0,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                text: "more ",
+                props: undefined,
+                opArgs: { op: { type: ops_1.MergeTreeDeltaType.INSERT } },
+            });
+            assert_1.strict.equal(eventCalled, 1);
+        });
+        it("Insert ending text", () => {
+            const textLength = mergeTree.getLength(currentSequenceNumber, localClientId);
+            let eventCalled = 0;
+            mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
+                eventCalled++;
+            };
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: textLength,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                text: "more ",
+                props: undefined,
+                opArgs: { op: { type: ops_1.MergeTreeDeltaType.INSERT } },
+            });
+            assert_1.strict.equal(eventCalled, 1);
+        });
+        it("Insert middle text", () => {
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: 4,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                text: "more ",
+                props: undefined,
+                opArgs: { op: { type: ops_1.MergeTreeDeltaType.INSERT } },
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.INSERT]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 1,
+            });
+        });
+        it("Insert text remote", () => {
+            const remoteClientId = 35;
+            let remoteSequenceNumber = currentSequenceNumber;
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: 0,
+                refSeq: currentSequenceNumber,
+                clientId: remoteClientId,
+                seq: ++remoteSequenceNumber,
+                text: "more ",
+                props: undefined,
+                opArgs: { op: { type: ops_1.MergeTreeDeltaType.INSERT } },
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.INSERT]: 1,
+            });
+        });
+    });
+    describe("insertMarker", () => {
+        it("Insert marker", () => {
+            const count = (0, testUtils_1.countOperations)(mergeTree);
+            (0, testUtils_1.insertMarker)({
+                mergeTree,
+                pos: 4,
+                refSeq: currentSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                behaviors: ops_1.ReferenceType.Simple,
+                props: undefined,
+                opArgs: { op: { type: ops_1.MergeTreeDeltaType.INSERT } },
+            });
+            assert_1.strict.deepStrictEqual(count, {
+                [ops_1.MergeTreeDeltaType.INSERT]: 1,
+                [mergeTreeDeltaCallback_1.MergeTreeMaintenanceType.SPLIT]: 1,
+            });
+        });
+    });
+});
+//# sourceMappingURL=mergeTree.insert.deltaCallback.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.insert.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.insert.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 { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber } from \"../constants\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback\";\nimport { MergeTree } from \"../mergeTree\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops\";\nimport { TextSegment } from \"../textSegment\";\nimport { countOperations, insertMarker, insertSegments, insertText } 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\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(\"insertText\", () => {\n\t\tit(\"Insert starting text\", () => {\n\t\t\tlet eventCalled: number = 0;\n\n\t\t\tmergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.equal(eventCalled, 1);\n\t\t});\n\n\t\tit(\"Insert ending text\", () => {\n\t\t\tconst textLength = mergeTree.getLength(currentSequenceNumber, localClientId);\n\t\t\tlet eventCalled: number = 0;\n\n\t\t\tmergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: textLength,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.equal(eventCalled, 1);\n\t\t});\n\n\t\tit(\"Insert middle text\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 4,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 1,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Insert text remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t});\n\t\t});\n\t});\n\tdescribe(\"insertMarker\", () => {\n\t\tit(\"Insert marker\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertMarker({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 4,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\tbehaviors: ReferenceType.Simple,\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 1,\n\t\t\t});\n\t\t});\n\t});\n});\n"]}

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

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

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

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

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

@@ -0,0 +1,279 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+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 MergeTreeTextHelper_1 = require("../MergeTreeTextHelper");
+const mergeTreeNodeWalk_1 = require("../mergeTreeNodeWalk");
+const testUtils_1 = require("./testUtils");
+const localClientId = 17;
+const treeFactories = [
+    {
+        create: () => {
+            const initialText = "hello world";
+            const mergeTree = new mergeTree_1.MergeTree();
+            (0, testUtils_1.insertSegments)({
+                mergeTree,
+                pos: 0,
+                segments: [textSegment_1.TextSegment.make(initialText)],
+                refSeq: constants_1.UniversalSequenceNumber,
+                clientId: constants_1.LocalClientId,
+                seq: constants_1.UniversalSequenceNumber,
+                opArgs: undefined,
+            });
+            mergeTree.startCollaboration(localClientId, 
+            /* minSeq: */ constants_1.UniversalSequenceNumber, 
+            /* currentSeq: */ constants_1.UniversalSequenceNumber);
+            return {
+                initialText,
+                mergeTree,
+                middle: Math.round(initialText.length / 2),
+                refSeq: constants_1.UniversalSequenceNumber,
+                textHelper: new MergeTreeTextHelper_1.MergeTreeTextHelper(mergeTree),
+            };
+        },
+        name: "single segment tree",
+    },
+    {
+        create: () => {
+            let initialText = "0";
+            const mergeTree = new mergeTree_1.MergeTree();
+            (0, testUtils_1.insertSegments)({
+                mergeTree,
+                pos: 0,
+                segments: [textSegment_1.TextSegment.make(initialText)],
+                refSeq: constants_1.UniversalSequenceNumber,
+                clientId: constants_1.LocalClientId,
+                seq: constants_1.UniversalSequenceNumber,
+                opArgs: undefined,
+            });
+            for (let i = 1; i < mergeTreeNodes_1.MaxNodesInBlock - 1; 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;
+            }
+            const textHelper = new MergeTreeTextHelper_1.MergeTreeTextHelper(mergeTree);
+            assert_1.strict.equal(textHelper.getText(constants_1.UniversalSequenceNumber, localClientId), initialText);
+            const nodes = [mergeTree.root];
+            while (nodes.length > 0) {
+                const node = nodes.pop();
+                assert_1.strict.equal(node.childCount, mergeTreeNodes_1.MaxNodesInBlock - 1);
+                const childrenBlocks = node.children
+                    .map((v) => v)
+                    .filter((v) => v === undefined);
+                nodes.push(...childrenBlocks);
+            }
+            mergeTree.startCollaboration(localClientId, 
+            /* minSeq: */ constants_1.UniversalSequenceNumber, 
+            /* currentSeq: */ constants_1.UniversalSequenceNumber);
+            return {
+                initialText,
+                mergeTree,
+                middle: Math.round(mergeTreeNodes_1.MaxNodesInBlock / 2),
+                refSeq: constants_1.UniversalSequenceNumber,
+                textHelper,
+            };
+        },
+        name: "Full single layer tree",
+    },
+    {
+        create: () => {
+            let initialText = "0";
+            const mergeTree = new mergeTree_1.MergeTree();
+            (0, testUtils_1.insertSegments)({
+                mergeTree,
+                pos: 0,
+                segments: [textSegment_1.TextSegment.make(initialText)],
+                refSeq: constants_1.UniversalSequenceNumber,
+                clientId: constants_1.LocalClientId,
+                seq: constants_1.UniversalSequenceNumber,
+                opArgs: undefined,
+            });
+            for (let i = 1; i < mergeTreeNodes_1.MaxNodesInBlock * 4; 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;
+            }
+            const remove = Math.round(initialText.length / 4);
+            // remove from start
+            mergeTree.markRangeRemoved(0, remove, constants_1.UniversalSequenceNumber, localClientId, constants_1.UniversalSequenceNumber, false, undefined);
+            initialText = initialText.substring(remove);
+            // remove from end
+            mergeTree.markRangeRemoved(initialText.length - remove, initialText.length, constants_1.UniversalSequenceNumber, localClientId, constants_1.UniversalSequenceNumber, false, undefined);
+            initialText = initialText.substring(0, initialText.length - remove);
+            mergeTree.startCollaboration(localClientId, 
+            /* minSeq: */ constants_1.UniversalSequenceNumber, 
+            /* currentSeq: */ constants_1.UniversalSequenceNumber);
+            return {
+                initialText,
+                mergeTree,
+                middle: Math.round(initialText.length / 2),
+                refSeq: constants_1.UniversalSequenceNumber,
+                textHelper: new MergeTreeTextHelper_1.MergeTreeTextHelper(mergeTree),
+            };
+        },
+        name: "Tree with remove segments",
+    },
+];
+describe("MergeTree.insertingWalk", () => {
+    treeFactories.forEach((tf) => {
+        describe(tf.name, () => {
+            const treeFactory = tf;
+            let testData;
+            beforeEach(() => {
+                testData = treeFactory.create();
+                (0, assert_1.strict)((0, testUtils_1.nodeOrdinalsHaveIntegrity)(testData.mergeTree.root));
+            });
+            afterEach(() => {
+                (0, assert_1.strict)((0, testUtils_1.nodeOrdinalsHaveIntegrity)(testData.mergeTree.root));
+            });
+            describe("insertText", () => {
+                it("at beginning", () => {
+                    (0, testUtils_1.insertText)({
+                        mergeTree: testData.mergeTree,
+                        pos: 0,
+                        refSeq: testData.refSeq,
+                        clientId: localClientId,
+                        seq: constants_1.UnassignedSequenceNumber,
+                        text: "a",
+                        props: undefined,
+                        opArgs: undefined,
+                    });
+                    assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
+                    assert_1.strict.equal(currentValue, `a${testData.initialText}`);
+                });
+                it("at end", () => {
+                    (0, testUtils_1.insertText)({
+                        mergeTree: testData.mergeTree,
+                        pos: testData.initialText.length,
+                        refSeq: testData.refSeq,
+                        clientId: localClientId,
+                        seq: constants_1.UnassignedSequenceNumber,
+                        text: "a",
+                        props: undefined,
+                        opArgs: undefined,
+                    });
+                    assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
+                    assert_1.strict.equal(currentValue, `${testData.initialText}a`);
+                });
+                it("in middle", () => {
+                    (0, testUtils_1.insertText)({
+                        mergeTree: testData.mergeTree,
+                        pos: testData.middle,
+                        refSeq: testData.refSeq,
+                        clientId: localClientId,
+                        seq: constants_1.UnassignedSequenceNumber,
+                        text: "a",
+                        props: undefined,
+                        opArgs: undefined,
+                    });
+                    assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
+                    assert_1.strict.equal(currentValue, `${testData.initialText.substring(0, testData.middle)}` +
+                        "a" +
+                        `${testData.initialText.substring(testData.middle)}`);
+                });
+            });
+        });
+    });
+    it("handles conflicts involving removed segments across block boundaries", () => {
+        let initialText = "0";
+        let seq = 0;
+        const mergeTree = new mergeTree_1.MergeTree();
+        mergeTree.startCollaboration(localClientId, 0, seq);
+        (0, testUtils_1.insertSegments)({
+            mergeTree,
+            pos: 0,
+            segments: [textSegment_1.TextSegment.make(initialText)],
+            refSeq: constants_1.UniversalSequenceNumber,
+            clientId: localClientId,
+            seq: constants_1.UniversalSequenceNumber,
+            opArgs: undefined,
+        });
+        for (let i = 1; i < mergeTreeNodes_1.MaxNodesInBlock; i++) {
+            const text = String.fromCharCode(i + 64);
+            (0, testUtils_1.insertText)({
+                mergeTree,
+                pos: 0,
+                refSeq: constants_1.UniversalSequenceNumber,
+                clientId: localClientId,
+                seq: constants_1.UnassignedSequenceNumber,
+                text,
+                props: undefined,
+                opArgs: undefined,
+            });
+            initialText += text;
+        }
+        const textHelper = new MergeTreeTextHelper_1.MergeTreeTextHelper(mergeTree);
+        assert_1.strict.equal(mergeTree.root.childCount, 2);
+        assert_1.strict.equal(textHelper.getText(0, localClientId), "GFEDCBA0");
+        // Remove "DCBA"
+        (0, testUtils_1.markRangeRemoved)({
+            mergeTree,
+            start: 3,
+            end: 7,
+            refSeq: constants_1.UniversalSequenceNumber,
+            clientId: localClientId,
+            seq: constants_1.UnassignedSequenceNumber,
+            overwrite: false,
+            opArgs: undefined,
+        });
+        assert_1.strict.equal(textHelper.getText(0, localClientId), "GFE0");
+        // Simulate another client inserting concurrently with the above operations. Because
+        // all segments but the 0 are unacked, this insert should place the segment directly
+        // before the 0. Prior to this regression test, an issue with `rightExcursion` in the
+        // merge conflict logic instead caused the segment to be placed before the removed segments.
+        (0, testUtils_1.insertText)({
+            mergeTree,
+            pos: 0,
+            refSeq: constants_1.UniversalSequenceNumber,
+            clientId: localClientId + 1,
+            seq: ++seq,
+            text: "x",
+        });
+        const segments = [];
+        (0, mergeTreeNodeWalk_1.walkAllChildSegments)(mergeTree.root, (seg) => {
+            if (textSegment_1.TextSegment.is(seg)) {
+                if (seg.localRemovedSeq !== undefined || seg.removedSeq !== undefined) {
+                    segments.push(`(${seg.text})`);
+                }
+                else {
+                    segments.push(seg.text);
+                }
+            }
+            return true;
+        });
+        assert_1.strict.deepStrictEqual(segments, ["G", "F", "E", "(D)", "(C)", "(B)", "(A)", "x", "0"]);
+    });
+});
+//# sourceMappingURL=mergeTree.insertingWalk.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mergeTree.insertingWalk.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.insertingWalk.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\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"assert\";\nimport { IMergeBlock, MaxNodesInBlock } from \"../mergeTreeNodes\";\nimport { TextSegment } from \"../textSegment\";\nimport { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber } from \"../constants\";\nimport { MergeTree } from \"../mergeTree\";\nimport { MergeTreeTextHelper } from \"../MergeTreeTextHelper\";\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk\";\nimport {\n\tinsertSegments,\n\tinsertText,\n\tmarkRangeRemoved,\n\tnodeOrdinalsHaveIntegrity,\n} from \"./testUtils\";\n\ninterface ITestTreeFactory {\n\treadonly create: () => ITestData;\n\treadonly name: string;\n}\n\ninterface ITestData {\n\treadonly mergeTree: MergeTree;\n\treadonly textHelper: MergeTreeTextHelper;\n\treadonly initialText: string;\n\treadonly middle: number;\n\treadonly refSeq: number;\n}\n\nconst localClientId = 17;\nconst treeFactories: ITestTreeFactory[] = [\n\t{\n\t\tcreate: () => {\n\t\t\tconst initialText = \"hello world\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tmergeTree.startCollaboration(\n\t\t\t\tlocalClientId,\n\t\t\t\t/* minSeq: */ UniversalSequenceNumber,\n\t\t\t\t/* currentSeq: */ UniversalSequenceNumber,\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tinitialText,\n\t\t\t\tmergeTree,\n\t\t\t\tmiddle: Math.round(initialText.length / 2),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\ttextHelper: new MergeTreeTextHelper(mergeTree),\n\t\t\t};\n\t\t},\n\t\tname: \"single segment tree\",\n\t},\n\t{\n\t\tcreate: () => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tfor (let i = 1; i < MaxNodesInBlock - 1; i++) {\n\t\t\t\tconst text = i.toString();\n\t\t\t\tinsertText({\n\t\t\t\t\tmergeTree,\n\t\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\t\ttext,\n\t\t\t\t\tprops: undefined,\n\t\t\t\t\topArgs: undefined,\n\t\t\t\t});\n\t\t\t\tinitialText += text;\n\t\t\t}\n\n\t\t\tconst textHelper = new MergeTreeTextHelper(mergeTree);\n\t\t\tassert.equal(textHelper.getText(UniversalSequenceNumber, localClientId), initialText);\n\n\t\t\tconst nodes: IMergeBlock[] = [mergeTree.root];\n\t\t\twhile (nodes.length > 0) {\n\t\t\t\tconst node = nodes.pop()!;\n\t\t\t\tassert.equal(node.childCount, MaxNodesInBlock - 1);\n\t\t\t\tconst childrenBlocks = node.children\n\t\t\t\t\t.map((v) => v as IMergeBlock)\n\t\t\t\t\t.filter((v) => v === undefined);\n\t\t\t\tnodes.push(...childrenBlocks);\n\t\t\t}\n\n\t\t\tmergeTree.startCollaboration(\n\t\t\t\tlocalClientId,\n\t\t\t\t/* minSeq: */ UniversalSequenceNumber,\n\t\t\t\t/* currentSeq: */ UniversalSequenceNumber,\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tinitialText,\n\t\t\t\tmergeTree,\n\t\t\t\tmiddle: Math.round(MaxNodesInBlock / 2),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\ttextHelper,\n\t\t\t};\n\t\t},\n\t\tname: \"Full single layer tree\",\n\t},\n\t{\n\t\tcreate: () => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tfor (let i = 1; i < MaxNodesInBlock * 4; i++) {\n\t\t\t\tconst text = i.toString();\n\t\t\t\tinsertText({\n\t\t\t\t\tmergeTree,\n\t\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\t\ttext,\n\t\t\t\t\tprops: undefined,\n\t\t\t\t\topArgs: undefined,\n\t\t\t\t});\n\t\t\t\tinitialText += text;\n\t\t\t}\n\n\t\t\tconst remove = Math.round(initialText.length / 4);\n\t\t\t// remove from start\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\tremove,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tlocalClientId,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tfalse,\n\t\t\t\tundefined as any,\n\t\t\t);\n\t\t\tinitialText = initialText.substring(remove);\n\n\t\t\t// remove from end\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\tinitialText.length - remove,\n\t\t\t\tinitialText.length,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tlocalClientId,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tfalse,\n\t\t\t\tundefined as any,\n\t\t\t);\n\t\t\tinitialText = initialText.substring(0, initialText.length - remove);\n\n\t\t\tmergeTree.startCollaboration(\n\t\t\t\tlocalClientId,\n\t\t\t\t/* minSeq: */ UniversalSequenceNumber,\n\t\t\t\t/* currentSeq: */ UniversalSequenceNumber,\n\t\t\t);\n\n\t\t\treturn {\n\t\t\t\tinitialText,\n\t\t\t\tmergeTree,\n\t\t\t\tmiddle: Math.round(initialText.length / 2),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\ttextHelper: new MergeTreeTextHelper(mergeTree),\n\t\t\t};\n\t\t},\n\t\tname: \"Tree with remove segments\",\n\t},\n];\n\ndescribe(\"MergeTree.insertingWalk\", () => {\n\ttreeFactories.forEach((tf) => {\n\t\tdescribe(tf.name, () => {\n\t\t\tconst treeFactory = tf;\n\t\t\tlet testData: ITestData;\n\t\t\tbeforeEach(() => {\n\t\t\t\ttestData = treeFactory.create();\n\t\t\t\tassert(nodeOrdinalsHaveIntegrity(testData.mergeTree.root));\n\t\t\t});\n\t\t\tafterEach(() => {\n\t\t\t\tassert(nodeOrdinalsHaveIntegrity(testData.mergeTree.root));\n\t\t\t});\n\t\t\tdescribe(\"insertText\", () => {\n\t\t\t\tit(\"at beginning\", () => {\n\t\t\t\t\tinsertText({\n\t\t\t\t\t\tmergeTree: testData.mergeTree,\n\t\t\t\t\t\tpos: 0,\n\t\t\t\t\t\trefSeq: testData.refSeq,\n\t\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\t\t\ttext: \"a\",\n\t\t\t\t\t\tprops: undefined,\n\t\t\t\t\t\topArgs: undefined,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.refSeq, localClientId),\n\t\t\t\t\t\ttestData.initialText.length + 1,\n\t\t\t\t\t);\n\t\t\t\t\tconst currentValue = testData.textHelper.getText(\n\t\t\t\t\t\ttestData.refSeq,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert.equal(currentValue.length, testData.initialText.length + 1);\n\t\t\t\t\tassert.equal(currentValue, `a${testData.initialText}`);\n\t\t\t\t});\n\n\t\t\t\tit(\"at end\", () => {\n\t\t\t\t\tinsertText({\n\t\t\t\t\t\tmergeTree: testData.mergeTree,\n\t\t\t\t\t\tpos: testData.initialText.length,\n\t\t\t\t\t\trefSeq: testData.refSeq,\n\t\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\t\t\ttext: \"a\",\n\t\t\t\t\t\tprops: undefined,\n\t\t\t\t\t\topArgs: undefined,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.refSeq, localClientId),\n\t\t\t\t\t\ttestData.initialText.length + 1,\n\t\t\t\t\t);\n\t\t\t\t\tconst currentValue = testData.textHelper.getText(\n\t\t\t\t\t\ttestData.refSeq,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert.equal(currentValue.length, testData.initialText.length + 1);\n\t\t\t\t\tassert.equal(currentValue, `${testData.initialText}a`);\n\t\t\t\t});\n\n\t\t\t\tit(\"in middle\", () => {\n\t\t\t\t\tinsertText({\n\t\t\t\t\t\tmergeTree: testData.mergeTree,\n\t\t\t\t\t\tpos: testData.middle,\n\t\t\t\t\t\trefSeq: testData.refSeq,\n\t\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\t\t\ttext: \"a\",\n\t\t\t\t\t\tprops: undefined,\n\t\t\t\t\t\topArgs: undefined,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.refSeq, localClientId),\n\t\t\t\t\t\ttestData.initialText.length + 1,\n\t\t\t\t\t);\n\t\t\t\t\tconst currentValue = testData.textHelper.getText(\n\t\t\t\t\t\ttestData.refSeq,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert.equal(currentValue.length, testData.initialText.length + 1);\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\tcurrentValue,\n\t\t\t\t\t\t`${testData.initialText.substring(0, testData.middle)}` +\n\t\t\t\t\t\t\t\"a\" +\n\t\t\t\t\t\t\t`${testData.initialText.substring(testData.middle)}`,\n\t\t\t\t\t);\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t});\n\n\tit(\"handles conflicts involving removed segments across block boundaries\", () => {\n\t\tlet initialText = \"0\";\n\t\tlet seq = 0;\n\t\tconst mergeTree = new MergeTree();\n\t\tmergeTree.startCollaboration(localClientId, 0, seq);\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(initialText)],\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\tfor (let i = 1; i < MaxNodesInBlock; i++) {\n\t\t\tconst text = String.fromCharCode(i + 64);\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\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\n\t\tconst textHelper = new MergeTreeTextHelper(mergeTree);\n\n\t\tassert.equal(mergeTree.root.childCount, 2);\n\t\tassert.equal(textHelper.getText(0, localClientId), \"GFEDCBA0\");\n\t\t// Remove \"DCBA\"\n\t\tmarkRangeRemoved({\n\t\t\tmergeTree,\n\t\t\tstart: 3,\n\t\t\tend: 7,\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: localClientId,\n\t\t\tseq: UnassignedSequenceNumber,\n\t\t\toverwrite: false,\n\t\t\topArgs: undefined as any,\n\t\t});\n\t\tassert.equal(textHelper.getText(0, localClientId), \"GFE0\");\n\t\t// Simulate another client inserting concurrently with the above operations. Because\n\t\t// all segments but the 0 are unacked, this insert should place the segment directly\n\t\t// before the 0. Prior to this regression test, an issue with `rightExcursion` in the\n\t\t// merge conflict logic instead caused the segment to be placed before the removed segments.\n\t\tinsertText({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: localClientId + 1,\n\t\t\tseq: ++seq,\n\t\t\ttext: \"x\",\n\t\t});\n\n\t\tconst segments: string[] = [];\n\t\twalkAllChildSegments(mergeTree.root, (seg) => {\n\t\t\tif (TextSegment.is(seg)) {\n\t\t\t\tif (seg.localRemovedSeq !== undefined || seg.removedSeq !== undefined) {\n\t\t\t\t\tsegments.push(`(${seg.text})`);\n\t\t\t\t} else {\n\t\t\t\t\tsegments.push(seg.text);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn true;\n\t\t});\n\n\t\tassert.deepStrictEqual(segments, [\"G\", \"F\", \"E\", \"(D)\", \"(C)\", \"(B)\", \"(A)\", \"x\", \"0\"]);\n\t});\n});\n"]}

package/dist/test/mergeTree.markRangeRemoved.deltaCallback.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.deltaCallback.spec.d.ts.map

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

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