@fluidframework/merge-tree 2.30.0 → 2.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +403 -399
- package/api-report/merge-tree.legacy.alpha.api.md +1 -0
- package/dist/MergeTreeTextHelper.d.ts +9 -3
- package/dist/MergeTreeTextHelper.d.ts.map +1 -1
- package/dist/MergeTreeTextHelper.js +5 -5
- package/dist/MergeTreeTextHelper.js.map +1 -1
- package/dist/client.d.ts +7 -13
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +136 -110
- package/dist/client.js.map +1 -1
- package/dist/endOfTreeSegment.d.ts +12 -8
- package/dist/endOfTreeSegment.d.ts.map +1 -1
- package/dist/endOfTreeSegment.js +2 -4
- package/dist/endOfTreeSegment.js.map +1 -1
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/mergeTree.d.ts +37 -23
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +400 -483
- package/dist/mergeTree.js.map +1 -1
- package/dist/mergeTreeDeltaCallback.d.ts +4 -8
- package/dist/mergeTreeDeltaCallback.d.ts.map +1 -1
- package/dist/mergeTreeDeltaCallback.js.map +1 -1
- package/dist/mergeTreeNodes.d.ts +32 -10
- package/dist/mergeTreeNodes.d.ts.map +1 -1
- package/dist/mergeTreeNodes.js +43 -28
- package/dist/mergeTreeNodes.js.map +1 -1
- package/dist/partialLengths.d.ts +2 -2
- package/dist/partialLengths.d.ts.map +1 -1
- package/dist/partialLengths.js +181 -109
- package/dist/partialLengths.js.map +1 -1
- package/dist/perspective.d.ts +8 -27
- package/dist/perspective.d.ts.map +1 -1
- package/dist/perspective.js +7 -67
- package/dist/perspective.js.map +1 -1
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +2 -2
- package/dist/revertibles.js.map +1 -1
- package/dist/segmentInfos.d.ts +20 -106
- package/dist/segmentInfos.d.ts.map +1 -1
- package/dist/segmentInfos.js +28 -42
- package/dist/segmentInfos.js.map +1 -1
- package/dist/segmentPropertiesManager.d.ts +1 -14
- package/dist/segmentPropertiesManager.d.ts.map +1 -1
- package/dist/segmentPropertiesManager.js +3 -17
- package/dist/segmentPropertiesManager.js.map +1 -1
- package/dist/snapshotLoader.d.ts.map +1 -1
- package/dist/snapshotLoader.js +62 -19
- package/dist/snapshotLoader.js.map +1 -1
- package/dist/snapshotV1.d.ts.map +1 -1
- package/dist/snapshotV1.js +55 -24
- package/dist/snapshotV1.js.map +1 -1
- package/dist/snapshotlegacy.d.ts.map +1 -1
- package/dist/snapshotlegacy.js +6 -9
- package/dist/snapshotlegacy.js.map +1 -1
- package/dist/stamps.d.ts +1 -1
- package/dist/stamps.js +1 -1
- package/dist/stamps.js.map +1 -1
- package/dist/test/Insertion.perf.spec.js +6 -51
- package/dist/test/Insertion.perf.spec.js.map +1 -1
- package/dist/test/PartialLengths.perf.spec.js +18 -25
- package/dist/test/PartialLengths.perf.spec.js.map +1 -1
- package/dist/test/Removal.perf.spec.js +13 -41
- package/dist/test/Removal.perf.spec.js.map +1 -1
- package/dist/test/beastTest.spec.d.ts.map +1 -1
- package/dist/test/beastTest.spec.js +41 -66
- package/dist/test/beastTest.spec.js.map +1 -1
- package/dist/test/client.annotateMarker.spec.js +1 -11
- package/dist/test/client.annotateMarker.spec.js.map +1 -1
- package/dist/test/client.applyMsg.spec.js +14 -14
- package/dist/test/client.applyMsg.spec.js.map +1 -1
- package/dist/test/client.getPosition.spec.js +1 -1
- package/dist/test/client.getPosition.spec.js.map +1 -1
- package/dist/test/client.localReference.spec.js +1 -1
- package/dist/test/client.localReference.spec.js.map +1 -1
- package/dist/test/client.rollback.spec.js +49 -58
- package/dist/test/client.rollback.spec.js.map +1 -1
- package/dist/test/client.rollbackFarm.spec.js +1 -1
- package/dist/test/client.rollbackFarm.spec.js.map +1 -1
- package/dist/test/client.searchForMarker.spec.js +4 -21
- package/dist/test/client.searchForMarker.spec.js.map +1 -1
- package/dist/test/index.d.ts +2 -2
- package/dist/test/index.d.ts.map +1 -1
- package/dist/test/index.js +2 -6
- package/dist/test/index.js.map +1 -1
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js +14 -59
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.annotate.spec.js +47 -63
- package/dist/test/mergeTree.annotate.spec.js.map +1 -1
- package/dist/test/mergeTree.insert.deltaCallback.spec.js +9 -62
- package/dist/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.insertingWalk.spec.js +59 -125
- package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +12 -93
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.spec.js +10 -7
- package/dist/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/dist/test/mergeTree.walk.spec.js +2 -14
- package/dist/test/mergeTree.walk.spec.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.js +2 -2
- package/dist/test/mergeTreeOperationRunner.js.map +1 -1
- package/dist/test/obliterate.concurrent.spec.js +18 -23
- package/dist/test/obliterate.concurrent.spec.js.map +1 -1
- package/dist/test/obliterate.partialLength.spec.js +166 -136
- package/dist/test/obliterate.partialLength.spec.js.map +1 -1
- package/dist/test/obliterate.spec.js +16 -126
- package/dist/test/obliterate.spec.js.map +1 -1
- package/dist/test/partialLength.spec.js +28 -196
- package/dist/test/partialLength.spec.js.map +1 -1
- package/dist/test/perspective.spec.js +34 -0
- package/dist/test/perspective.spec.js.map +1 -1
- package/dist/test/propertyManager.spec.js +1 -1
- package/dist/test/propertyManager.spec.js.map +1 -1
- package/dist/test/resetPendingSegmentsToOp.spec.js +0 -2
- package/dist/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/dist/test/segmentGroupCollection.spec.js +10 -4
- package/dist/test/segmentGroupCollection.spec.js.map +1 -1
- package/dist/test/testClient.d.ts +1 -0
- package/dist/test/testClient.d.ts.map +1 -1
- package/dist/test/testClient.js +16 -26
- package/dist/test/testClient.js.map +1 -1
- package/dist/test/testClientLogger.d.ts.map +1 -1
- package/dist/test/testClientLogger.js +3 -10
- package/dist/test/testClientLogger.js.map +1 -1
- package/dist/test/testServer.d.ts +2 -1
- package/dist/test/testServer.d.ts.map +1 -1
- package/dist/test/testServer.js +7 -5
- package/dist/test/testServer.js.map +1 -1
- package/dist/test/testUtils.d.ts +36 -56
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +68 -77
- package/dist/test/testUtils.js.map +1 -1
- package/dist/test/text.d.ts +2 -2
- package/dist/test/text.d.ts.map +1 -1
- package/dist/test/text.js +5 -2
- package/dist/test/text.js.map +1 -1
- package/dist/textSegment.d.ts +0 -6
- package/dist/textSegment.d.ts.map +1 -1
- package/dist/textSegment.js.map +1 -1
- package/dist/zamboni.d.ts.map +1 -1
- package/dist/zamboni.js +53 -26
- package/dist/zamboni.js.map +1 -1
- package/lib/MergeTreeTextHelper.d.ts +9 -3
- package/lib/MergeTreeTextHelper.d.ts.map +1 -1
- package/lib/MergeTreeTextHelper.js +5 -5
- package/lib/MergeTreeTextHelper.js.map +1 -1
- package/lib/client.d.ts +7 -13
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +117 -116
- package/lib/client.js.map +1 -1
- package/lib/endOfTreeSegment.d.ts +12 -8
- package/lib/endOfTreeSegment.d.ts.map +1 -1
- package/lib/endOfTreeSegment.js +2 -4
- package/lib/endOfTreeSegment.js.map +1 -1
- package/lib/index.d.ts +6 -3
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/mergeTree.d.ts +37 -23
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +381 -488
- package/lib/mergeTree.js.map +1 -1
- package/lib/mergeTreeDeltaCallback.d.ts +4 -8
- package/lib/mergeTreeDeltaCallback.d.ts.map +1 -1
- package/lib/mergeTreeDeltaCallback.js.map +1 -1
- package/lib/mergeTreeNodes.d.ts +32 -10
- package/lib/mergeTreeNodes.d.ts.map +1 -1
- package/lib/mergeTreeNodes.js +42 -29
- package/lib/mergeTreeNodes.js.map +1 -1
- package/lib/partialLengths.d.ts +2 -2
- package/lib/partialLengths.d.ts.map +1 -1
- package/lib/partialLengths.js +160 -111
- package/lib/partialLengths.js.map +1 -1
- package/lib/perspective.d.ts +8 -27
- package/lib/perspective.d.ts.map +1 -1
- package/lib/perspective.js +8 -68
- package/lib/perspective.js.map +1 -1
- package/lib/revertibles.d.ts.map +1 -1
- package/lib/revertibles.js +2 -2
- package/lib/revertibles.js.map +1 -1
- package/lib/segmentInfos.d.ts +20 -106
- package/lib/segmentInfos.d.ts.map +1 -1
- package/lib/segmentInfos.js +26 -37
- package/lib/segmentInfos.js.map +1 -1
- package/lib/segmentPropertiesManager.d.ts +1 -14
- package/lib/segmentPropertiesManager.d.ts.map +1 -1
- package/lib/segmentPropertiesManager.js +2 -16
- package/lib/segmentPropertiesManager.js.map +1 -1
- package/lib/snapshotLoader.d.ts.map +1 -1
- package/lib/snapshotLoader.js +39 -19
- package/lib/snapshotLoader.js.map +1 -1
- package/lib/snapshotV1.d.ts.map +1 -1
- package/lib/snapshotV1.js +34 -26
- package/lib/snapshotV1.js.map +1 -1
- package/lib/snapshotlegacy.d.ts.map +1 -1
- package/lib/snapshotlegacy.js +7 -10
- package/lib/snapshotlegacy.js.map +1 -1
- package/lib/stamps.d.ts +1 -1
- package/lib/stamps.js +1 -1
- package/lib/stamps.js.map +1 -1
- package/lib/test/Insertion.perf.spec.js +6 -51
- package/lib/test/Insertion.perf.spec.js.map +1 -1
- package/lib/test/PartialLengths.perf.spec.js +18 -25
- package/lib/test/PartialLengths.perf.spec.js.map +1 -1
- package/lib/test/Removal.perf.spec.js +13 -41
- package/lib/test/Removal.perf.spec.js.map +1 -1
- package/lib/test/beastTest.spec.d.ts.map +1 -1
- package/lib/test/beastTest.spec.js +42 -67
- package/lib/test/beastTest.spec.js.map +1 -1
- package/lib/test/client.annotateMarker.spec.js +1 -11
- package/lib/test/client.annotateMarker.spec.js.map +1 -1
- package/lib/test/client.applyMsg.spec.js +14 -14
- package/lib/test/client.applyMsg.spec.js.map +1 -1
- package/lib/test/client.getPosition.spec.js +1 -1
- package/lib/test/client.getPosition.spec.js.map +1 -1
- package/lib/test/client.localReference.spec.js +1 -1
- package/lib/test/client.localReference.spec.js.map +1 -1
- package/lib/test/client.rollback.spec.js +50 -59
- package/lib/test/client.rollback.spec.js.map +1 -1
- package/lib/test/client.rollbackFarm.spec.js +1 -1
- package/lib/test/client.rollbackFarm.spec.js.map +1 -1
- package/lib/test/client.searchForMarker.spec.js +4 -21
- package/lib/test/client.searchForMarker.spec.js.map +1 -1
- package/lib/test/index.d.ts +2 -2
- package/lib/test/index.d.ts.map +1 -1
- package/lib/test/index.js +1 -1
- package/lib/test/index.js.map +1 -1
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js +15 -60
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.annotate.spec.js +48 -64
- package/lib/test/mergeTree.annotate.spec.js.map +1 -1
- package/lib/test/mergeTree.insert.deltaCallback.spec.js +10 -63
- package/lib/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.insertingWalk.spec.js +61 -127
- package/lib/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +13 -94
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.markRangeRemoved.spec.js +10 -7
- package/lib/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/lib/test/mergeTree.walk.spec.js +2 -14
- package/lib/test/mergeTree.walk.spec.js.map +1 -1
- package/lib/test/mergeTreeOperationRunner.js +3 -3
- package/lib/test/mergeTreeOperationRunner.js.map +1 -1
- package/lib/test/obliterate.concurrent.spec.js +18 -23
- package/lib/test/obliterate.concurrent.spec.js.map +1 -1
- package/lib/test/obliterate.partialLength.spec.js +167 -137
- package/lib/test/obliterate.partialLength.spec.js.map +1 -1
- package/lib/test/obliterate.spec.js +17 -127
- package/lib/test/obliterate.spec.js.map +1 -1
- package/lib/test/partialLength.spec.js +29 -197
- package/lib/test/partialLength.spec.js.map +1 -1
- package/lib/test/perspective.spec.js +34 -0
- package/lib/test/perspective.spec.js.map +1 -1
- package/lib/test/propertyManager.spec.js +2 -2
- package/lib/test/propertyManager.spec.js.map +1 -1
- package/lib/test/resetPendingSegmentsToOp.spec.js +0 -2
- package/lib/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/lib/test/segmentGroupCollection.spec.js +10 -4
- package/lib/test/segmentGroupCollection.spec.js.map +1 -1
- package/lib/test/testClient.d.ts +1 -0
- package/lib/test/testClient.d.ts.map +1 -1
- package/lib/test/testClient.js +18 -28
- package/lib/test/testClient.js.map +1 -1
- package/lib/test/testClientLogger.d.ts.map +1 -1
- package/lib/test/testClientLogger.js +3 -10
- package/lib/test/testClientLogger.js.map +1 -1
- package/lib/test/testServer.d.ts +2 -1
- package/lib/test/testServer.d.ts.map +1 -1
- package/lib/test/testServer.js +7 -5
- package/lib/test/testServer.js.map +1 -1
- package/lib/test/testUtils.d.ts +36 -56
- package/lib/test/testUtils.d.ts.map +1 -1
- package/lib/test/testUtils.js +66 -48
- package/lib/test/testUtils.js.map +1 -1
- package/lib/test/text.d.ts +2 -2
- package/lib/test/text.d.ts.map +1 -1
- package/lib/test/text.js +6 -3
- package/lib/test/text.js.map +1 -1
- package/lib/textSegment.d.ts +0 -6
- package/lib/textSegment.d.ts.map +1 -1
- package/lib/textSegment.js.map +1 -1
- package/lib/tsdoc-metadata.json +1 -1
- package/lib/zamboni.d.ts.map +1 -1
- package/lib/zamboni.js +32 -28
- package/lib/zamboni.js.map +1 -1
- package/package.json +17 -20
- package/src/MergeTreeTextHelper.ts +17 -12
- package/src/client.ts +141 -197
- package/src/endOfTreeSegment.ts +11 -8
- package/src/index.ts +4 -3
- package/src/mergeTree.ts +482 -633
- package/src/mergeTreeDeltaCallback.ts +4 -8
- package/src/mergeTreeNodes.ts +66 -45
- package/src/partialLengths.ts +181 -137
- package/src/perspective.ts +17 -95
- package/src/revertibles.ts +2 -7
- package/src/segmentInfos.ts +48 -141
- package/src/segmentPropertiesManager.ts +2 -16
- package/src/snapshotLoader.ts +62 -30
- package/src/snapshotV1.ts +36 -28
- package/src/snapshotlegacy.ts +7 -16
- package/src/stamps.ts +1 -1
- package/src/textSegment.ts +0 -13
- package/src/zamboni.ts +38 -32
- package/tsconfig.json +1 -0
- package/prettier.config.cjs +0 -8
|
@@ -3,27 +3,19 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { strict as assert } from "node:assert";
|
|
6
|
-
import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber, } from "../constants.js";
|
|
7
6
|
import { MergeTree } from "../mergeTree.js";
|
|
8
7
|
import { MergeTreeMaintenanceType } from "../mergeTreeDeltaCallback.js";
|
|
8
|
+
import { Marker } from "../mergeTreeNodes.js";
|
|
9
9
|
import { MergeTreeDeltaType, ReferenceType } from "../ops.js";
|
|
10
10
|
import { TextSegment } from "../textSegment.js";
|
|
11
|
-
import { countOperations,
|
|
11
|
+
import { countOperations, makeRemoteClient } from "./testUtils.js";
|
|
12
12
|
describe("MergeTree", () => {
|
|
13
13
|
let mergeTree;
|
|
14
14
|
const localClientId = 17;
|
|
15
15
|
let currentSequenceNumber;
|
|
16
16
|
beforeEach(() => {
|
|
17
17
|
mergeTree = new MergeTree();
|
|
18
|
-
insertSegments(
|
|
19
|
-
mergeTree,
|
|
20
|
-
pos: 0,
|
|
21
|
-
segments: [TextSegment.make("hello world!")],
|
|
22
|
-
refSeq: UniversalSequenceNumber,
|
|
23
|
-
clientId: LocalClientId,
|
|
24
|
-
seq: UniversalSequenceNumber,
|
|
25
|
-
opArgs: undefined,
|
|
26
|
-
});
|
|
18
|
+
mergeTree.insertSegments(0, [TextSegment.make("hello world!")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
27
19
|
currentSequenceNumber = 0;
|
|
28
20
|
mergeTree.startCollaboration(localClientId,
|
|
29
21
|
/* minSeq: */ currentSequenceNumber,
|
|
@@ -35,67 +27,31 @@ describe("MergeTree", () => {
|
|
|
35
27
|
mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
|
|
36
28
|
eventCalled++;
|
|
37
29
|
};
|
|
38
|
-
|
|
39
|
-
mergeTree,
|
|
40
|
-
pos: 0,
|
|
41
|
-
refSeq: currentSequenceNumber,
|
|
42
|
-
clientId: localClientId,
|
|
43
|
-
seq: UnassignedSequenceNumber,
|
|
44
|
-
text: "more ",
|
|
45
|
-
props: undefined,
|
|
46
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
47
|
-
});
|
|
30
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
48
31
|
assert.equal(eventCalled, 1);
|
|
49
32
|
});
|
|
50
33
|
it("Insert ending text", () => {
|
|
51
|
-
const textLength = mergeTree.getLength(
|
|
34
|
+
const textLength = mergeTree.getLength(mergeTree.localPerspective);
|
|
52
35
|
let eventCalled = 0;
|
|
53
36
|
mergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs) => {
|
|
54
37
|
eventCalled++;
|
|
55
38
|
};
|
|
56
|
-
|
|
57
|
-
mergeTree,
|
|
58
|
-
pos: textLength,
|
|
59
|
-
refSeq: currentSequenceNumber,
|
|
60
|
-
clientId: localClientId,
|
|
61
|
-
seq: UnassignedSequenceNumber,
|
|
62
|
-
text: "more ",
|
|
63
|
-
props: undefined,
|
|
64
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
65
|
-
});
|
|
39
|
+
mergeTree.insertSegments(textLength, [TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
66
40
|
assert.equal(eventCalled, 1);
|
|
67
41
|
});
|
|
68
42
|
it("Insert middle text", () => {
|
|
69
43
|
const count = countOperations(mergeTree);
|
|
70
|
-
|
|
71
|
-
mergeTree,
|
|
72
|
-
pos: 4,
|
|
73
|
-
refSeq: currentSequenceNumber,
|
|
74
|
-
clientId: localClientId,
|
|
75
|
-
seq: UnassignedSequenceNumber,
|
|
76
|
-
text: "more ",
|
|
77
|
-
props: undefined,
|
|
78
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
79
|
-
});
|
|
44
|
+
mergeTree.insertSegments(4, [TextSegment.make("more ")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
80
45
|
assert.deepStrictEqual(count, {
|
|
81
46
|
[MergeTreeDeltaType.INSERT]: 1,
|
|
82
47
|
[MergeTreeMaintenanceType.SPLIT]: 1,
|
|
83
48
|
});
|
|
84
49
|
});
|
|
85
50
|
it("Insert text remote", () => {
|
|
86
|
-
const
|
|
51
|
+
const remoteClient = makeRemoteClient({ clientId: 35 });
|
|
87
52
|
let remoteSequenceNumber = currentSequenceNumber;
|
|
88
53
|
const count = countOperations(mergeTree);
|
|
89
|
-
|
|
90
|
-
mergeTree,
|
|
91
|
-
pos: 0,
|
|
92
|
-
refSeq: currentSequenceNumber,
|
|
93
|
-
clientId: remoteClientId,
|
|
94
|
-
seq: ++remoteSequenceNumber,
|
|
95
|
-
text: "more ",
|
|
96
|
-
props: undefined,
|
|
97
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
98
|
-
});
|
|
54
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], remoteClient.perspectiveAt({ refSeq: currentSequenceNumber }), remoteClient.stampAt({ seq: ++remoteSequenceNumber }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
99
55
|
assert.deepStrictEqual(count, {
|
|
100
56
|
[MergeTreeDeltaType.INSERT]: 1,
|
|
101
57
|
});
|
|
@@ -104,16 +60,7 @@ describe("MergeTree", () => {
|
|
|
104
60
|
describe("insertMarker", () => {
|
|
105
61
|
it("Insert marker", () => {
|
|
106
62
|
const count = countOperations(mergeTree);
|
|
107
|
-
|
|
108
|
-
mergeTree,
|
|
109
|
-
pos: 4,
|
|
110
|
-
refSeq: currentSequenceNumber,
|
|
111
|
-
clientId: localClientId,
|
|
112
|
-
seq: UnassignedSequenceNumber,
|
|
113
|
-
behaviors: ReferenceType.Simple,
|
|
114
|
-
props: undefined,
|
|
115
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
116
|
-
});
|
|
63
|
+
mergeTree.insertSegments(4, [Marker.make(ReferenceType.Simple)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
117
64
|
assert.deepStrictEqual(count, {
|
|
118
65
|
[MergeTreeDeltaType.INSERT]: 1,
|
|
119
66
|
[MergeTreeMaintenanceType.SPLIT]: 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.insert.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.insert.deltaCallback.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,
|
|
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 { 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"]}
|
|
@@ -5,27 +5,19 @@
|
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
6
6
|
import { strict as assert } from "node:assert";
|
|
7
7
|
import { MergeTreeTextHelper } from "../MergeTreeTextHelper.js";
|
|
8
|
-
import {
|
|
8
|
+
import { UniversalSequenceNumber } from "../constants.js";
|
|
9
9
|
import { MergeTree } from "../mergeTree.js";
|
|
10
10
|
import { walkAllChildSegments } from "../mergeTreeNodeWalk.js";
|
|
11
11
|
import { MaxNodesInBlock, segmentIsRemoved } from "../mergeTreeNodes.js";
|
|
12
12
|
import { TextSegment } from "../textSegment.js";
|
|
13
|
-
import {
|
|
13
|
+
import { makeRemoteClient, nodeOrdinalsHaveIntegrity } from "./testUtils.js";
|
|
14
14
|
const localClientId = 17;
|
|
15
15
|
const treeFactories = [
|
|
16
16
|
{
|
|
17
17
|
create: () => {
|
|
18
18
|
const initialText = "hello world";
|
|
19
19
|
const mergeTree = new MergeTree();
|
|
20
|
-
insertSegments(
|
|
21
|
-
mergeTree,
|
|
22
|
-
pos: 0,
|
|
23
|
-
segments: [TextSegment.make(initialText)],
|
|
24
|
-
refSeq: UniversalSequenceNumber,
|
|
25
|
-
clientId: LocalClientId,
|
|
26
|
-
seq: UniversalSequenceNumber,
|
|
27
|
-
opArgs: undefined,
|
|
28
|
-
});
|
|
20
|
+
mergeTree.insertSegments(0, [TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
29
21
|
mergeTree.startCollaboration(localClientId,
|
|
30
22
|
/* minSeq: */ UniversalSequenceNumber,
|
|
31
23
|
/* currentSeq: */ UniversalSequenceNumber);
|
|
@@ -43,31 +35,14 @@ const treeFactories = [
|
|
|
43
35
|
create: () => {
|
|
44
36
|
let initialText = "0";
|
|
45
37
|
const mergeTree = new MergeTree();
|
|
46
|
-
insertSegments(
|
|
47
|
-
mergeTree,
|
|
48
|
-
pos: 0,
|
|
49
|
-
segments: [TextSegment.make(initialText)],
|
|
50
|
-
refSeq: UniversalSequenceNumber,
|
|
51
|
-
clientId: LocalClientId,
|
|
52
|
-
seq: UniversalSequenceNumber,
|
|
53
|
-
opArgs: undefined,
|
|
54
|
-
});
|
|
38
|
+
mergeTree.insertSegments(0, [TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
55
39
|
for (let i = 1; i < MaxNodesInBlock - 1; i++) {
|
|
56
40
|
const text = i.toString();
|
|
57
|
-
|
|
58
|
-
mergeTree,
|
|
59
|
-
pos: mergeTree.getLength(UniversalSequenceNumber, localClientId),
|
|
60
|
-
refSeq: UniversalSequenceNumber,
|
|
61
|
-
clientId: localClientId,
|
|
62
|
-
seq: UniversalSequenceNumber,
|
|
63
|
-
text,
|
|
64
|
-
props: undefined,
|
|
65
|
-
opArgs: undefined,
|
|
66
|
-
});
|
|
41
|
+
mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
67
42
|
initialText += text;
|
|
68
43
|
}
|
|
69
44
|
const textHelper = new MergeTreeTextHelper(mergeTree);
|
|
70
|
-
assert.equal(textHelper.getText(
|
|
45
|
+
assert.equal(textHelper.getText(mergeTree.localPerspective), initialText);
|
|
71
46
|
const nodes = [mergeTree.root];
|
|
72
47
|
while (nodes.length > 0) {
|
|
73
48
|
const node = nodes.pop();
|
|
@@ -94,35 +69,18 @@ const treeFactories = [
|
|
|
94
69
|
create: () => {
|
|
95
70
|
let initialText = "0";
|
|
96
71
|
const mergeTree = new MergeTree();
|
|
97
|
-
insertSegments(
|
|
98
|
-
mergeTree,
|
|
99
|
-
pos: 0,
|
|
100
|
-
segments: [TextSegment.make(initialText)],
|
|
101
|
-
refSeq: UniversalSequenceNumber,
|
|
102
|
-
clientId: LocalClientId,
|
|
103
|
-
seq: UniversalSequenceNumber,
|
|
104
|
-
opArgs: undefined,
|
|
105
|
-
});
|
|
72
|
+
mergeTree.insertSegments(0, [TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
106
73
|
for (let i = 1; i < MaxNodesInBlock * 4; i++) {
|
|
107
74
|
const text = i.toString();
|
|
108
|
-
|
|
109
|
-
mergeTree,
|
|
110
|
-
pos: mergeTree.getLength(UniversalSequenceNumber, localClientId),
|
|
111
|
-
refSeq: UniversalSequenceNumber,
|
|
112
|
-
clientId: localClientId,
|
|
113
|
-
seq: UniversalSequenceNumber,
|
|
114
|
-
text,
|
|
115
|
-
props: undefined,
|
|
116
|
-
opArgs: undefined,
|
|
117
|
-
});
|
|
75
|
+
mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
118
76
|
initialText += text;
|
|
119
77
|
}
|
|
120
78
|
const remove = Math.round(initialText.length / 4);
|
|
121
79
|
// remove from start
|
|
122
|
-
mergeTree.markRangeRemoved(0, remove,
|
|
80
|
+
mergeTree.markRangeRemoved(0, remove, mergeTree.localPerspective, { clientId: localClientId, seq: UniversalSequenceNumber }, undefined);
|
|
123
81
|
initialText = initialText.slice(Math.max(0, remove));
|
|
124
82
|
// remove from end
|
|
125
|
-
mergeTree.markRangeRemoved(initialText.length - remove, initialText.length,
|
|
83
|
+
mergeTree.markRangeRemoved(initialText.length - remove, initialText.length, mergeTree.localPerspective, { clientId: localClientId, seq: UniversalSequenceNumber }, undefined);
|
|
126
84
|
initialText = initialText.slice(0, Math.max(0, initialText.length - remove));
|
|
127
85
|
mergeTree.startCollaboration(localClientId,
|
|
128
86
|
/* minSeq: */ UniversalSequenceNumber,
|
|
@@ -152,50 +110,23 @@ describe("MergeTree.insertingWalk", () => {
|
|
|
152
110
|
});
|
|
153
111
|
describe("insertText", () => {
|
|
154
112
|
it("at beginning", () => {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
refSeq: testData.refSeq,
|
|
159
|
-
clientId: localClientId,
|
|
160
|
-
seq: UnassignedSequenceNumber,
|
|
161
|
-
text: "a",
|
|
162
|
-
props: undefined,
|
|
163
|
-
opArgs: undefined,
|
|
164
|
-
});
|
|
165
|
-
assert.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
|
|
166
|
-
const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
|
|
113
|
+
testData.mergeTree.insertSegments(0, [TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
114
|
+
assert.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
|
|
115
|
+
const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
|
|
167
116
|
assert.equal(currentValue.length, testData.initialText.length + 1);
|
|
168
117
|
assert.equal(currentValue, `a${testData.initialText}`);
|
|
169
118
|
});
|
|
170
119
|
it("at end", () => {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
refSeq: testData.refSeq,
|
|
175
|
-
clientId: localClientId,
|
|
176
|
-
seq: UnassignedSequenceNumber,
|
|
177
|
-
text: "a",
|
|
178
|
-
props: undefined,
|
|
179
|
-
opArgs: undefined,
|
|
180
|
-
});
|
|
181
|
-
assert.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
|
|
182
|
-
const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
|
|
120
|
+
testData.mergeTree.insertSegments(testData.initialText.length, [TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
121
|
+
assert.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
|
|
122
|
+
const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
|
|
183
123
|
assert.equal(currentValue.length, testData.initialText.length + 1);
|
|
184
124
|
assert.equal(currentValue, `${testData.initialText}a`);
|
|
185
125
|
});
|
|
186
126
|
it("in middle", () => {
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
refSeq: testData.refSeq,
|
|
191
|
-
clientId: localClientId,
|
|
192
|
-
seq: UnassignedSequenceNumber,
|
|
193
|
-
text: "a",
|
|
194
|
-
props: undefined,
|
|
195
|
-
opArgs: undefined,
|
|
196
|
-
});
|
|
197
|
-
assert.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
|
|
198
|
-
const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
|
|
127
|
+
testData.mergeTree.insertSegments(testData.middle, [TextSegment.make("a")], testData.mergeTree.localPerspective, testData.mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
128
|
+
assert.equal(testData.mergeTree.getLength(testData.mergeTree.localPerspective), testData.initialText.length + 1);
|
|
129
|
+
const currentValue = testData.textHelper.getText(testData.mergeTree.localPerspective);
|
|
199
130
|
assert.equal(currentValue.length, testData.initialText.length + 1);
|
|
200
131
|
assert.equal(currentValue, `${testData.initialText.slice(0, Math.max(0, testData.middle))}` +
|
|
201
132
|
"a" +
|
|
@@ -208,57 +139,25 @@ describe("MergeTree.insertingWalk", () => {
|
|
|
208
139
|
let initialText = "0";
|
|
209
140
|
let seq = 0;
|
|
210
141
|
const mergeTree = new MergeTree();
|
|
142
|
+
mergeTree.insertSegments(0, [TextSegment.make(initialText)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
211
143
|
mergeTree.startCollaboration(localClientId, 0, seq);
|
|
212
|
-
insertSegments({
|
|
213
|
-
mergeTree,
|
|
214
|
-
pos: 0,
|
|
215
|
-
segments: [TextSegment.make(initialText)],
|
|
216
|
-
refSeq: UniversalSequenceNumber,
|
|
217
|
-
clientId: localClientId,
|
|
218
|
-
seq: UniversalSequenceNumber,
|
|
219
|
-
opArgs: undefined,
|
|
220
|
-
});
|
|
221
144
|
for (let i = 1; i < MaxNodesInBlock; i++) {
|
|
222
145
|
const text = String.fromCodePoint(i + 64);
|
|
223
|
-
|
|
224
|
-
mergeTree,
|
|
225
|
-
pos: 0,
|
|
226
|
-
refSeq: UniversalSequenceNumber,
|
|
227
|
-
clientId: localClientId,
|
|
228
|
-
seq: UnassignedSequenceNumber,
|
|
229
|
-
text,
|
|
230
|
-
props: undefined,
|
|
231
|
-
opArgs: undefined,
|
|
232
|
-
});
|
|
146
|
+
mergeTree.insertSegments(0, [TextSegment.make(text)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
233
147
|
initialText += text;
|
|
234
148
|
}
|
|
235
149
|
const textHelper = new MergeTreeTextHelper(mergeTree);
|
|
236
150
|
assert.equal(mergeTree.root.childCount, 2);
|
|
237
|
-
assert.equal(textHelper.getText(
|
|
151
|
+
assert.equal(textHelper.getText(mergeTree.localPerspective), "GFEDCBA0");
|
|
238
152
|
// Remove "DCBA"
|
|
239
|
-
markRangeRemoved(
|
|
240
|
-
|
|
241
|
-
start: 3,
|
|
242
|
-
end: 7,
|
|
243
|
-
refSeq: UniversalSequenceNumber,
|
|
244
|
-
clientId: localClientId,
|
|
245
|
-
seq: UnassignedSequenceNumber,
|
|
246
|
-
overwrite: false,
|
|
247
|
-
opArgs: undefined,
|
|
248
|
-
});
|
|
249
|
-
assert.equal(textHelper.getText(0, localClientId), "GFE0");
|
|
153
|
+
mergeTree.markRangeRemoved(3, 7, mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
154
|
+
assert.equal(textHelper.getText(mergeTree.localPerspective), "GFE0");
|
|
250
155
|
// Simulate another client inserting concurrently with the above operations. Because
|
|
251
156
|
// all segments but the 0 are unacked, this insert should place the segment directly
|
|
252
157
|
// before the 0. Prior to this regression test, an issue with `rightExcursion` in the
|
|
253
158
|
// merge conflict logic instead caused the segment to be placed before the removed segments.
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
pos: 0,
|
|
257
|
-
refSeq: UniversalSequenceNumber,
|
|
258
|
-
clientId: localClientId + 1,
|
|
259
|
-
seq: ++seq,
|
|
260
|
-
text: "x",
|
|
261
|
-
});
|
|
159
|
+
const remoteClient = makeRemoteClient({ clientId: localClientId + 1 });
|
|
160
|
+
mergeTree.insertSegments(0, [TextSegment.make("x")], remoteClient.perspectiveAt({ refSeq: 0 }), remoteClient.stampAt({ seq: ++seq }), undefined);
|
|
262
161
|
const segments = [];
|
|
263
162
|
walkAllChildSegments(mergeTree.root, (seg) => {
|
|
264
163
|
if (TextSegment.is(seg)) {
|
|
@@ -273,5 +172,40 @@ describe("MergeTree.insertingWalk", () => {
|
|
|
273
172
|
});
|
|
274
173
|
assert.deepStrictEqual(segments, ["G", "F", "E", "(D)", "(C)", "(B)", "(A)", "x", "0"]);
|
|
275
174
|
});
|
|
175
|
+
// Inserting walk previously unnecessarily called `blockUpdate` for blocks even when no segment changes happened (e.g.
|
|
176
|
+
// we called `ensureIntervalBoundary` but there was already a segment boundary at the position we wanted to ensure had one).
|
|
177
|
+
it("avoids calling blockUpdate excessively", () => {
|
|
178
|
+
const seq = 1;
|
|
179
|
+
const mergeTree = new MergeTree();
|
|
180
|
+
mergeTree.startCollaboration(localClientId, 0, seq);
|
|
181
|
+
for (const char of [..."hello world"]) {
|
|
182
|
+
mergeTree.insertSegments(mergeTree.getLength(mergeTree.localPerspective), [TextSegment.make(char)], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined /* opArgs */);
|
|
183
|
+
}
|
|
184
|
+
const originalBlockUpdate =
|
|
185
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
186
|
+
mergeTree["blockUpdate"].bind(mergeTree);
|
|
187
|
+
const blockUpdateCallLog = [];
|
|
188
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
189
|
+
mergeTree["blockUpdate"] = (block) => {
|
|
190
|
+
// This is called in the middle of updating lots of merge-tree bookkeeping, so we don't want to do too much
|
|
191
|
+
// advanced stuff here. However, walking the tree and concatenating all the text (ignoring other segment properties)
|
|
192
|
+
// should be safe.
|
|
193
|
+
let text = "";
|
|
194
|
+
walkAllChildSegments(block, (seg) => {
|
|
195
|
+
if (TextSegment.is(seg)) {
|
|
196
|
+
text += seg.text;
|
|
197
|
+
}
|
|
198
|
+
return true;
|
|
199
|
+
});
|
|
200
|
+
blockUpdateCallLog.push(text);
|
|
201
|
+
originalBlockUpdate(block);
|
|
202
|
+
};
|
|
203
|
+
mergeTree.insertSegments(0, [TextSegment.make("Ot")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined /* opArgs */);
|
|
204
|
+
assert.deepEqual(blockUpdateCallLog, ["Othell", "Othello world"]);
|
|
205
|
+
blockUpdateCallLog.length = 0;
|
|
206
|
+
mergeTree.markRangeRemoved(0, "Othello world".length, mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
207
|
+
// The log ignores presence of segments. The important thing is that we only have one entry per block here.
|
|
208
|
+
assert.deepEqual(blockUpdateCallLog, ["Othell", "o world", "Othello world"]);
|
|
209
|
+
});
|
|
276
210
|
});
|
|
277
211
|
//# sourceMappingURL=mergeTree.insertingWalk.spec.js.map
|
|
@@ -1 +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"]}
|
|
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 { 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"]}
|