@fluidframework/merge-tree 2.30.0 → 2.31.0

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

@@ -5,9 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = require("node:assert");
-const constants_js_1 = require("../constants.js");
 const mergeTree_js_1 = require("../mergeTree.js");
 const mergeTreeDeltaCallback_js_1 = require("../mergeTreeDeltaCallback.js");
+const mergeTreeNodes_js_1 = require("../mergeTreeNodes.js");
 const ops_js_1 = require("../ops.js");
 const textSegment_js_1 = require("../textSegment.js");
 const testUtils_js_1 = require("./testUtils.js");
@@ -17,15 +17,7 @@ describe("MergeTree", () => {
     let currentSequenceNumber;
     beforeEach(() => {
         mergeTree = new mergeTree_js_1.MergeTree();
-        (0, testUtils_js_1.insertSegments)({
-            mergeTree,
-            pos: 0,
-            segments: [textSegment_js_1.TextSegment.make("hello world!")],
-            refSeq: constants_js_1.UniversalSequenceNumber,
-            clientId: constants_js_1.LocalClientId,
-            seq: constants_js_1.UniversalSequenceNumber,
-            opArgs: undefined,
-        });
+        mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("hello world!")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
         currentSequenceNumber = 0;
         mergeTree.startCollaboration(localClientId, 
         /* minSeq: */ currentSequenceNumber, 
@@ -37,67 +29,31 @@ describe("MergeTree", () => {
             mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
                 eventCalled++;
             };
-            (0, testUtils_js_1.insertText)({
-                mergeTree,
-                pos: 0,
-                refSeq: currentSequenceNumber,
-                clientId: localClientId,
-                seq: constants_js_1.UnassignedSequenceNumber,
-                text: "more ",
-                props: undefined,
-                opArgs: { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } },
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } });
             node_assert_1.strict.equal(eventCalled, 1);
         });
         it("Insert ending text", () => {
-            const textLength = mergeTree.getLength(currentSequenceNumber, localClientId);
+            const textLength = mergeTree.getLength(mergeTree.localPerspective);
             let eventCalled = 0;
             mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
                 eventCalled++;
             };
-            (0, testUtils_js_1.insertText)({
-                mergeTree,
-                pos: textLength,
-                refSeq: currentSequenceNumber,
-                clientId: localClientId,
-                seq: constants_js_1.UnassignedSequenceNumber,
-                text: "more ",
-                props: undefined,
-                opArgs: { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } },
-            });
+            mergeTree.insertSegments(textLength, [textSegment_js_1.TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } });
             node_assert_1.strict.equal(eventCalled, 1);
         });
         it("Insert middle text", () => {
             const count = (0, testUtils_js_1.countOperations)(mergeTree);
-            (0, testUtils_js_1.insertText)({
-                mergeTree,
-                pos: 4,
-                refSeq: currentSequenceNumber,
-                clientId: localClientId,
-                seq: constants_js_1.UnassignedSequenceNumber,
-                text: "more ",
-                props: undefined,
-                opArgs: { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } },
-            });
+            mergeTree.insertSegments(4, [textSegment_js_1.TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } });
             node_assert_1.strict.deepStrictEqual(count, {
                 [ops_js_1.MergeTreeDeltaType.INSERT]: 1,
                 [mergeTreeDeltaCallback_js_1.MergeTreeMaintenanceType.SPLIT]: 1,
             });
         });
         it("Insert text remote", () => {
-            const remoteClientId = 35;
+            const remoteClient = (0, testUtils_js_1.makeRemoteClient)({ clientId: 35 });
             let remoteSequenceNumber = currentSequenceNumber;
             const count = (0, testUtils_js_1.countOperations)(mergeTree);
-            (0, testUtils_js_1.insertText)({
-                mergeTree,
-                pos: 0,
-                refSeq: currentSequenceNumber,
-                clientId: remoteClientId,
-                seq: ++remoteSequenceNumber,
-                text: "more ",
-                props: undefined,
-                opArgs: { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } },
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("more ")], remoteClient.perspectiveAt({ refSeq: currentSequenceNumber }), remoteClient.stampAt({ seq: ++remoteSequenceNumber }), { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } });
             node_assert_1.strict.deepStrictEqual(count, {
                 [ops_js_1.MergeTreeDeltaType.INSERT]: 1,
             });
