@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
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { strict as assert } from "node:assert";
|
|
6
6
|
import { MergeTreeDeltaType } from "../ops.js";
|
|
7
|
+
import { TextSegment } from "../textSegment.js";
|
|
7
8
|
import { TestClient } from "./testClient.js";
|
|
8
|
-
import {
|
|
9
|
+
import { makeRemoteClient } from "./testUtils.js";
|
|
9
10
|
describe("obliterate", () => {
|
|
10
11
|
let client;
|
|
11
12
|
let refSeq;
|
|
12
|
-
const
|
|
13
|
-
const
|
|
13
|
+
const remoteClient1 = makeRemoteClient({ clientId: 18 });
|
|
14
|
+
const remoteClient2 = makeRemoteClient({ clientId: 19 });
|
|
14
15
|
beforeEach(() => {
|
|
15
16
|
client = new TestClient({
|
|
16
17
|
mergeTreeEnableObliterate: true,
|
|
@@ -28,131 +29,37 @@ describe("obliterate", () => {
|
|
|
28
29
|
});
|
|
29
30
|
describe("concurrent obliterate and insert", () => {
|
|
30
31
|
it("removes text for obliterate then insert", () => {
|
|
31
|
-
obliterateRange({
|
|
32
|
-
|
|
33
|
-
start: 0,
|
|
34
|
-
end: client.getLength(),
|
|
35
|
-
refSeq,
|
|
36
|
-
clientId: remoteClientId,
|
|
37
|
-
seq: refSeq + 1,
|
|
38
|
-
opArgs: undefined,
|
|
39
|
-
});
|
|
40
|
-
insertText({
|
|
41
|
-
mergeTree: client.mergeTree,
|
|
42
|
-
pos: 1,
|
|
43
|
-
refSeq,
|
|
44
|
-
clientId: remoteClientId + 1,
|
|
45
|
-
seq: refSeq + 2,
|
|
46
|
-
text: "more ",
|
|
47
|
-
props: undefined,
|
|
48
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
49
|
-
});
|
|
32
|
+
client.mergeTree.obliterateRange(0, client.getLength(), remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), undefined);
|
|
33
|
+
client.mergeTree.insertSegments(1, [TextSegment.make("more ")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 2 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
50
34
|
assert.equal(client.getText(), "");
|
|
51
35
|
});
|
|
52
36
|
it("removes text for insert then obliterate when deleting entire string", () => {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
pos: 1,
|
|
56
|
-
refSeq,
|
|
57
|
-
clientId: remoteClientId + 1,
|
|
58
|
-
seq: refSeq + 1,
|
|
59
|
-
text: "more ",
|
|
60
|
-
props: undefined,
|
|
61
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
62
|
-
});
|
|
63
|
-
obliterateRange({
|
|
64
|
-
mergeTree: client.mergeTree,
|
|
65
|
-
start: 0,
|
|
66
|
-
end: "hello world".length,
|
|
67
|
-
refSeq,
|
|
68
|
-
clientId: remoteClientId,
|
|
69
|
-
seq: refSeq + 2,
|
|
70
|
-
opArgs: undefined,
|
|
71
|
-
});
|
|
37
|
+
client.mergeTree.insertSegments(1, [TextSegment.make("more ")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 1 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
38
|
+
client.mergeTree.obliterateRange(0, "hello world".length, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 2 }), undefined);
|
|
72
39
|
assert.equal(client.getText(), "");
|
|
73
40
|
});
|
|
74
41
|
it("removes text for insert then obliterate", () => {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
pos: 5,
|
|
78
|
-
refSeq,
|
|
79
|
-
clientId: remoteClientId + 1,
|
|
80
|
-
seq: refSeq + 1,
|
|
81
|
-
text: "more ",
|
|
82
|
-
props: undefined,
|
|
83
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
84
|
-
});
|
|
85
|
-
obliterateRange({
|
|
86
|
-
mergeTree: client.mergeTree,
|
|
87
|
-
start: 1,
|
|
88
|
-
end: "hello world".length,
|
|
89
|
-
refSeq,
|
|
90
|
-
clientId: remoteClientId,
|
|
91
|
-
seq: refSeq + 2,
|
|
92
|
-
opArgs: undefined,
|
|
93
|
-
});
|
|
42
|
+
client.mergeTree.insertSegments(5, [TextSegment.make("more ")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 1 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
43
|
+
client.mergeTree.obliterateRange(1, "hello world".length, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 2 }), undefined);
|
|
94
44
|
assert.equal(client.getText(), "h");
|
|
95
45
|
});
|
|
96
46
|
});
|
|
97
47
|
describe("endpoint behavior", () => {
|
|
98
48
|
it("does not expand to include text inserted at start", () => {
|
|
99
|
-
obliterateRange({
|
|
100
|
-
|
|
101
|
-
start: 5,
|
|
102
|
-
end: client.getLength(),
|
|
103
|
-
refSeq,
|
|
104
|
-
clientId: remoteClientId,
|
|
105
|
-
seq: refSeq + 1,
|
|
106
|
-
opArgs: undefined,
|
|
107
|
-
});
|
|
108
|
-
insertText({
|
|
109
|
-
mergeTree: client.mergeTree,
|
|
110
|
-
pos: 5,
|
|
111
|
-
refSeq,
|
|
112
|
-
clientId: remoteClientId + 1,
|
|
113
|
-
seq: refSeq + 2,
|
|
114
|
-
text: "XXX",
|
|
115
|
-
props: undefined,
|
|
116
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
117
|
-
});
|
|
49
|
+
client.mergeTree.obliterateRange(5, client.getLength(), remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), undefined);
|
|
50
|
+
client.mergeTree.insertSegments(5, [TextSegment.make("XXX")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 2 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
118
51
|
assert.equal(client.getText(), "helloXXX");
|
|
119
52
|
});
|
|
120
53
|
it("does not expand to include text inserted at end", () => {
|
|
121
|
-
obliterateRange({
|
|
122
|
-
|
|
123
|
-
start: 0,
|
|
124
|
-
end: "hello".length,
|
|
125
|
-
refSeq,
|
|
126
|
-
clientId: remoteClientId,
|
|
127
|
-
seq: refSeq + 1,
|
|
128
|
-
opArgs: undefined,
|
|
129
|
-
});
|
|
130
|
-
insertText({
|
|
131
|
-
mergeTree: client.mergeTree,
|
|
132
|
-
pos: 5,
|
|
133
|
-
refSeq,
|
|
134
|
-
clientId: remoteClientId + 1,
|
|
135
|
-
seq: refSeq + 2,
|
|
136
|
-
text: "XXX",
|
|
137
|
-
props: undefined,
|
|
138
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
139
|
-
});
|
|
54
|
+
client.mergeTree.obliterateRange(0, "hello".length, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), undefined);
|
|
55
|
+
client.mergeTree.insertSegments(5, [TextSegment.make("XXX")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 2 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
140
56
|
assert.equal(client.getText(), "XXX world");
|
|
141
57
|
});
|
|
142
58
|
});
|
|
143
59
|
describe("local obliterate with concurrent inserts", () => {
|
|
144
60
|
it("removes range when pending local obliterate op", () => {
|
|
145
61
|
client.obliterateRangeLocal(0, client.getLength());
|
|
146
|
-
|
|
147
|
-
mergeTree: client.mergeTree,
|
|
148
|
-
pos: 1,
|
|
149
|
-
refSeq,
|
|
150
|
-
clientId: remoteClientId,
|
|
151
|
-
seq: refSeq + 2,
|
|
152
|
-
text: "XXX",
|
|
153
|
-
props: undefined,
|
|
154
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
155
|
-
});
|
|
62
|
+
client.mergeTree.insertSegments(1, [TextSegment.make("XXX")], remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
156
63
|
assert.equal(client.getText(), "");
|
|
157
64
|
});
|
|
158
65
|
});
|
|
@@ -165,25 +72,8 @@ describe("obliterate", () => {
|
|
|
165
72
|
const startSeg = client.getContainingSegment(obliterateStart);
|
|
166
73
|
const endSeg = client.getContainingSegment(obliterateEnd);
|
|
167
74
|
let seq = refSeq;
|
|
168
|
-
obliterateRange({
|
|
169
|
-
|
|
170
|
-
start: obliterateStart,
|
|
171
|
-
end: obliterateEnd,
|
|
172
|
-
refSeq,
|
|
173
|
-
clientId: remoteClientId,
|
|
174
|
-
seq: ++seq,
|
|
175
|
-
opArgs: undefined,
|
|
176
|
-
});
|
|
177
|
-
insertText({
|
|
178
|
-
mergeTree: client.mergeTree,
|
|
179
|
-
pos: 1,
|
|
180
|
-
refSeq,
|
|
181
|
-
clientId: remoteClientId + 1,
|
|
182
|
-
seq: ++seq,
|
|
183
|
-
text: "more ",
|
|
184
|
-
props: undefined,
|
|
185
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
186
|
-
});
|
|
75
|
+
client.mergeTree.obliterateRange(obliterateStart, obliterateEnd, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: ++seq }), undefined);
|
|
76
|
+
client.mergeTree.insertSegments(1, [TextSegment.make("more ")], remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: ++seq }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
187
77
|
assert.equal(client.getText(), "");
|
|
188
78
|
startSeg.segment?.localRefs?.walkReferences((ref) => {
|
|
189
79
|
const oblProps = ref.properties?.obliterate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"obliterate.spec.js","sourceRoot":"","sources":["../../src/test/obliterate.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 type { ISegmentPrivate, ObliterateInfo } from \"../mergeTreeNodes.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\n\nimport { TestClient } from \"./testClient.js\";\nimport { insertText, obliterateRange } from \"./testUtils.js\";\n\ndescribe(\"obliterate\", () => {\n\tlet client: TestClient;\n\tlet refSeq: number;\n\tconst localClientId = 17;\n\tconst remoteClientId = localClientId + 1;\n\n\tbeforeEach(() => {\n\t\tclient = new TestClient({\n\t\t\tmergeTreeEnableObliterate: true,\n\t\t});\n\t\tclient.startOrUpdateCollaboration(\"local\");\n\t\tfor (const char of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), char),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.equal(client.getText(), \"hello world\");\n\t\trefSeq = client.getCurrentSeq();\n\t});\n\n\tit(\"removes text\", () => {\n\t\tclient.obliterateRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tdescribe(\"concurrent obliterate and insert\", () => {\n\t\tit(\"removes text for obliterate then insert\", () => {\n\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: client.getLength(),\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 1,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 2,\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\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t\tit(\"removes text for insert then obliterate when deleting entire string\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 1,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 1,\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\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: \"hello world\".length,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t\tit(\"removes text for insert then obliterate\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 5,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 1,\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\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: 1,\n\t\t\t\tend: \"hello world\".length,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tassert.equal(client.getText(), \"h\");\n\t\t});\n\t});\n\n\tdescribe(\"endpoint behavior\", () => {\n\t\tit(\"does not expand to include text inserted at start\", () => {\n\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: 5,\n\t\t\t\tend: client.getLength(),\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 5,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\ttext: \"XXX\",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\t\t\tassert.equal(client.getText(), \"helloXXX\");\n\t\t});\n\t\tit(\"does not expand to include text inserted at end\", () => {\n\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: \"hello\".length,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 5,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\ttext: \"XXX\",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\t\t\tassert.equal(client.getText(), \"XXX world\");\n\t\t});\n\t});\n\n\tdescribe(\"local obliterate with concurrent inserts\", () => {\n\t\tit(\"removes range when pending local obliterate op\", () => {\n\t\t\tclient.obliterateRangeLocal(0, client.getLength());\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 1,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\ttext: \"XXX\",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t});\n\n\tdescribe(\"local references\", () => {\n\t\tit(\"cleans up local references once the collab window advances enough\", () => {\n\t\t\tconst client2 = new TestClient({ mergeTreeEnableObliterate: true });\n\t\t\tclient2.startOrUpdateCollaboration(\"client2\");\n\n\t\t\tconst obliterateStart = 0;\n\t\t\tconst obliterateEnd = client.getLength();\n\t\t\tconst startSeg = client.getContainingSegment<ISegmentPrivate>(obliterateStart);\n\t\t\tconst endSeg = client.getContainingSegment<ISegmentPrivate>(obliterateEnd);\n\t\t\tlet seq = refSeq;\n\t\t\tobliterateRange({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tstart: obliterateStart,\n\t\t\t\tend: obliterateEnd,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++seq,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tinsertText({\n\t\t\t\tmergeTree: client.mergeTree,\n\t\t\t\tpos: 1,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: ++seq,\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\t\t\tassert.equal(client.getText(), \"\");\n\n\t\t\tstartSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps?.start !== undefined, \"start ref should NOT be removed\");\n\t\t\t});\n\t\t\tendSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps?.end !== undefined, \"end ref should NOT be removed\");\n\t\t\t});\n\n\t\t\t// this will force Zamboni to run\n\t\t\tfor (let i = 0; i < 5; i++) {\n\t\t\t\tconst insert = client.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), i.toString()),\n\t\t\t\t\t++seq,\n\t\t\t\t);\n\t\t\t\tinsert.minimumSequenceNumber = seq - 1;\n\t\t\t\tclient.applyMsg(insert);\n\t\t\t\tclient2.applyMsg(insert);\n\t\t\t}\n\n\t\t\t// want to check that the start and end segment don't have the obliterate refs on them\n\t\t\tstartSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps.start === undefined, \"start ref should be removed\");\n\t\t\t});\n\t\t\tendSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps.end === undefined, \"end ref should be removed\");\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
1
|
+
{"version":3,"file":"obliterate.spec.js","sourceRoot":"","sources":["../../src/test/obliterate.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 type { ISegmentPrivate, ObliterateInfo } from \"../mergeTreeNodes.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { TestClient } from \"./testClient.js\";\nimport { makeRemoteClient } from \"./testUtils.js\";\n\ndescribe(\"obliterate\", () => {\n\tlet client: TestClient;\n\tlet refSeq: number;\n\tconst remoteClient1 = makeRemoteClient({ clientId: 18 });\n\tconst remoteClient2 = makeRemoteClient({ clientId: 19 });\n\n\tbeforeEach(() => {\n\t\tclient = new TestClient({\n\t\t\tmergeTreeEnableObliterate: true,\n\t\t});\n\t\tclient.startOrUpdateCollaboration(\"local\");\n\t\tfor (const char of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), char),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.equal(client.getText(), \"hello world\");\n\t\trefSeq = client.getCurrentSeq();\n\t});\n\n\tit(\"removes text\", () => {\n\t\tclient.obliterateRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tdescribe(\"concurrent obliterate and insert\", () => {\n\t\tit(\"removes text for obliterate then insert\", () => {\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\t0,\n\t\t\t\tclient.getLength(),\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t1,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 2 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t\tit(\"removes text for insert then obliterate when deleting entire string\", () => {\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t1,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 1 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\t0,\n\t\t\t\t\"hello world\".length,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 2 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t\tit(\"removes text for insert then obliterate\", () => {\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t5,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 1 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\t1,\n\t\t\t\t\"hello world\".length,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 2 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"h\");\n\t\t});\n\t});\n\n\tdescribe(\"endpoint behavior\", () => {\n\t\tit(\"does not expand to include text inserted at start\", () => {\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\t5,\n\t\t\t\tclient.getLength(),\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t5,\n\t\t\t\t[TextSegment.make(\"XXX\")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 2 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"helloXXX\");\n\t\t});\n\t\tit(\"does not expand to include text inserted at end\", () => {\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\t0,\n\t\t\t\t\"hello\".length,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t5,\n\t\t\t\t[TextSegment.make(\"XXX\")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 2 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"XXX world\");\n\t\t});\n\t});\n\n\tdescribe(\"local obliterate with concurrent inserts\", () => {\n\t\tit(\"removes range when pending local obliterate op\", () => {\n\t\t\tclient.obliterateRangeLocal(0, client.getLength());\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t1,\n\t\t\t\t[TextSegment.make(\"XXX\")],\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"\");\n\t\t});\n\t});\n\n\tdescribe(\"local references\", () => {\n\t\tit(\"cleans up local references once the collab window advances enough\", () => {\n\t\t\tconst client2 = new TestClient({ mergeTreeEnableObliterate: true });\n\t\t\tclient2.startOrUpdateCollaboration(\"client2\");\n\n\t\t\tconst obliterateStart = 0;\n\t\t\tconst obliterateEnd = client.getLength();\n\t\t\tconst startSeg = client.getContainingSegment<ISegmentPrivate>(obliterateStart);\n\t\t\tconst endSeg = client.getContainingSegment<ISegmentPrivate>(obliterateEnd);\n\t\t\tlet seq = refSeq;\n\t\t\tclient.mergeTree.obliterateRange(\n\t\t\t\tobliterateStart,\n\t\t\t\tobliterateEnd,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: ++seq }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tclient.mergeTree.insertSegments(\n\t\t\t\t1,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: ++seq }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\t\t\tassert.equal(client.getText(), \"\");\n\n\t\t\tstartSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps?.start !== undefined, \"start ref should NOT be removed\");\n\t\t\t});\n\t\t\tendSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps?.end !== undefined, \"end ref should NOT be removed\");\n\t\t\t});\n\n\t\t\t// this will force Zamboni to run\n\t\t\tfor (let i = 0; i < 5; i++) {\n\t\t\t\tconst insert = client.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), i.toString()),\n\t\t\t\t\t++seq,\n\t\t\t\t);\n\t\t\t\tinsert.minimumSequenceNumber = seq - 1;\n\t\t\t\tclient.applyMsg(insert);\n\t\t\t\tclient2.applyMsg(insert);\n\t\t\t}\n\n\t\t\t// want to check that the start and end segment don't have the obliterate refs on them\n\t\t\tstartSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps.start === undefined, \"start ref should be removed\");\n\t\t\t});\n\t\t\tendSeg.segment?.localRefs?.walkReferences((ref) => {\n\t\t\t\tconst oblProps = ref.properties?.obliterate as ObliterateInfo;\n\t\t\t\tassert(oblProps.end === undefined, \"end ref should be removed\");\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
@@ -2,28 +2,24 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { UnassignedSequenceNumber } from "../constants.js";
|
|
6
5
|
import { MergeTree } from "../mergeTree.js";
|
|
7
6
|
import { MergeTreeDeltaType } from "../ops.js";
|
|
8
7
|
import { TextSegment } from "../textSegment.js";
|
|
9
|
-
import {
|
|
8
|
+
import { makeRemoteClient, useStrictPartialLengthChecks, validatePartialLengths, } from "./testUtils.js";
|
|
10
9
|
describe("partial lengths", () => {
|
|
11
10
|
let mergeTree;
|
|
12
11
|
const localClientId = 17;
|
|
13
12
|
const remoteClientId = 18;
|
|
14
13
|
const refSeq = 0;
|
|
14
|
+
const ackedLocalClientStamp = (seq) => ({
|
|
15
|
+
seq,
|
|
16
|
+
clientId: localClientId,
|
|
17
|
+
});
|
|
18
|
+
const remoteClient1 = makeRemoteClient({ clientId: 18 });
|
|
15
19
|
useStrictPartialLengthChecks();
|
|
16
20
|
beforeEach(() => {
|
|
17
21
|
mergeTree = new MergeTree();
|
|
18
|
-
insertSegments(
|
|
19
|
-
mergeTree,
|
|
20
|
-
pos: 0,
|
|
21
|
-
segments: [TextSegment.make("hello world!")],
|
|
22
|
-
refSeq,
|
|
23
|
-
clientId: localClientId,
|
|
24
|
-
seq: 0,
|
|
25
|
-
opArgs: undefined,
|
|
26
|
-
});
|
|
22
|
+
mergeTree.insertSegments(0, [TextSegment.make("hello world!")], mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
27
23
|
mergeTree.startCollaboration(localClientId, /* minSeq: */ 0, /* currentSeq: */ 0);
|
|
28
24
|
});
|
|
29
25
|
it("passes with no additional ops", () => {
|
|
@@ -31,165 +27,52 @@ describe("partial lengths", () => {
|
|
|
31
27
|
});
|
|
32
28
|
describe("a single inserted element", () => {
|
|
33
29
|
it("includes length of local insert for local view", () => {
|
|
34
|
-
|
|
35
|
-
mergeTree,
|
|
36
|
-
pos: 0,
|
|
37
|
-
refSeq,
|
|
38
|
-
clientId: localClientId,
|
|
39
|
-
seq: refSeq + 1,
|
|
40
|
-
text: "more ",
|
|
41
|
-
props: undefined,
|
|
42
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
43
|
-
});
|
|
30
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
44
31
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);
|
|
45
32
|
});
|
|
46
33
|
it("includes length of local insert for remote view", () => {
|
|
47
|
-
|
|
48
|
-
mergeTree,
|
|
49
|
-
pos: 0,
|
|
50
|
-
refSeq,
|
|
51
|
-
clientId: localClientId,
|
|
52
|
-
seq: refSeq + 1,
|
|
53
|
-
text: "more ",
|
|
54
|
-
props: undefined,
|
|
55
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
56
|
-
});
|
|
34
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
57
35
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);
|
|
58
36
|
});
|
|
59
37
|
it("includes length of remote insert for local view", () => {
|
|
60
|
-
|
|
61
|
-
mergeTree,
|
|
62
|
-
pos: 0,
|
|
63
|
-
refSeq,
|
|
64
|
-
clientId: remoteClientId,
|
|
65
|
-
seq: refSeq + 1,
|
|
66
|
-
text: "more ",
|
|
67
|
-
props: undefined,
|
|
68
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
69
|
-
});
|
|
38
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
70
39
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);
|
|
71
40
|
});
|
|
72
41
|
it("includes length of remote insert for remote view", () => {
|
|
73
|
-
|
|
74
|
-
mergeTree,
|
|
75
|
-
pos: 0,
|
|
76
|
-
refSeq,
|
|
77
|
-
clientId: remoteClientId,
|
|
78
|
-
seq: refSeq + 1,
|
|
79
|
-
text: "more ",
|
|
80
|
-
props: undefined,
|
|
81
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
82
|
-
});
|
|
42
|
+
mergeTree.insertSegments(0, [TextSegment.make("more ")], remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), { op: { type: MergeTreeDeltaType.INSERT } });
|
|
83
43
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);
|
|
84
44
|
});
|
|
85
45
|
});
|
|
86
46
|
describe("a single removed segment", () => {
|
|
87
47
|
it("includes result of local delete for local view", () => {
|
|
88
|
-
markRangeRemoved(
|
|
89
|
-
mergeTree,
|
|
90
|
-
start: 0,
|
|
91
|
-
end: 12,
|
|
92
|
-
refSeq,
|
|
93
|
-
clientId: localClientId,
|
|
94
|
-
seq: refSeq + 1,
|
|
95
|
-
overwrite: false,
|
|
96
|
-
opArgs: undefined,
|
|
97
|
-
});
|
|
48
|
+
mergeTree.markRangeRemoved(0, 12, mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), undefined);
|
|
98
49
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);
|
|
99
50
|
});
|
|
100
51
|
it("includes result of local delete for remote view", () => {
|
|
101
|
-
markRangeRemoved(
|
|
102
|
-
mergeTree,
|
|
103
|
-
start: 0,
|
|
104
|
-
end: 12,
|
|
105
|
-
refSeq,
|
|
106
|
-
clientId: localClientId,
|
|
107
|
-
seq: refSeq + 1,
|
|
108
|
-
overwrite: false,
|
|
109
|
-
opArgs: undefined,
|
|
110
|
-
});
|
|
52
|
+
mergeTree.markRangeRemoved(0, 12, mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), undefined);
|
|
111
53
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);
|
|
112
54
|
});
|
|
113
55
|
it("includes result of remote delete for local view", () => {
|
|
114
|
-
markRangeRemoved({
|
|
115
|
-
mergeTree,
|
|
116
|
-
start: 0,
|
|
117
|
-
end: 12,
|
|
118
|
-
refSeq,
|
|
119
|
-
clientId: remoteClientId,
|
|
120
|
-
seq: refSeq + 1,
|
|
121
|
-
overwrite: false,
|
|
122
|
-
opArgs: undefined,
|
|
123
|
-
});
|
|
56
|
+
mergeTree.markRangeRemoved(0, 12, remoteClient1.perspectiveAt({ refSeq }), ackedLocalClientStamp(refSeq + 1), undefined);
|
|
124
57
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);
|
|
125
58
|
});
|
|
126
59
|
it("includes result of remote delete for remote view", () => {
|
|
127
|
-
markRangeRemoved({
|
|
128
|
-
mergeTree,
|
|
129
|
-
start: 0,
|
|
130
|
-
end: 12,
|
|
131
|
-
refSeq,
|
|
132
|
-
clientId: remoteClientId,
|
|
133
|
-
seq: refSeq + 1,
|
|
134
|
-
overwrite: false,
|
|
135
|
-
opArgs: undefined,
|
|
136
|
-
});
|
|
60
|
+
mergeTree.markRangeRemoved(0, 12, remoteClient1.perspectiveAt({ refSeq }), ackedLocalClientStamp(refSeq + 1), undefined);
|
|
137
61
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);
|
|
138
62
|
});
|
|
139
63
|
});
|
|
140
64
|
describe("aggregation", () => {
|
|
141
65
|
it("includes lengths from multiple permutations in single tree", () => {
|
|
142
|
-
insertSegments(
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
refSeq,
|
|
147
|
-
clientId: localClientId,
|
|
148
|
-
seq: refSeq + 1,
|
|
149
|
-
opArgs: undefined,
|
|
150
|
-
});
|
|
151
|
-
insertSegments({
|
|
152
|
-
mergeTree,
|
|
153
|
-
pos: 0,
|
|
154
|
-
segments: [TextSegment.make("2")],
|
|
155
|
-
refSeq: refSeq + 1,
|
|
156
|
-
clientId: remoteClientId,
|
|
157
|
-
seq: refSeq + 2,
|
|
158
|
-
opArgs: undefined,
|
|
159
|
-
});
|
|
160
|
-
insertSegments({
|
|
161
|
-
mergeTree,
|
|
162
|
-
pos: 0,
|
|
163
|
-
segments: [TextSegment.make("3")],
|
|
164
|
-
refSeq: refSeq + 2,
|
|
165
|
-
clientId: localClientId,
|
|
166
|
-
seq: refSeq + 3,
|
|
167
|
-
opArgs: undefined,
|
|
168
|
-
});
|
|
169
|
-
insertSegments({
|
|
170
|
-
mergeTree,
|
|
171
|
-
pos: 0,
|
|
172
|
-
segments: [TextSegment.make("4")],
|
|
173
|
-
refSeq: refSeq + 3,
|
|
174
|
-
clientId: remoteClientId,
|
|
175
|
-
seq: refSeq + 4,
|
|
176
|
-
opArgs: undefined,
|
|
177
|
-
});
|
|
66
|
+
mergeTree.insertSegments(0, [TextSegment.make("1")], mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), undefined);
|
|
67
|
+
mergeTree.insertSegments(0, [TextSegment.make("2")], remoteClient1.perspectiveAt({ refSeq: refSeq + 1 }), remoteClient1.stampAt({ seq: refSeq + 2 }), undefined);
|
|
68
|
+
mergeTree.insertSegments(0, [TextSegment.make("3")], mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 3), undefined);
|
|
69
|
+
mergeTree.insertSegments(0, [TextSegment.make("4")], remoteClient1.perspectiveAt({ refSeq: refSeq + 3 }), remoteClient1.stampAt({ seq: refSeq + 4 }), undefined);
|
|
178
70
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 4, len: 16 }]);
|
|
179
71
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 4, len: 16 }]);
|
|
180
72
|
});
|
|
181
73
|
it("is correct for different heights", () => {
|
|
182
74
|
for (let i = 0; i < 100; i++) {
|
|
183
|
-
|
|
184
|
-
mergeTree,
|
|
185
|
-
pos: 0,
|
|
186
|
-
refSeq: i,
|
|
187
|
-
clientId: localClientId,
|
|
188
|
-
seq: i + 1,
|
|
189
|
-
text: "a",
|
|
190
|
-
props: undefined,
|
|
191
|
-
opArgs: { op: { type: MergeTreeDeltaType.INSERT } },
|
|
192
|
-
});
|
|
75
|
+
mergeTree.insertSegments(0, [TextSegment.make("a")], mergeTree.localPerspective, ackedLocalClientStamp(i + 1), undefined);
|
|
193
76
|
validatePartialLengths(localClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);
|
|
194
77
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);
|
|
195
78
|
}
|
|
@@ -199,73 +82,22 @@ describe("partial lengths", () => {
|
|
|
199
82
|
});
|
|
200
83
|
describe("concurrent, overlapping deletes", () => {
|
|
201
84
|
it("concurrent remote changes are visible to local", () => {
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
end: 10,
|
|
206
|
-
refSeq,
|
|
207
|
-
clientId: remoteClientId,
|
|
208
|
-
seq: refSeq + 1,
|
|
209
|
-
overwrite: false,
|
|
210
|
-
opArgs: undefined,
|
|
211
|
-
});
|
|
212
|
-
markRangeRemoved({
|
|
213
|
-
mergeTree,
|
|
214
|
-
start: 0,
|
|
215
|
-
end: 10,
|
|
216
|
-
refSeq,
|
|
217
|
-
clientId: remoteClientId + 1,
|
|
218
|
-
seq: refSeq + 2,
|
|
219
|
-
overwrite: false,
|
|
220
|
-
opArgs: undefined,
|
|
221
|
-
});
|
|
85
|
+
const remoteClient2 = makeRemoteClient({ clientId: 19 });
|
|
86
|
+
mergeTree.markRangeRemoved(0, 10, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), undefined);
|
|
87
|
+
mergeTree.markRangeRemoved(0, 10, remoteClient2.perspectiveAt({ refSeq }), remoteClient2.stampAt({ seq: refSeq + 2 }), undefined);
|
|
222
88
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
89
|
+
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
90
|
+
validatePartialLengths(remoteClientId + 1, mergeTree, [{ seq: 1, len: 2 }]);
|
|
223
91
|
});
|
|
224
92
|
it("concurrent local and remote changes are visible", () => {
|
|
225
|
-
markRangeRemoved(
|
|
226
|
-
|
|
227
|
-
start: 0,
|
|
228
|
-
end: 10,
|
|
229
|
-
refSeq,
|
|
230
|
-
clientId: localClientId,
|
|
231
|
-
seq: refSeq + 1,
|
|
232
|
-
overwrite: false,
|
|
233
|
-
opArgs: undefined,
|
|
234
|
-
});
|
|
235
|
-
markRangeRemoved({
|
|
236
|
-
mergeTree,
|
|
237
|
-
start: 0,
|
|
238
|
-
end: 10,
|
|
239
|
-
refSeq,
|
|
240
|
-
clientId: remoteClientId,
|
|
241
|
-
seq: refSeq + 2,
|
|
242
|
-
overwrite: false,
|
|
243
|
-
opArgs: undefined,
|
|
244
|
-
});
|
|
93
|
+
mergeTree.markRangeRemoved(0, 10, mergeTree.localPerspective, ackedLocalClientStamp(refSeq + 1), undefined);
|
|
94
|
+
mergeTree.markRangeRemoved(0, 10, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 2 }), undefined);
|
|
245
95
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
246
96
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
247
97
|
});
|
|
248
98
|
it("concurrent remote and unsequenced local changes are visible", () => {
|
|
249
|
-
markRangeRemoved(
|
|
250
|
-
|
|
251
|
-
start: 0,
|
|
252
|
-
end: 10,
|
|
253
|
-
refSeq,
|
|
254
|
-
clientId: localClientId,
|
|
255
|
-
seq: UnassignedSequenceNumber,
|
|
256
|
-
overwrite: false,
|
|
257
|
-
opArgs: undefined,
|
|
258
|
-
});
|
|
259
|
-
markRangeRemoved({
|
|
260
|
-
mergeTree,
|
|
261
|
-
start: 0,
|
|
262
|
-
end: 10,
|
|
263
|
-
refSeq,
|
|
264
|
-
clientId: remoteClientId,
|
|
265
|
-
seq: refSeq + 1,
|
|
266
|
-
overwrite: false,
|
|
267
|
-
opArgs: undefined,
|
|
268
|
-
});
|
|
99
|
+
mergeTree.markRangeRemoved(0, 10, mergeTree.localPerspective, mergeTree.collabWindow.mintNextLocalOperationStamp(), undefined);
|
|
100
|
+
mergeTree.markRangeRemoved(0, 10, remoteClient1.perspectiveAt({ refSeq }), remoteClient1.stampAt({ seq: refSeq + 1 }), undefined);
|
|
269
101
|
validatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
270
102
|
validatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);
|
|
271
103
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partialLength.spec.js","sourceRoot":"","sources":["../../src/test/partialLength.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 { UnassignedSequenceNumber } from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport {\n\tinsertSegments,\n\tinsertText,\n\tmarkRangeRemoved,\n\tuseStrictPartialLengthChecks,\n\tvalidatePartialLengths,\n} from \"./testUtils.js\";\n\ndescribe(\"partial lengths\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tconst remoteClientId = 18;\n\tconst refSeq = 0;\n\n\tuseStrictPartialLengthChecks();\n\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,\n\t\t\tclientId: localClientId,\n\t\t\tseq: 0,\n\t\t\topArgs: undefined,\n\t\t});\n\n\t\tmergeTree.startCollaboration(localClientId, /* minSeq: */ 0, /* currentSeq: */ 0);\n\t});\n\n\tit(\"passes with no additional ops\", () => {\n\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: refSeq, len: 12 }]);\n\t});\n\n\tdescribe(\"a single inserted element\", () => {\n\t\tit(\"includes length of local insert for local view\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\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\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of local insert for remote view\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\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\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of remote insert for local view\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\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\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of remote insert for remote view\", () => {\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\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\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t});\n\n\tdescribe(\"a single removed segment\", () => {\n\t\tit(\"includes result of local delete for local view\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 12,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of local delete for remote view\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 12,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of remote delete for local view\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 12,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of remote delete for remote view\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 12,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t});\n\n\tdescribe(\"aggregation\", () => {\n\t\tit(\"includes lengths from multiple permutations in single tree\", () => {\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(\"1\")],\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(\"2\")],\n\t\t\t\trefSeq: refSeq + 1,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(\"3\")],\n\t\t\t\trefSeq: refSeq + 2,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 3,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(\"4\")],\n\t\t\t\trefSeq: refSeq + 3,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 4,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 4, len: 16 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 4, len: 16 }]);\n\t\t});\n\n\t\tit(\"is correct for different heights\", () => {\n\t\t\tfor (let i = 0; i < 100; i++) {\n\t\t\t\tinsertText({\n\t\t\t\t\tmergeTree,\n\t\t\t\t\tpos: 0,\n\t\t\t\t\trefSeq: i,\n\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\tseq: i + 1,\n\t\t\t\t\ttext: \"a\",\n\t\t\t\t\tprops: undefined,\n\t\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t\t});\n\n\t\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);\n\t\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);\n\t\t\t}\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 100, len: 112 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 100, len: 112 }]);\n\t\t});\n\t});\n\n\tdescribe(\"concurrent, overlapping deletes\", () => {\n\t\tit(\"concurrent remote changes are visible to local\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId + 1,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t\tit(\"concurrent local and remote changes are visible\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 2,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t\tit(\"concurrent remote and unsequenced local changes are visible\", () => {\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 0,\n\t\t\t\tend: 10,\n\t\t\t\trefSeq,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: refSeq + 1,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t});\n});\n"]}
|
|
1
|
+
{"version":3,"file":"partialLength.spec.js","sourceRoot":"","sources":["../../src/test/partialLength.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 { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\nimport type { OperationStamp } from \"../stamps.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport {\n\tmakeRemoteClient,\n\tuseStrictPartialLengthChecks,\n\tvalidatePartialLengths,\n} from \"./testUtils.js\";\n\ndescribe(\"partial lengths\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tconst remoteClientId = 18;\n\tconst refSeq = 0;\n\n\tconst ackedLocalClientStamp = (seq: number): OperationStamp => ({\n\t\tseq,\n\t\tclientId: localClientId,\n\t});\n\n\tconst remoteClient1 = makeRemoteClient({ clientId: 18 });\n\n\tuseStrictPartialLengthChecks();\n\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\tmergeTree.startCollaboration(localClientId, /* minSeq: */ 0, /* currentSeq: */ 0);\n\t});\n\n\tit(\"passes with no additional ops\", () => {\n\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: refSeq, len: 12 }]);\n\t});\n\n\tdescribe(\"a single inserted element\", () => {\n\t\tit(\"includes length of local insert for local view\", () => {\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\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of local insert for remote view\", () => {\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\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of remote insert for local view\", () => {\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t\tit(\"includes length of remote insert for remote view\", () => {\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"more \")],\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\t{ op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 17 }]);\n\t\t});\n\t});\n\n\tdescribe(\"a single removed segment\", () => {\n\t\tit(\"includes result of local delete for local view\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t12,\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of local delete for remote view\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t12,\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of remote delete for local view\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t12,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t\tit(\"includes result of remote delete for remote view\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t12,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 0 }]);\n\t\t});\n\t});\n\n\tdescribe(\"aggregation\", () => {\n\t\tit(\"includes lengths from multiple permutations in single tree\", () => {\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"1\")],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined,\n\t\t\t);\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"2\")],\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq: refSeq + 1 }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 2 }),\n\t\t\t\tundefined,\n\t\t\t);\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"3\")],\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tackedLocalClientStamp(refSeq + 3),\n\t\t\t\tundefined,\n\t\t\t);\n\t\t\tmergeTree.insertSegments(\n\t\t\t\t0,\n\t\t\t\t[TextSegment.make(\"4\")],\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq: refSeq + 3 }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 4 }),\n\t\t\t\tundefined,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 4, len: 16 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 4, len: 16 }]);\n\t\t});\n\n\t\tit(\"is correct for different heights\", () => {\n\t\t\tfor (let i = 0; i < 100; i++) {\n\t\t\t\tmergeTree.insertSegments(\n\t\t\t\t\t0,\n\t\t\t\t\t[TextSegment.make(\"a\")],\n\t\t\t\t\tmergeTree.localPerspective,\n\t\t\t\t\tackedLocalClientStamp(i + 1),\n\t\t\t\t\tundefined,\n\t\t\t\t);\n\n\t\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);\n\t\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: i + 1, len: i + 13 }]);\n\t\t\t}\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 100, len: 112 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 100, len: 112 }]);\n\t\t});\n\t});\n\n\tdescribe(\"concurrent, overlapping deletes\", () => {\n\t\tit(\"concurrent remote changes are visible to local\", () => {\n\t\t\tconst remoteClient2 = makeRemoteClient({ clientId: 19 });\n\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tremoteClient2.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient2.stampAt({ seq: refSeq + 2 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId + 1, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t\tit(\"concurrent local and remote changes are visible\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tackedLocalClientStamp(refSeq + 1),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 2 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t\tit(\"concurrent remote and unsequenced local changes are visible\", () => {\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tmergeTree.localPerspective,\n\t\t\t\tmergeTree.collabWindow.mintNextLocalOperationStamp(),\n\t\t\t\tundefined as never,\n\t\t\t);\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\t10,\n\t\t\t\tremoteClient1.perspectiveAt({ refSeq }),\n\t\t\t\tremoteClient1.stampAt({ seq: refSeq + 1 }),\n\t\t\t\tundefined as never,\n\t\t\t);\n\n\t\t\tvalidatePartialLengths(localClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t\tvalidatePartialLengths(remoteClientId, mergeTree, [{ seq: 1, len: 2 }]);\n\t\t});\n\t});\n});\n"]}
|