@@ -106,16 +62,7 @@ describe("MergeTree", () => {
     describe("insertMarker", () => {
         it("Insert marker", () => {
             const count = (0, testUtils_js_1.countOperations)(mergeTree);
-            (0, testUtils_js_1.insertMarker)({
-                mergeTree,
-                pos: 4,
-                refSeq: currentSequenceNumber,
-                clientId: localClientId,
-                seq: constants_js_1.UnassignedSequenceNumber,
-                behaviors: ops_js_1.ReferenceType.Simple,
-                props: undefined,
-                opArgs: { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } },
-            });
+            mergeTree.insertSegments(4, [mergeTreeNodes_js_1.Marker.make(ops_js_1.ReferenceType.Simple)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: ops_js_1.MergeTreeDeltaType.INSERT } });
             node_assert_1.strict.deepStrictEqual(count, {
                 [ops_js_1.MergeTreeDeltaType.INSERT]: 1,
                 [mergeTreeDeltaCallback_js_1.MergeTreeMaintenanceType.SPLIT]: 1,

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

@@ -1 +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 \"node:assert\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback.js\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { countOperations, insertMarker, insertSegments, insertText } from \"./testUtils.js\";\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): void => {\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): void => {\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"]}
+{"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 \"node:assert\";\n\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback.js\";\nimport { Marker } from \"../mergeTreeNodes.js\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { countOperations, makeRemoteClient } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\tbeforeEach(() => {\n\t\tmergeTree = new MergeTree();\n\t\tmergeTree.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(\"hello world!\")],\n\t\t\tmergeTree.localPerspective,\n\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\tundefined,\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): void => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t{ 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(mergeTree.localPerspective);\n\t\t\tlet eventCalled: number = 0;\n\n\t\t\tmergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs): void => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tmergeTree.insertSegments(\n\t\t\t\ttextLength,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t{ 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\tmergeTree.insertSegments(\n\t\t\t\t4,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t{ 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 remoteClient = makeRemoteClient({ clientId: 35 });\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient.perspectiveAt({ refSeq: currentSequenceNumber }),\n\t\t\t\tremoteClient.stampAt({ seq: ++remoteSequenceNumber }),\n\t\t\t\t{ 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\tmergeTree.insertSegments(\n\t\t\t\t4,\n\t\t\t\t[Marker.make(ReferenceType.Simple)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t{ 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.js

@@ -19,15 +19,7 @@ const treeFactories = [
         create: () => {
             const initialText = "hello world";
             const mergeTree = new mergeTree_js_1.MergeTree();
-            (0, testUtils_js_1.insertSegments)({
-                mergeTree,
-                pos: 0,
-                segments: [textSegment_js_1.TextSegment.make(initialText)],
-                refSeq: constants_js_1.UniversalSequenceNumber,
-                clientId: constants_js_1.LocalClientId,
-                seq: constants_js_1.UniversalSequenceNumber,
-                opArgs: undefined,
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
             mergeTree.startCollaboration(localClientId, 
             /* minSeq: */ constants_js_1.UniversalSequenceNumber, 
             /* currentSeq: */ constants_js_1.UniversalSequenceNumber);
@@ -45,31 +37,14 @@ const treeFactories = [
         create: () => {
             let initialText = "0";
             const mergeTree = new mergeTree_js_1.MergeTree();
-            (0, testUtils_js_1.insertSegments)({
-                mergeTree,
-                pos: 0,
-                segments: [textSegment_js_1.TextSegment.make(initialText)],
-                refSeq: constants_js_1.UniversalSequenceNumber,
-                clientId: constants_js_1.LocalClientId,
-                seq: constants_js_1.UniversalSequenceNumber,
-                opArgs: undefined,
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
             for (let i = 1; i < mergeTreeNodes_js_1.MaxNodesInBlock - 1; i++) {
                 const text = i.toString();
-                (0, testUtils_js_1.insertText)({
-                    mergeTree,
-                    pos: mergeTree.getLength(constants_js_1.UniversalSequenceNumber, localClientId),
-                    refSeq: constants_js_1.UniversalSequenceNumber,
-                    clientId: localClientId,
-                    seq: constants_js_1.UniversalSequenceNumber,
-                    text,
-                    props: undefined,
-                    opArgs: undefined,
-                });
+                mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [textSegment_js_1.TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
                 initialText += text;
             }
             const textHelper = new MergeTreeTextHelper_js_1.MergeTreeTextHelper(mergeTree);
-            node_assert_1.strict.equal(textHelper.getText(constants_js_1.UniversalSequenceNumber, localClientId), initialText);
+            node_assert_1.strict.equal(textHelper.getText(mergeTree.localPerspective), initialText);
             const nodes = [mergeTree.root];
             while (nodes.length > 0) {
                 const node = nodes.pop();
@@ -96,35 +71,18 @@ const treeFactories = [
         create: () => {
             let initialText = "0";
             const mergeTree = new mergeTree_js_1.MergeTree();
-            (0, testUtils_js_1.insertSegments)({
-                mergeTree,
-                pos: 0,
-                segments: [textSegment_js_1.TextSegment.make(initialText)],
-                refSeq: constants_js_1.UniversalSequenceNumber,
-                clientId: constants_js_1.LocalClientId,
-                seq: constants_js_1.UniversalSequenceNumber,
-                opArgs: undefined,
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
             for (let i = 1; i < mergeTreeNodes_js_1.MaxNodesInBlock * 4; i++) {
                 const text = i.toString();
-                (0, testUtils_js_1.insertText)({
-                    mergeTree,
-                    pos: mergeTree.getLength(constants_js_1.UniversalSequenceNumber, localClientId),
-                    refSeq: constants_js_1.UniversalSequenceNumber,
-                    clientId: localClientId,
-                    seq: constants_js_1.UniversalSequenceNumber,
-                    text,
-                    props: undefined,
-                    opArgs: undefined,
-                });
+                mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [textSegment_js_1.TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
                 initialText += text;
             }
             const remove = Math.round(initialText.length / 4);
             // remove from start
-            mergeTree.markRangeRemoved(0, remove, constants_js_1.UniversalSequenceNumber, localClientId, constants_js_1.UniversalSequenceNumber, undefined);
+            mergeTree.markRangeRemoved(0, remove, mergeTree.localPerspective, { clientId: localClientId, seq: constants_js_1.UniversalSequenceNumber }, undefined);
             initialText = initialText.slice(Math.max(0, remove));
             // remove from end
-            mergeTree.markRangeRemoved(initialText.length - remove, initialText.length, constants_js_1.UniversalSequenceNumber, localClientId, constants_js_1.UniversalSequenceNumber, undefined);
+            mergeTree.markRangeRemoved(initialText.length - remove, initialText.length, mergeTree.localPerspective, { clientId: localClientId, seq: constants_js_1.UniversalSequenceNumber }, undefined);
             initialText = initialText.slice(0, Math.max(0, initialText.length - remove));
             mergeTree.startCollaboration(localClientId, 
             /* minSeq: */ constants_js_1.UniversalSequenceNumber, 
@@ -154,50 +112,23 @@ describe("MergeTree.insertingWalk", () => {
             });
             describe("insertText", () => {
                 it("at beginning", () => {
-                    (0, testUtils_js_1.insertText)({
-                        mergeTree: testData.mergeTree,
-                        pos: 0,
-                        refSeq: testData.refSeq,
-                        clientId: localClientId,
-                        seq: constants_js_1.UnassignedSequenceNumber,
-                        text: "a",
-                        props: undefined,
-                        opArgs: undefined,
-                    });
-                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
-                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    testData.mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
+                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
                     node_assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
                     node_assert_1.strict.equal(currentValue, `a${testData.initialText}`);
                 });
                 it("at end", () => {
-                    (0, testUtils_js_1.insertText)({
-                        mergeTree: testData.mergeTree,
-                        pos: testData.initialText.length,
-                        refSeq: testData.refSeq,
-                        clientId: localClientId,
-                        seq: constants_js_1.UnassignedSequenceNumber,
-                        text: "a",
-                        props: undefined,
-                        opArgs: undefined,
-                    });
-                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
-                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    testData.mergeTree.insertSegments(testData.initialText.length, [textSegment_js_1.TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
+                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
                     node_assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
                     node_assert_1.strict.equal(currentValue, `${testData.initialText}a`);
                 });
                 it("in middle", () => {
-                    (0, testUtils_js_1.insertText)({
-                        mergeTree: testData.mergeTree,
-                        pos: testData.middle,
-                        refSeq: testData.refSeq,
-                        clientId: localClientId,
-                        seq: constants_js_1.UnassignedSequenceNumber,
-                        text: "a",
-                        props: undefined,
-                        opArgs: undefined,
-                    });
-                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
-                    const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
+                    testData.mergeTree.insertSegments(testData.middle, [textSegment_js_1.TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
+                    node_assert_1.strict.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
+                    const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
                     node_assert_1.strict.equal(currentValue.length, testData.initialText.length + 1);
                     node_assert_1.strict.equal(currentValue, `${testData.initialText.slice(0, Math.max(0, testData.middle))}` +
                         "a" +
@@ -210,57 +141,25 @@ describe("MergeTree.insertingWalk", () => {
         let initialText = "0";
         let seq = 0;
         const mergeTree = new mergeTree_js_1.MergeTree();
+        mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
         mergeTree.startCollaboration(localClientId, 0, seq);
-        (0, testUtils_js_1.insertSegments)({
-            mergeTree,
-            pos: 0,
-            segments: [textSegment_js_1.TextSegment.make(initialText)],
-            refSeq: constants_js_1.UniversalSequenceNumber,
-            clientId: localClientId,
-            seq: constants_js_1.UniversalSequenceNumber,
-            opArgs: undefined,
-        });
         for (let i = 1; i < mergeTreeNodes_js_1.MaxNodesInBlock; i++) {
             const text = String.fromCodePoint(i + 64);
-            (0, testUtils_js_1.insertText)({
-                mergeTree,
-                pos: 0,
-                refSeq: constants_js_1.UniversalSequenceNumber,
-                clientId: localClientId,
-                seq: constants_js_1.UnassignedSequenceNumber,
-                text,
-                props: undefined,
-                opArgs: undefined,
-            });
+            mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
             initialText += text;
         }
         const textHelper = new MergeTreeTextHelper_js_1.MergeTreeTextHelper(mergeTree);
         node_assert_1.strict.equal(mergeTree.root.childCount, 2);
-        node_assert_1.strict.equal(textHelper.getText(0, localClientId), "GFEDCBA0");
+        node_assert_1.strict.equal(textHelper.getText(mergeTree.localPerspective), "GFEDCBA0");
         // Remove "DCBA"
-        (0, testUtils_js_1.markRangeRemoved)({
-            mergeTree,
-            start: 3,
-            end: 7,
-            refSeq: constants_js_1.UniversalSequenceNumber,
-            clientId: localClientId,
-            seq: constants_js_1.UnassignedSequenceNumber,
-            overwrite: false,
-            opArgs: undefined,
-        });
-        node_assert_1.strict.equal(textHelper.getText(0, localClientId), "GFE0");
+        mergeTree.markRangeRemoved(3, 7, mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
+        node_assert_1.strict.equal(textHelper.getText(mergeTree.localPerspective), "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_js_1.insertText)({
-            mergeTree,
-            pos: 0,
-            refSeq: constants_js_1.UniversalSequenceNumber,
-            clientId: localClientId + 1,
-            seq: ++seq,
-            text: "x",
-        });
+        const remoteClient = (0, testUtils_js_1.makeRemoteClient)({ clientId: localClientId + 1 });
+        mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("x")], remoteClient.perspectiveAt({ refSeq: 0 }), remoteClient.stampAt({ seq: ++seq }), undefined);
         const segments = [];
         (0, mergeTreeNodeWalk_js_1.walkAllChildSegments)(mergeTree.root, (seg) => {
             if (textSegment_js_1.TextSegment.is(seg)) {
@@ -275,5 +174,40 @@ describe("MergeTree.insertingWalk", () => {
         });
         node_assert_1.strict.deepStrictEqual(segments, ["G", "F", "E", "(D)", "(C)", "(B)", "(A)", "x", "0"]);
     });
+    // Inserting walk previously unnecessarily called `blockUpdate` for blocks even when no segment changes happened (e.g.
+    // we called `ensureIntervalBoundary` but there was already a segment boundary at the position we wanted to ensure had one).
+    it("avoids calling blockUpdate excessively", () => {
+        const seq = 1;
+        const mergeTree = new mergeTree_js_1.MergeTree();
+        mergeTree.startCollaboration(localClientId, 0, seq);
+        for (const char of [..."hello world"]) {
+            mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [textSegment_js_1.TextSegment.make(char)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined /* opArgs */);
+        }
+        const originalBlockUpdate = 
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        mergeTree["blockUpdate"].bind(mergeTree);
+        const blockUpdateCallLog = [];
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        mergeTree["blockUpdate"] = (block) => {
+            // This is called in the middle of updating lots of merge-tree bookkeeping, so we don't want to do too much
+            // advanced stuff here. However, walking the tree and concatenating all the text (ignoring other segment properties)
+            // should be safe.
+            let text = "";
+            (0, mergeTreeNodeWalk_js_1.walkAllChildSegments)(block, (seg) => {
+                if (textSegment_js_1.TextSegment.is(seg)) {
+                    text += seg.text;
+                }
+                return true;
+            });
+            blockUpdateCallLog.push(text);
+            originalBlockUpdate(block);
+        };
+        mergeTree.insertSegments(0, [textSegment_js_1.TextSegment.make("Ot")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined /* opArgs */);
+        node_assert_1.strict.deepEqual(blockUpdateCallLog, ["Othell", "Othello world"]);
+        blockUpdateCallLog.length = 0;
+        mergeTree.markRangeRemoved(0, "Othello world".length, mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
+        // The log ignores presence of segments. The important thing is that we only have one entry per block here.
+        node_assert_1.strict.deepEqual(blockUpdateCallLog, ["Othell", "o world", "Othello world"]);
+    });
 });
 //# sourceMappingURL=mergeTree.insertingWalk.spec.js.map

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

@@ -1 +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 \"node:assert\";\n\nimport { MergeTreeTextHelper } from \"../MergeTreeTextHelper.js\";\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk.js\";\nimport { MergeBlock, MaxNodesInBlock, segmentIsRemoved } from \"../mergeTreeNodes.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport {\n\tinsertSegments,\n\tinsertText,\n\tmarkRangeRemoved,\n\tnodeOrdinalsHaveIntegrity,\n} from \"./testUtils.js\";\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: (): ITestData => {\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: (): ITestData => {\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: MergeBlock[] = [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 MergeBlock)\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: (): ITestData => {\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\tundefined as never,\n\t\t\t);\n\t\t\tinitialText = initialText.slice(Math.max(0, 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\tundefined as never,\n\t\t\t);\n\t\t\tinitialText = initialText.slice(0, Math.max(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\tfor (const tf of treeFactories) {\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(testData.refSeq, localClientId);\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(testData.refSeq, localClientId);\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(testData.refSeq, localClientId);\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.slice(0, Math.max(0, testData.middle))}` +\n\t\t\t\t\t\t\t\"a\" +\n\t\t\t\t\t\t\t`${testData.initialText.slice(Math.max(0, 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.fromCodePoint(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 never,\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 (segmentIsRemoved(seg)) {\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"]}
+{"version":3,"file":"mergeTree.insertingWalk.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.insertingWalk.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,6DAA6D;AAE7D,6CAA+C;AAE/C,sEAAgE;AAChE,kDAA0D;AAC1D,kDAA4C;AAC5C,kEAA+D;AAC/D,4DAAqF;AACrF,sDAAgD;AAEhD,iDAA6E;AAe7E,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,MAAM,aAAa,GAAuB;IACzC;QACC,MAAM,EAAE,GAAc,EAAE;YACvB,MAAM,WAAW,GAAG,aAAa,CAAC;YAClC,MAAM,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;YAClC,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;YAEF,SAAS,CAAC,kBAAkB,CAC3B,aAAa;YACb,aAAa,CAAC,sCAAuB;YACrC,iBAAiB,CAAC,sCAAuB,CACzC,CAAC;YACF,OAAO;gBACN,WAAW;gBACX,SAAS;gBACT,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC1C,MAAM,EAAE,sCAAuB;gBAC/B,UAAU,EAAE,IAAI,4CAAmB,CAAC,SAAS,CAAC;aAC9C,CAAC;QACH,CAAC;QACD,IAAI,EAAE,qBAAqB;KAC3B;IACD;QACC,MAAM,EAAE,GAAc,EAAE;YACvB,IAAI,WAAW,GAAG,GAAG,CAAC;YACtB,MAAM,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;YAClC,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mCAAe,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS,CAAC,cAAc,CACvB,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC/C,CAAC,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;gBACF,WAAW,IAAI,IAAI,CAAC;YACrB,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,4CAAmB,CAAC,SAAS,CAAC,CAAC;YACtD,oBAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,CAAC;YAE1E,MAAM,KAAK,GAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;gBAC1B,oBAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,mCAAe,GAAG,CAAC,CAAC,CAAC;gBACnD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ;qBAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAe,CAAC;qBAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;gBACjC,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAC/B,CAAC;YAED,SAAS,CAAC,kBAAkB,CAC3B,aAAa;YACb,aAAa,CAAC,sCAAuB;YACrC,iBAAiB,CAAC,sCAAuB,CACzC,CAAC;YACF,OAAO;gBACN,WAAW;gBACX,SAAS;gBACT,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,mCAAe,GAAG,CAAC,CAAC;gBACvC,MAAM,EAAE,sCAAuB;gBAC/B,UAAU;aACV,CAAC;QACH,CAAC;QACD,IAAI,EAAE,wBAAwB;KAC9B;IACD;QACC,MAAM,EAAE,GAAc,EAAE;YACvB,IAAI,WAAW,GAAG,GAAG,CAAC;YACtB,MAAM,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;YAClC,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mCAAe,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS,CAAC,cAAc,CACvB,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC/C,CAAC,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;gBACF,WAAW,IAAI,IAAI,CAAC;YACrB,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAClD,oBAAoB;YACpB,SAAS,CAAC,gBAAgB,CACzB,CAAC,EACD,MAAM,EACN,SAAS,CAAC,gBAAgB,EAC1B,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,sCAAuB,EAAE,EACzD,SAAkB,CAClB,CAAC;YACF,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;YAErD,kBAAkB;YAClB,SAAS,CAAC,gBAAgB,CACzB,WAAW,CAAC,MAAM,GAAG,MAAM,EAC3B,WAAW,CAAC,MAAM,EAClB,SAAS,CAAC,gBAAgB,EAC1B,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,sCAAuB,EAAE,EACzD,SAAkB,CAClB,CAAC;YACF,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;YAE7E,SAAS,CAAC,kBAAkB,CAC3B,aAAa;YACb,aAAa,CAAC,sCAAuB;YACrC,iBAAiB,CAAC,sCAAuB,CACzC,CAAC;YAEF,OAAO;gBACN,WAAW;gBACX,SAAS;gBACT,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC1C,MAAM,EAAE,sCAAuB;gBAC/B,UAAU,EAAE,IAAI,4CAAmB,CAAC,SAAS,CAAC;aAC9C,CAAC;QACH,CAAC;QACD,IAAI,EAAE,2BAA2B;KACjC;CACD,CAAC;AAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACxC,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE,CAAC;QAChC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE;YACtB,MAAM,WAAW,GAAG,EAAE,CAAC;YACvB,IAAI,QAAmB,CAAC;YACxB,UAAU,CAAC,GAAG,EAAE;gBACf,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAA,oBAAM,EAAC,IAAA,wCAAyB,EAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,SAAS,CAAC,GAAG,EAAE;gBACd,IAAA,oBAAM,EAAC,IAAA,wCAAyB,EAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC3B,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;oBACvB,QAAQ,CAAC,SAAS,CAAC,cAAc,CAChC,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACvB,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EACnC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EAC7D,SAAS,CACT,CAAC;oBAEF,oBAAM,CAAC,KAAK,CACX,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,EACjE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAC/B,CAAC;oBACF,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAC/C,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CACnC,CAAC;oBACF,oBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACnE,oBAAM,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;gBACxD,CAAC,CAAC,CAAC;gBAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;oBACjB,QAAQ,CAAC,SAAS,CAAC,cAAc,CAChC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAC3B,CAAC,4BAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACvB,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EACnC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EAC7D,SAAS,CACT,CAAC;oBAEF,oBAAM,CAAC,KAAK,CACX,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,EACjE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAC/B,CAAC;oBACF,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAC/C,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CACnC,CAAC;oBACF,oBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACnE,oBAAM,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;gBACxD,CAAC,CAAC,CAAC;gBAEH,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;oBACpB,QAAQ,CAAC,SAAS,CAAC,cAAc,CAChC,QAAQ,CAAC,MAAM,EACf,CAAC,4BAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACvB,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EACnC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EAC7D,SAAS,CACT,CAAC;oBAEF,oBAAM,CAAC,KAAK,CACX,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,EACjE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAC/B,CAAC;oBACF,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAC/C,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CACnC,CAAC;oBACF,oBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACnE,oBAAM,CAAC,KAAK,CACX,YAAY,EACZ,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE;wBAC/D,GAAG;wBACH,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAC9D,CAAC;gBACH,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC/E,IAAI,WAAW,GAAG,GAAG,CAAC;QACtB,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;QACF,SAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mCAAe,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1C,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CACT,CAAC;YACF,WAAW,IAAI,IAAI,CAAC;QACrB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,4CAAmB,CAAC,SAAS,CAAC,CAAC;QAEtD,oBAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC3C,oBAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAC,CAAC;QACzE,gBAAgB;QAChB,SAAS,CAAC,gBAAgB,CACzB,CAAC,EACD,CAAC,EACD,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAkB,CAClB,CAAC;QACF,oBAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;QACrE,oFAAoF;QACpF,oFAAoF;QACpF,qFAAqF;QACrF,4FAA4F;QAC5F,MAAM,YAAY,GAAG,IAAA,+BAAgB,EAAC,EAAE,QAAQ,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACvB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EACzC,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EACpC,SAAS,CACT,CAAC;QAEF,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAA,2CAAoB,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5C,IAAI,4BAAW,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,IAAA,oCAAgB,EAAC,GAAG,CAAC,EAAE,CAAC;oBAC3B,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACP,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzB,CAAC;YACF,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,oBAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;IAEH,sHAAsH;IACtH,4HAA4H;IAC5H,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QACjD,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,MAAM,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QACpD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC;YACvC,SAAS,CAAC,cAAc,CACvB,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC/C,CAAC,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CAAC,YAAY,CACtB,CAAC;QACH,CAAC;QAED,MAAM,mBAAmB;QACxB,2DAA2D;QAC1D,SAAS,CAAC,aAAa,CAAiC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3E,MAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,2DAA2D;QAC3D,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,KAAiB,EAAE,EAAE;YAChD,2GAA2G;YAC3G,oHAAoH;YACpH,kBAAkB;YAClB,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAA,2CAAoB,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;gBACnC,IAAI,4BAAW,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC;gBAClB,CAAC;gBACD,OAAO,IAAI,CAAC;YACb,CAAC,CAAC,CAAC;YAEH,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAS,CAAC,YAAY,CACtB,CAAC;QAEF,oBAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;QAElE,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9B,SAAS,CAAC,gBAAgB,CACzB,CAAC,EACD,eAAe,CAAC,MAAM,EACtB,SAAS,CAAC,gBAAgB,EAC1B,SAAS,CAAC,YAAY,CAAC,2BAA2B,EAAE,EACpD,SAAkB,CAClB,CAAC;QAEF,2GAA2G;QAC3G,oBAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,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\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { MergeTreeTextHelper } from \"../MergeTreeTextHelper.js\";\nimport { UniversalSequenceNumber } from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk.js\";\nimport { MergeBlock, MaxNodesInBlock, segmentIsRemoved } from \"../mergeTreeNodes.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { makeRemoteClient, nodeOrdinalsHaveIntegrity } from \"./testUtils.js\";\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: (): ITestData => {\n\t\t\tconst initialText = \"hello world\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(initialText)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined,\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(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: (): ITestData => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(initialText)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined,\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\tmergeTree.insertSegments(\n\t\t\t\t\tmergeTree.getLength(mergeTree.localPerspective),\n\t\t\t\t\t[TextSegment.make(text)],\n\t\t\t\t\tmergeTree.localPerspective,\n\t\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t\tundefined,\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(mergeTree.localPerspective), initialText);\n\n\t\t\tconst nodes: MergeBlock[] = [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 MergeBlock)\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: (): ITestData => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(initialText)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined,\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\tmergeTree.insertSegments(\n\t\t\t\t\tmergeTree.getLength(mergeTree.localPerspective),\n\t\t\t\t\t[TextSegment.make(text)],\n\t\t\t\t\tmergeTree.localPerspective,\n\t\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t\tundefined,\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\tmergeTree.localPerspective,\n\t\t\t\t{ clientId: localClientId, seq: UniversalSequenceNumber },\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tinitialText = initialText.slice(Math.max(0, 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\tmergeTree.localPerspective,\n\t\t\t\t{ clientId: localClientId, seq: UniversalSequenceNumber },\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tinitialText = initialText.slice(0, Math.max(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\tfor (const tf of treeFactories) {\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\ttestData.mergeTree.insertSegments(\n\t\t\t\t\t\t0,\n\t\t\t\t\t\t[TextSegment.make(\"a\")],\n\t\t\t\t\t\ttestData.mergeTree.localPerspective,\n\t\t\t\t\t\ttestData.mergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t\t\tundefined,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.mergeTree.localPerspective),\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.mergeTree.localPerspective,\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\ttestData.mergeTree.insertSegments(\n\t\t\t\t\t\ttestData.initialText.length,\n\t\t\t\t\t\t[TextSegment.make(\"a\")],\n\t\t\t\t\t\ttestData.mergeTree.localPerspective,\n\t\t\t\t\t\ttestData.mergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t\t\tundefined,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.mergeTree.localPerspective),\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.mergeTree.localPerspective,\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\ttestData.mergeTree.insertSegments(\n\t\t\t\t\t\ttestData.middle,\n\t\t\t\t\t\t[TextSegment.make(\"a\")],\n\t\t\t\t\t\ttestData.mergeTree.localPerspective,\n\t\t\t\t\t\ttestData.mergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\t\t\tundefined,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.mergeTree.localPerspective),\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.mergeTree.localPerspective,\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.slice(0, Math.max(0, testData.middle))}` +\n\t\t\t\t\t\t\t\"a\" +\n\t\t\t\t\t\t\t`${testData.initialText.slice(Math.max(0, 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.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(initialText)],\n\t\t\tmergeTree.localPerspective,\n\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\tundefined,\n\t\t);\n\t\tmergeTree.startCollaboration(localClientId, 0, seq);\n\t\tfor (let i = 1; i < MaxNodesInBlock; i++) {\n\t\t\tconst text = String.fromCodePoint(i + 64);\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(text)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined,\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(mergeTree.localPerspective), \"GFEDCBA0\");\n\t\t// Remove \"DCBA\"\n\t\tmergeTree.markRangeRemoved(\n\t\t\t3,\n\t\t\t7,\n\t\t\tmergeTree.localPerspective,\n\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\tundefined as never,\n\t\t);\n\t\tassert.equal(textHelper.getText(mergeTree.localPerspective), \"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\tconst remoteClient = makeRemoteClient({ clientId: localClientId + 1 });\n\t\tmergeTree.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(\"x\")],\n\t\t\tremoteClient.perspectiveAt({ refSeq: 0 }),\n\t\t\tremoteClient.stampAt({ seq: ++seq }),\n\t\t\tundefined,\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 (segmentIsRemoved(seg)) {\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\t// Inserting walk previously unnecessarily called `blockUpdate` for blocks even when no segment changes happened (e.g.\n\t// we called `ensureIntervalBoundary` but there was already a segment boundary at the position we wanted to ensure had one).\n\tit(\"avoids calling blockUpdate excessively\", () => {\n\t\tconst seq = 1;\n\t\tconst mergeTree = new MergeTree();\n\t\tmergeTree.startCollaboration(localClientId, 0, seq);\n\t\tfor (const char of [...\"hello world\"]) {\n\t\t\tmergeTree.insertSegments(\n\t\t\t\tmergeTree.getLength(mergeTree.localPerspective),\n\t\t\t\t[TextSegment.make(char)],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined /* opArgs */,\n\t\t\t);\n\t\t}\n\n\t\tconst originalBlockUpdate: (block: MergeBlock) => void =\n\t\t\t// eslint-disable-next-line @typescript-eslint/dot-notation\n\t\t\t(mergeTree[\"blockUpdate\"] as (block: MergeBlock) => void).bind(mergeTree);\n\t\tconst blockUpdateCallLog: string[] = [];\n\t\t// eslint-disable-next-line @typescript-eslint/dot-notation\n\t\tmergeTree[\"blockUpdate\"] = (block: MergeBlock) => {\n\t\t\t// This is called in the middle of updating lots of merge-tree bookkeeping, so we don't want to do too much\n\t\t\t// advanced stuff here. However, walking the tree and concatenating all the text (ignoring other segment properties)\n\t\t\t// should be safe.\n\t\t\tlet text = \"\";\n\t\t\twalkAllChildSegments(block, (seg) => {\n\t\t\t\tif (TextSegment.is(seg)) {\n\t\t\t\t\ttext += seg.text;\n\t\t\t\t}\n\t\t\t\treturn true;\n\t\t\t});\n\n\t\t\tblockUpdateCallLog.push(text);\n\t\t\toriginalBlockUpdate(block);\n\t\t};\n\n\t\tmergeTree.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(\"Ot\")],\n\t\t\tmergeTree.localPerspective,\n\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\tundefined /* opArgs */,\n\t\t);\n\n\t\tassert.deepEqual(blockUpdateCallLog, [\"Othell\", \"Othello world\"]);\n\n\t\tblockUpdateCallLog.length = 0;\n\n\t\tmergeTree.markRangeRemoved(\n\t\t\t0,\n\t\t\t\"Othello world\".length,\n\t\t\tmergeTree.localPerspective,\n\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\tundefined as never,\n\t\t);\n\n\t\t// The log ignores presence of segments. The important thing is that we only have one entry per block here.\n\t\tassert.deepEqual(blockUpdateCallLog, [\"Othell\", \"o world\", \"Othello world\"]);\n\t});\n});\n"]}