@fluidframework/merge-tree 2.1.0-276985 → 2.1.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/.eslintrc.cjs +2 -4
- package/CHANGELOG.md +15 -0
- package/README.md +109 -1
- package/api-extractor/api-extractor.current.json +5 -0
- package/api-extractor/api-extractor.legacy.json +1 -1
- package/api-extractor.json +1 -1
- package/api-report/merge-tree.legacy.alpha.api.md +10 -22
- package/api-report/merge-tree.legacy.public.api.md +9 -0
- package/dist/MergeTreeTextHelper.d.ts.map +1 -1
- package/dist/MergeTreeTextHelper.js +1 -1
- package/dist/MergeTreeTextHelper.js.map +1 -1
- package/dist/attributionCollection.d.ts.map +1 -1
- package/dist/attributionCollection.js +65 -17
- package/dist/attributionCollection.js.map +1 -1
- package/dist/attributionPolicy.d.ts +2 -1
- package/dist/attributionPolicy.d.ts.map +1 -1
- package/dist/attributionPolicy.js +10 -3
- package/dist/attributionPolicy.js.map +1 -1
- package/dist/client.d.ts +3 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +65 -37
- package/dist/client.js.map +1 -1
- package/dist/collections/list.d.ts.map +1 -1
- package/dist/collections/list.js +5 -2
- package/dist/collections/list.js.map +1 -1
- package/dist/collections/rbTree.d.ts +2 -2
- package/dist/collections/rbTree.d.ts.map +1 -1
- package/dist/collections/rbTree.js +23 -35
- package/dist/collections/rbTree.js.map +1 -1
- package/dist/endOfTreeSegment.d.ts.map +1 -1
- package/dist/endOfTreeSegment.js +4 -1
- package/dist/endOfTreeSegment.js.map +1 -1
- package/dist/legacy.d.ts +1 -1
- package/dist/localReference.d.ts +16 -6
- package/dist/localReference.d.ts.map +1 -1
- package/dist/localReference.js +31 -20
- package/dist/localReference.js.map +1 -1
- package/dist/mergeTree.d.ts +0 -1
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +127 -112
- package/dist/mergeTree.js.map +1 -1
- package/dist/mergeTreeNodeWalk.d.ts.map +1 -1
- package/dist/mergeTreeNodeWalk.js +1 -1
- package/dist/mergeTreeNodeWalk.js.map +1 -1
- package/dist/mergeTreeNodes.d.ts +6 -5
- package/dist/mergeTreeNodes.d.ts.map +1 -1
- package/dist/mergeTreeNodes.js +29 -20
- package/dist/mergeTreeNodes.js.map +1 -1
- package/dist/mergeTreeTracking.js +3 -3
- package/dist/mergeTreeTracking.js.map +1 -1
- package/dist/opBuilder.d.ts +6 -1
- package/dist/opBuilder.d.ts.map +1 -1
- package/dist/opBuilder.js +5 -0
- package/dist/opBuilder.js.map +1 -1
- package/dist/ops.d.ts.map +1 -1
- package/dist/ops.js.map +1 -1
- package/dist/ordinal.d.ts.map +1 -1
- package/dist/ordinal.js +7 -0
- package/dist/ordinal.js.map +1 -1
- package/dist/partialLengths.d.ts +4 -2
- package/dist/partialLengths.d.ts.map +1 -1
- package/dist/partialLengths.js +101 -53
- package/dist/partialLengths.js.map +1 -1
- package/dist/perspective.d.ts +4 -1
- package/dist/perspective.d.ts.map +1 -1
- package/dist/perspective.js +7 -6
- package/dist/perspective.js.map +1 -1
- package/dist/properties.d.ts +13 -10
- package/dist/properties.d.ts.map +1 -1
- package/dist/properties.js +22 -11
- package/dist/properties.js.map +1 -1
- package/dist/public.d.ts +1 -1
- package/dist/referencePositions.d.ts +7 -0
- package/dist/referencePositions.d.ts.map +1 -1
- package/dist/referencePositions.js +7 -0
- package/dist/referencePositions.js.map +1 -1
- package/dist/revertibles.d.ts +6 -0
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +50 -21
- package/dist/revertibles.js.map +1 -1
- package/dist/segmentGroupCollection.d.ts.map +1 -1
- package/dist/segmentGroupCollection.js +2 -0
- package/dist/segmentGroupCollection.js.map +1 -1
- package/dist/segmentPropertiesManager.d.ts +7 -3
- package/dist/segmentPropertiesManager.d.ts.map +1 -1
- package/dist/segmentPropertiesManager.js +20 -15
- package/dist/segmentPropertiesManager.js.map +1 -1
- package/dist/snapshotChunks.d.ts.map +1 -1
- package/dist/snapshotChunks.js +10 -5
- package/dist/snapshotChunks.js.map +1 -1
- package/dist/snapshotLoader.d.ts.map +1 -1
- package/dist/snapshotLoader.js +14 -10
- package/dist/snapshotLoader.js.map +1 -1
- package/dist/snapshotV1.d.ts.map +1 -1
- package/dist/snapshotV1.js +20 -8
- package/dist/snapshotV1.js.map +1 -1
- package/dist/snapshotlegacy.d.ts.map +1 -1
- package/dist/snapshotlegacy.js +4 -2
- package/dist/snapshotlegacy.js.map +1 -1
- package/dist/sortedSegmentSet.d.ts.map +1 -1
- package/dist/sortedSegmentSet.js +8 -1
- package/dist/sortedSegmentSet.js.map +1 -1
- package/dist/sortedSet.d.ts.map +1 -1
- package/dist/sortedSet.js +4 -0
- package/dist/sortedSet.js.map +1 -1
- package/dist/test/Insertion.perf.spec.js.map +1 -1
- package/dist/test/Removal.perf.spec.js.map +1 -1
- package/dist/test/Snapshot.perf.spec.js +1 -0
- package/dist/test/Snapshot.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.perf.spec.js +3 -1
- package/dist/test/attributionCollection.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.spec.js +69 -68
- package/dist/test/attributionCollection.spec.js.map +1 -1
- package/dist/test/attributionPolicy.spec.js +29 -27
- package/dist/test/attributionPolicy.spec.js.map +1 -1
- package/dist/test/beastTest.spec.d.ts +1 -4
- package/dist/test/beastTest.spec.d.ts.map +1 -1
- package/dist/test/beastTest.spec.js +32 -30
- package/dist/test/beastTest.spec.js.map +1 -1
- package/dist/test/client.annotateMarker.spec.js +5 -5
- package/dist/test/client.annotateMarker.spec.js.map +1 -1
- package/dist/test/client.apis.spec.d.ts.map +1 -1
- package/dist/test/client.apis.spec.js +5 -7
- package/dist/test/client.apis.spec.js.map +1 -1
- package/dist/test/client.applyMsg.spec.js +125 -103
- package/dist/test/client.applyMsg.spec.js.map +1 -1
- package/dist/test/client.applyStashedOpFarm.spec.js +18 -10
- package/dist/test/client.applyStashedOpFarm.spec.js.map +1 -1
- package/dist/test/client.attributionFarm.spec.js +13 -8
- package/dist/test/client.attributionFarm.spec.js.map +1 -1
- package/dist/test/client.conflictFarm.spec.js +4 -2
- package/dist/test/client.conflictFarm.spec.js.map +1 -1
- package/dist/test/client.getPosition.spec.js +10 -10
- package/dist/test/client.getPosition.spec.js.map +1 -1
- package/dist/test/client.localReference.spec.js +111 -104
- package/dist/test/client.localReference.spec.js.map +1 -1
- package/dist/test/client.localReferenceFarm.spec.js +14 -10
- package/dist/test/client.localReferenceFarm.spec.js.map +1 -1
- package/dist/test/client.rebasePosition.spec.js +12 -12
- package/dist/test/client.rebasePosition.spec.js.map +1 -1
- package/dist/test/client.reconnectFarm.spec.js +12 -9
- package/dist/test/client.reconnectFarm.spec.js.map +1 -1
- package/dist/test/client.replay.spec.js +11 -10
- package/dist/test/client.replay.spec.js.map +1 -1
- package/dist/test/client.rollback.spec.js +87 -84
- package/dist/test/client.rollback.spec.js.map +1 -1
- package/dist/test/client.rollbackFarm.spec.js +3 -1
- package/dist/test/client.rollbackFarm.spec.js.map +1 -1
- package/dist/test/client.searchForMarker.spec.js +122 -112
- package/dist/test/client.searchForMarker.spec.js.map +1 -1
- package/dist/test/client.walkSegments.spec.js +7 -7
- package/dist/test/client.walkSegments.spec.js.map +1 -1
- package/dist/test/collections.list.spec.js +14 -14
- package/dist/test/collections.list.spec.js.map +1 -1
- package/dist/test/createInsertOnlyAttributionPolicy.spec.js +3 -3
- package/dist/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -1
- package/dist/test/dirname.cjs +1 -0
- package/dist/test/dirname.cjs.map +1 -1
- package/dist/test/dirname.d.cts.map +1 -1
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js +7 -7
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.annotate.spec.js +87 -87
- package/dist/test/mergeTree.annotate.spec.js.map +1 -1
- package/dist/test/mergeTree.insert.deltaCallback.spec.js +6 -6
- package/dist/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.insertingWalk.spec.js +24 -24
- package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +6 -6
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.spec.js +23 -23
- package/dist/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/dist/test/mergeTree.walk.spec.js +3 -3
- package/dist/test/mergeTree.walk.spec.js.map +1 -1
- package/dist/test/mergeTree.zamboni.spec.js +10 -10
- package/dist/test/mergeTree.zamboni.spec.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/dist/test/mergeTreeOperationRunner.js +28 -16
- package/dist/test/mergeTreeOperationRunner.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.spec.js +9 -5
- package/dist/test/mergeTreeOperationRunner.spec.js.map +1 -1
- package/dist/test/obliterate.concurrent.spec.js +165 -165
- package/dist/test/obliterate.concurrent.spec.js.map +1 -1
- package/dist/test/obliterate.deltaCallback.spec.js +20 -21
- package/dist/test/obliterate.deltaCallback.spec.js.map +1 -1
- package/dist/test/obliterate.partialLength.spec.js +7 -7
- package/dist/test/obliterate.partialLength.spec.js.map +1 -1
- package/dist/test/obliterate.reconnect.spec.js +13 -13
- package/dist/test/obliterate.reconnect.spec.js.map +1 -1
- package/dist/test/obliterate.spec.js +9 -9
- package/dist/test/obliterate.spec.js.map +1 -1
- package/dist/test/ordinal.spec.js +10 -4
- package/dist/test/ordinal.spec.js.map +1 -1
- package/dist/test/partialLength.spec.js.map +1 -1
- package/dist/test/properties.spec.js +15 -15
- package/dist/test/properties.spec.js.map +1 -1
- package/dist/test/reconnectHelper.d.ts +4 -4
- package/dist/test/reconnectHelper.d.ts.map +1 -1
- package/dist/test/reconnectHelper.js +28 -20
- package/dist/test/reconnectHelper.js.map +1 -1
- package/dist/test/resetPendingSegmentsToOp.spec.js +35 -29
- package/dist/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/dist/test/revertibleFarm.spec.js +11 -10
- package/dist/test/revertibleFarm.spec.js.map +1 -1
- package/dist/test/revertibles.spec.d.ts.map +1 -1
- package/dist/test/revertibles.spec.js +96 -57
- package/dist/test/revertibles.spec.js.map +1 -1
- package/dist/test/segmentGroupCollection.spec.js +17 -17
- package/dist/test/segmentGroupCollection.spec.js.map +1 -1
- package/dist/test/snapshot.spec.js +5 -5
- package/dist/test/snapshot.spec.js.map +1 -1
- package/dist/test/snapshot.utils.d.ts.map +1 -1
- package/dist/test/snapshot.utils.js +6 -6
- package/dist/test/snapshot.utils.js.map +1 -1
- package/dist/test/snapshotlegacy.spec.js +18 -13
- package/dist/test/snapshotlegacy.spec.js.map +1 -1
- package/dist/test/sortedSegmentSet.spec.js +22 -18
- package/dist/test/sortedSegmentSet.spec.js.map +1 -1
- package/dist/test/testClient.d.ts +6 -5
- package/dist/test/testClient.d.ts.map +1 -1
- package/dist/test/testClient.js +30 -32
- package/dist/test/testClient.js.map +1 -1
- package/dist/test/testClientLogger.d.ts.map +1 -1
- package/dist/test/testClientLogger.js +39 -38
- package/dist/test/testClientLogger.js.map +1 -1
- package/dist/test/testSerializer.d.ts +5 -5
- package/dist/test/testSerializer.d.ts.map +1 -1
- package/dist/test/testSerializer.js +0 -1
- package/dist/test/testSerializer.js.map +1 -1
- package/dist/test/testServer.d.ts.map +1 -1
- package/dist/test/testServer.js.map +1 -1
- package/dist/test/testUtils.d.ts +1 -1
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +15 -17
- package/dist/test/testUtils.js.map +1 -1
- package/dist/test/text.d.ts.map +1 -1
- package/dist/test/text.js +1 -1
- package/dist/test/text.js.map +1 -1
- package/dist/test/tracking.spec.js +50 -46
- package/dist/test/tracking.spec.js.map +1 -1
- package/dist/test/wordUnitTests.spec.d.ts.map +1 -1
- package/dist/test/wordUnitTests.spec.js +10 -10
- package/dist/test/wordUnitTests.spec.js.map +1 -1
- package/dist/textSegment.d.ts +1 -1
- package/dist/textSegment.d.ts.map +1 -1
- package/dist/textSegment.js +3 -3
- package/dist/textSegment.js.map +1 -1
- package/dist/zamboni.d.ts.map +1 -1
- package/dist/zamboni.js +7 -2
- package/dist/zamboni.js.map +1 -1
- package/internal.d.ts +1 -1
- package/legacy.d.ts +1 -1
- package/lib/MergeTreeTextHelper.d.ts.map +1 -1
- package/lib/MergeTreeTextHelper.js +1 -1
- package/lib/MergeTreeTextHelper.js.map +1 -1
- package/lib/attributionCollection.d.ts.map +1 -1
- package/lib/attributionCollection.js +65 -17
- package/lib/attributionCollection.js.map +1 -1
- package/lib/attributionPolicy.d.ts +2 -1
- package/lib/attributionPolicy.d.ts.map +1 -1
- package/lib/attributionPolicy.js +10 -3
- package/lib/attributionPolicy.js.map +1 -1
- package/lib/client.d.ts +3 -1
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +65 -37
- package/lib/client.js.map +1 -1
- package/lib/collections/list.d.ts.map +1 -1
- package/lib/collections/list.js +5 -2
- package/lib/collections/list.js.map +1 -1
- package/lib/collections/rbTree.d.ts +2 -2
- package/lib/collections/rbTree.d.ts.map +1 -1
- package/lib/collections/rbTree.js +23 -35
- package/lib/collections/rbTree.js.map +1 -1
- package/lib/endOfTreeSegment.d.ts.map +1 -1
- package/lib/endOfTreeSegment.js +4 -1
- package/lib/endOfTreeSegment.js.map +1 -1
- package/lib/legacy.d.ts +1 -1
- package/lib/localReference.d.ts +16 -6
- package/lib/localReference.d.ts.map +1 -1
- package/lib/localReference.js +31 -20
- package/lib/localReference.js.map +1 -1
- package/lib/mergeTree.d.ts +0 -1
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +127 -112
- package/lib/mergeTree.js.map +1 -1
- package/lib/mergeTreeNodeWalk.d.ts.map +1 -1
- package/lib/mergeTreeNodeWalk.js +1 -1
- package/lib/mergeTreeNodeWalk.js.map +1 -1
- package/lib/mergeTreeNodes.d.ts +6 -5
- package/lib/mergeTreeNodes.d.ts.map +1 -1
- package/lib/mergeTreeNodes.js +29 -20
- package/lib/mergeTreeNodes.js.map +1 -1
- package/lib/mergeTreeTracking.js +3 -3
- package/lib/mergeTreeTracking.js.map +1 -1
- package/lib/opBuilder.d.ts +6 -1
- package/lib/opBuilder.d.ts.map +1 -1
- package/lib/opBuilder.js +5 -0
- package/lib/opBuilder.js.map +1 -1
- package/lib/ops.d.ts.map +1 -1
- package/lib/ops.js.map +1 -1
- package/lib/ordinal.d.ts.map +1 -1
- package/lib/ordinal.js +7 -0
- package/lib/ordinal.js.map +1 -1
- package/lib/partialLengths.d.ts +4 -2
- package/lib/partialLengths.d.ts.map +1 -1
- package/lib/partialLengths.js +101 -53
- package/lib/partialLengths.js.map +1 -1
- package/lib/perspective.d.ts +4 -1
- package/lib/perspective.d.ts.map +1 -1
- package/lib/perspective.js +7 -6
- package/lib/perspective.js.map +1 -1
- package/lib/properties.d.ts +13 -10
- package/lib/properties.d.ts.map +1 -1
- package/lib/properties.js +22 -11
- package/lib/properties.js.map +1 -1
- package/lib/public.d.ts +1 -1
- package/lib/referencePositions.d.ts +7 -0
- package/lib/referencePositions.d.ts.map +1 -1
- package/lib/referencePositions.js +7 -0
- package/lib/referencePositions.js.map +1 -1
- package/lib/revertibles.d.ts +6 -0
- package/lib/revertibles.d.ts.map +1 -1
- package/lib/revertibles.js +50 -21
- package/lib/revertibles.js.map +1 -1
- package/lib/segmentGroupCollection.d.ts.map +1 -1
- package/lib/segmentGroupCollection.js +2 -0
- package/lib/segmentGroupCollection.js.map +1 -1
- package/lib/segmentPropertiesManager.d.ts +7 -3
- package/lib/segmentPropertiesManager.d.ts.map +1 -1
- package/lib/segmentPropertiesManager.js +20 -15
- package/lib/segmentPropertiesManager.js.map +1 -1
- package/lib/snapshotChunks.d.ts.map +1 -1
- package/lib/snapshotChunks.js +10 -5
- package/lib/snapshotChunks.js.map +1 -1
- package/lib/snapshotLoader.d.ts.map +1 -1
- package/lib/snapshotLoader.js +14 -10
- package/lib/snapshotLoader.js.map +1 -1
- package/lib/snapshotV1.d.ts.map +1 -1
- package/lib/snapshotV1.js +20 -8
- package/lib/snapshotV1.js.map +1 -1
- package/lib/snapshotlegacy.d.ts.map +1 -1
- package/lib/snapshotlegacy.js +4 -2
- package/lib/snapshotlegacy.js.map +1 -1
- package/lib/sortedSegmentSet.d.ts.map +1 -1
- package/lib/sortedSegmentSet.js +8 -1
- package/lib/sortedSegmentSet.js.map +1 -1
- package/lib/sortedSet.d.ts.map +1 -1
- package/lib/sortedSet.js +4 -0
- package/lib/sortedSet.js.map +1 -1
- package/lib/test/Insertion.perf.spec.js.map +1 -1
- package/lib/test/Removal.perf.spec.js.map +1 -1
- package/lib/test/Snapshot.perf.spec.js +1 -0
- package/lib/test/Snapshot.perf.spec.js.map +1 -1
- package/lib/test/attributionCollection.perf.spec.js +3 -1
- package/lib/test/attributionCollection.perf.spec.js.map +1 -1
- package/lib/test/attributionCollection.spec.js +3 -2
- package/lib/test/attributionCollection.spec.js.map +1 -1
- package/lib/test/attributionPolicy.spec.js +3 -1
- package/lib/test/attributionPolicy.spec.js.map +1 -1
- package/lib/test/beastTest.spec.d.ts +1 -4
- package/lib/test/beastTest.spec.d.ts.map +1 -1
- package/lib/test/beastTest.spec.js +26 -24
- package/lib/test/beastTest.spec.js.map +1 -1
- package/lib/test/client.annotateMarker.spec.js +1 -1
- package/lib/test/client.annotateMarker.spec.js.map +1 -1
- package/lib/test/client.apis.spec.d.ts.map +1 -1
- package/lib/test/client.apis.spec.js +4 -6
- package/lib/test/client.apis.spec.js.map +1 -1
- package/lib/test/client.applyMsg.spec.js +72 -50
- package/lib/test/client.applyMsg.spec.js.map +1 -1
- package/lib/test/client.applyStashedOpFarm.spec.js +18 -10
- package/lib/test/client.applyStashedOpFarm.spec.js.map +1 -1
- package/lib/test/client.attributionFarm.spec.js +12 -7
- package/lib/test/client.attributionFarm.spec.js.map +1 -1
- package/lib/test/client.conflictFarm.spec.js +4 -2
- package/lib/test/client.conflictFarm.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 +14 -7
- package/lib/test/client.localReference.spec.js.map +1 -1
- package/lib/test/client.localReferenceFarm.spec.js +13 -9
- package/lib/test/client.localReferenceFarm.spec.js.map +1 -1
- package/lib/test/client.rebasePosition.spec.js +1 -1
- package/lib/test/client.rebasePosition.spec.js.map +1 -1
- package/lib/test/client.reconnectFarm.spec.js +11 -8
- package/lib/test/client.reconnectFarm.spec.js.map +1 -1
- package/lib/test/client.replay.spec.js +8 -7
- package/lib/test/client.replay.spec.js.map +1 -1
- package/lib/test/client.rollback.spec.js +14 -11
- package/lib/test/client.rollback.spec.js.map +1 -1
- package/lib/test/client.rollbackFarm.spec.js +3 -1
- package/lib/test/client.rollbackFarm.spec.js.map +1 -1
- package/lib/test/client.searchForMarker.spec.js +29 -19
- package/lib/test/client.searchForMarker.spec.js.map +1 -1
- package/lib/test/client.walkSegments.spec.js +1 -1
- package/lib/test/client.walkSegments.spec.js.map +1 -1
- package/lib/test/collections.list.spec.js +1 -1
- package/lib/test/collections.list.spec.js.map +1 -1
- package/lib/test/createInsertOnlyAttributionPolicy.spec.js +1 -1
- package/lib/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -1
- package/lib/test/dirname.cjs +1 -0
- package/lib/test/dirname.cjs.map +1 -1
- package/lib/test/dirname.d.cts.map +1 -1
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js +1 -1
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.annotate.spec.js +1 -1
- package/lib/test/mergeTree.annotate.spec.js.map +1 -1
- package/lib/test/mergeTree.insert.deltaCallback.spec.js +1 -1
- package/lib/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.insertingWalk.spec.js +8 -8
- package/lib/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +1 -1
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/lib/test/mergeTree.markRangeRemoved.spec.js +1 -1
- package/lib/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/lib/test/mergeTree.walk.spec.js +1 -1
- package/lib/test/mergeTree.walk.spec.js.map +1 -1
- package/lib/test/mergeTree.zamboni.spec.js +1 -1
- package/lib/test/mergeTree.zamboni.spec.js.map +1 -1
- package/lib/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/lib/test/mergeTreeOperationRunner.js +27 -15
- package/lib/test/mergeTreeOperationRunner.js.map +1 -1
- package/lib/test/mergeTreeOperationRunner.spec.js +5 -1
- package/lib/test/mergeTreeOperationRunner.spec.js.map +1 -1
- package/lib/test/obliterate.concurrent.spec.js +4 -4
- package/lib/test/obliterate.concurrent.spec.js.map +1 -1
- package/lib/test/obliterate.deltaCallback.spec.js +2 -3
- package/lib/test/obliterate.deltaCallback.spec.js.map +1 -1
- package/lib/test/obliterate.partialLength.spec.js +1 -1
- package/lib/test/obliterate.partialLength.spec.js.map +1 -1
- package/lib/test/obliterate.reconnect.spec.js +1 -1
- package/lib/test/obliterate.reconnect.spec.js.map +1 -1
- package/lib/test/obliterate.spec.js +1 -1
- package/lib/test/obliterate.spec.js.map +1 -1
- package/lib/test/ordinal.spec.js +7 -1
- package/lib/test/ordinal.spec.js.map +1 -1
- package/lib/test/partialLength.spec.js.map +1 -1
- package/lib/test/properties.spec.js +1 -1
- package/lib/test/properties.spec.js.map +1 -1
- package/lib/test/reconnectHelper.d.ts +4 -4
- package/lib/test/reconnectHelper.d.ts.map +1 -1
- package/lib/test/reconnectHelper.js +22 -14
- package/lib/test/reconnectHelper.js.map +1 -1
- package/lib/test/resetPendingSegmentsToOp.spec.js +8 -2
- package/lib/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/lib/test/revertibleFarm.spec.js +8 -7
- package/lib/test/revertibleFarm.spec.js.map +1 -1
- package/lib/test/revertibles.spec.d.ts.map +1 -1
- package/lib/test/revertibles.spec.js +93 -54
- package/lib/test/revertibles.spec.js.map +1 -1
- package/lib/test/segmentGroupCollection.spec.js +1 -1
- package/lib/test/segmentGroupCollection.spec.js.map +1 -1
- package/lib/test/snapshot.spec.js +1 -1
- package/lib/test/snapshot.spec.js.map +1 -1
- package/lib/test/snapshot.utils.d.ts.map +1 -1
- package/lib/test/snapshot.utils.js +1 -1
- package/lib/test/snapshot.utils.js.map +1 -1
- package/lib/test/snapshotlegacy.spec.js +10 -5
- package/lib/test/snapshotlegacy.spec.js.map +1 -1
- package/lib/test/sortedSegmentSet.spec.js +6 -2
- package/lib/test/sortedSegmentSet.spec.js.map +1 -1
- package/lib/test/testClient.d.ts +6 -5
- package/lib/test/testClient.d.ts.map +1 -1
- package/lib/test/testClient.js +25 -27
- package/lib/test/testClient.js.map +1 -1
- package/lib/test/testClientLogger.d.ts.map +1 -1
- package/lib/test/testClientLogger.js +37 -36
- package/lib/test/testClientLogger.js.map +1 -1
- package/lib/test/testSerializer.d.ts +5 -5
- package/lib/test/testSerializer.d.ts.map +1 -1
- package/lib/test/testSerializer.js +0 -1
- package/lib/test/testSerializer.js.map +1 -1
- package/lib/test/testServer.d.ts.map +1 -1
- package/lib/test/testServer.js.map +1 -1
- package/lib/test/testUtils.d.ts +1 -1
- package/lib/test/testUtils.d.ts.map +1 -1
- package/lib/test/testUtils.js +6 -8
- package/lib/test/testUtils.js.map +1 -1
- package/lib/test/text.d.ts.map +1 -1
- package/lib/test/text.js +1 -1
- package/lib/test/text.js.map +1 -1
- package/lib/test/tracking.spec.js +9 -5
- package/lib/test/tracking.spec.js.map +1 -1
- package/lib/test/wordUnitTests.spec.d.ts.map +1 -1
- package/lib/test/wordUnitTests.spec.js +9 -9
- package/lib/test/wordUnitTests.spec.js.map +1 -1
- package/lib/textSegment.d.ts +1 -1
- package/lib/textSegment.d.ts.map +1 -1
- package/lib/textSegment.js +3 -3
- package/lib/textSegment.js.map +1 -1
- package/lib/zamboni.d.ts.map +1 -1
- package/lib/zamboni.js +7 -2
- package/lib/zamboni.js.map +1 -1
- package/package.json +29 -27
- package/src/MergeTreeTextHelper.ts +2 -2
- package/src/attributionCollection.ts +71 -28
- package/src/attributionPolicy.ts +14 -9
- package/src/client.ts +120 -71
- package/src/collections/list.ts +9 -6
- package/src/collections/rbTree.ts +62 -71
- package/src/endOfTreeSegment.ts +21 -10
- package/src/localReference.ts +61 -43
- package/src/mergeTree.ts +229 -178
- package/src/mergeTreeNodeWalk.ts +2 -1
- package/src/mergeTreeNodes.ts +59 -46
- package/src/mergeTreeTracking.ts +3 -3
- package/src/opBuilder.ts +6 -1
- package/src/ops.ts +5 -0
- package/src/ordinal.ts +8 -1
- package/src/partialLengths.ts +143 -87
- package/src/perspective.ts +10 -7
- package/src/properties.ts +36 -18
- package/src/referencePositions.ts +7 -0
- package/src/revertibles.ts +71 -41
- package/src/segmentGroupCollection.ts +8 -6
- package/src/segmentPropertiesManager.ts +28 -24
- package/src/snapshotChunks.ts +12 -7
- package/src/snapshotLoader.ts +20 -17
- package/src/snapshotV1.ts +36 -18
- package/src/snapshotlegacy.ts +7 -5
- package/src/sortedSegmentSet.ts +9 -3
- package/src/sortedSet.ts +7 -3
- package/src/textSegment.ts +9 -9
- package/src/zamboni.ts +14 -10
- package/tsconfig.json +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.annotate.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.annotate.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { BaseSegment, Marker } from \"../mergeTreeNodes.js\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { insertSegments } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst remoteClientId = 35;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\n\tconst annotateStart = 1;\n\tconst markerPosition = annotateStart + 2;\n\tconst annotateEnd = markerPosition + 2;\n\tconst splitPos = Math.floor((annotateEnd - annotateStart) / 2) + annotateStart;\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: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined as any,\n\t\t});\n\n\t\tcurrentSequenceNumber = 0;\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: markerPosition,\n\t\t\tsegments: [Marker.make(ReferenceType.Tile)],\n\t\t\trefSeq: currentSequenceNumber,\n\t\t\tclientId: remoteClientId,\n\t\t\tseq: ++currentSequenceNumber,\n\t\t\topArgs: undefined as any,\n\t\t});\n\t});\n\n\tdescribe(\"annotateRange\", () => {\n\t\tdescribe(\"not collaborating\", () => {\n\t\t\tit(\"remote\", () => {\n\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tannotateEnd,\n\t\t\t\t\t{\n\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t},\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tremoteClientId,\n\t\t\t\t\tcurrentSequenceNumber + 1,\n\t\t\t\t\tundefined as any,\n\t\t\t\t);\n\n\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t);\n\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\tassert.equal(segment?.properties?.propertySource, \"remote\");\n\t\t\t});\n\n\t\t\tit(\"local\", () => {\n\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tannotateEnd,\n\t\t\t\t\t{\n\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t},\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\tundefined as any,\n\t\t\t\t);\n\n\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t);\n\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t});\n\t\t});\n\t\tdescribe(\"collaborating\", () => {\n\t\t\tbeforeEach(() => {\n\t\t\t\tmergeTree.startCollaboration(\n\t\t\t\t\tlocalClientId,\n\t\t\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t\t\t);\n\t\t\t});\n\t\t\tdescribe(\"local first\", () => {\n\t\t\t\tconst props = {\n\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t};\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondProperty: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.secondProperty, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local split\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegment = segment.splitAt(splitPos) as BaseSegment;\n\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local split\", () => {\n\t\t\t\t\tconst secondChangeProps = {\n\t\t\t\t\t\tsecondChange: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tsecondChangeProps,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst splitOnlyProps = {\n\t\t\t\t\t\tsplitOnly: 1,\n\t\t\t\t\t};\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tsplitPos,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tsplitOnlyProps,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tsplitPos,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst splitSegment = splitSegmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 2);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 3);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 2);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: secondChangeProps,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: splitPos,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: splitOnlyProps,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"three local changes\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\n\t\t\t\t\tconst props2 = {\n\t\t\t\t\t\tpropertySource: \"local2\",\n\t\t\t\t\t\tsecondSource: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops2,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\n\t\t\t\t\tconst props3 = {\n\t\t\t\t\t\tthirdSource: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops3,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: props2,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: props3,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"two local changes with interleaved remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondSource: \"local2\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteOnly: 1,\n\t\t\t\t\t\t\tsecondSource: \"remote\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.remoteOnly, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, \"local2\");\n\t\t\t\t});\n\t\t\t});\n\t\t\tdescribe(\"remote first\", () => {\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\t\t\t\t});\n\t\t\t\tit(\"remote only\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"split remote\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegment = segment.splitAt(1) as BaseSegment;\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"remote before unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"remote before sequenced local\", () => {\n\t\t\t\t\tconst props = {\n\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t};\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segmentInfo.segment?.segmentGroups.size, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\t\t\t\t\tassert.equal(segmentInfo.segment?.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segmentInfo.segment?.properties?.remoteProperty, 1);\n\t\t\t\t});\n\t\t\t});\n\t\t\tdescribe(\"local with rewrite first\", () => {\n\t\t\t\tconst props = {\n\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t};\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"local2\",\n\t\t\t\t\t\t\tsecondProperty: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondProperty, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"two local changes with interleaved remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondSource: \"local2\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteOnly: 1,\n\t\t\t\t\t\t\tsecondSource: \"remote\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as any,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.remoteOnly, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, \"local2\");\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
1
|
+
{"version":3,"file":"mergeTree.annotate.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.annotate.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 { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { BaseSegment, Marker } from \"../mergeTreeNodes.js\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { insertSegments } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst remoteClientId = 35;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\n\tconst annotateStart = 1;\n\tconst markerPosition = annotateStart + 2;\n\tconst annotateEnd = markerPosition + 2;\n\tconst splitPos = Math.floor((annotateEnd - annotateStart) / 2) + annotateStart;\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: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined as never,\n\t\t});\n\n\t\tcurrentSequenceNumber = 0;\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: markerPosition,\n\t\t\tsegments: [Marker.make(ReferenceType.Tile)],\n\t\t\trefSeq: currentSequenceNumber,\n\t\t\tclientId: remoteClientId,\n\t\t\tseq: ++currentSequenceNumber,\n\t\t\topArgs: undefined as never,\n\t\t});\n\t});\n\n\tdescribe(\"annotateRange\", () => {\n\t\tdescribe(\"not collaborating\", () => {\n\t\t\tit(\"remote\", () => {\n\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tannotateEnd,\n\t\t\t\t\t{\n\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t},\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tremoteClientId,\n\t\t\t\t\tcurrentSequenceNumber + 1,\n\t\t\t\t\tundefined as never,\n\t\t\t\t);\n\n\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t);\n\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\tassert.equal(segment?.properties?.propertySource, \"remote\");\n\t\t\t});\n\n\t\t\tit(\"local\", () => {\n\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tannotateEnd,\n\t\t\t\t\t{\n\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t},\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\tundefined as never,\n\t\t\t\t);\n\n\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\tannotateStart,\n\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\tlocalClientId,\n\t\t\t\t);\n\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t});\n\t\t});\n\t\tdescribe(\"collaborating\", () => {\n\t\t\tbeforeEach(() => {\n\t\t\t\tmergeTree.startCollaboration(\n\t\t\t\t\tlocalClientId,\n\t\t\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t\t\t);\n\t\t\t});\n\t\t\tdescribe(\"local first\", () => {\n\t\t\t\tconst props = {\n\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t};\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondProperty: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.secondProperty, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local split\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegment = segment.splitAt(splitPos) as BaseSegment;\n\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local split\", () => {\n\t\t\t\t\tconst secondChangeProps = {\n\t\t\t\t\t\tsecondChange: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tsecondChangeProps,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst splitOnlyProps = {\n\t\t\t\t\t\tsplitOnly: 1,\n\t\t\t\t\t};\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tsplitPos,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tsplitOnlyProps,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tsplitPos,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst splitSegment = splitSegmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 2);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 3);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 2);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: secondChangeProps,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: splitPos,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: splitOnlyProps,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.secondChange, 1);\n\t\t\t\t\tassert(!segment.properties?.splitOnly);\n\n\t\t\t\t\tassert.equal(splitSegment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.secondChange, 1);\n\t\t\t\t\tassert.equal(splitSegment.properties?.splitOnly, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"three local changes\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\n\t\t\t\t\tconst props2 = {\n\t\t\t\t\t\tpropertySource: \"local2\",\n\t\t\t\t\t\tsecondSource: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops2,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\n\t\t\t\t\tconst props3 = {\n\t\t\t\t\t\tthirdSource: 1,\n\t\t\t\t\t};\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops3,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: props2,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops: props3,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, 1);\n\t\t\t\t\tassert.equal(segment.properties?.thirdSource, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"two local changes with interleaved remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondSource: \"local2\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteOnly: 1,\n\t\t\t\t\t\t\tsecondSource: \"remote\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.remoteOnly, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, \"local2\");\n\t\t\t\t});\n\t\t\t});\n\t\t\tdescribe(\"remote first\", () => {\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\t\t\t\t});\n\t\t\t\tit(\"remote only\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"split remote\", () => {\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tconst splitSegment = segment.splitAt(1) as BaseSegment;\n\t\t\t\t\tassert.equal(splitSegment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(splitSegment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"remote before unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"remote before sequenced local\", () => {\n\t\t\t\t\tconst props = {\n\t\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t\t};\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tassert.equal(segmentInfo.segment?.segmentGroups.size, 1);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert(segmentInfo.segment?.segmentGroups.empty);\n\t\t\t\t\tassert.equal(segmentInfo.segment?.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segmentInfo.segment?.properties?.remoteProperty, 1);\n\t\t\t\t});\n\t\t\t});\n\t\t\tdescribe(\"local with rewrite first\", () => {\n\t\t\t\tconst props = {\n\t\t\t\t\tpropertySource: \"local\",\n\t\t\t\t};\n\t\t\t\tbeforeEach(() => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\tprops,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local after unsequenced local\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"local2\",\n\t\t\t\t\t\t\tsecondProperty: \"local\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local2\");\n\t\t\t\t\tassert.equal(segment.properties?.secondProperty, \"local\");\n\t\t\t\t});\n\n\t\t\t\tit(\"unsequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"local\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"sequenced local before remote\", () => {\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteProperty: 1,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.segmentGroups.size, 0);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.remoteProperty, 1);\n\t\t\t\t});\n\n\t\t\t\tit(\"two local changes with interleaved remote\", () => {\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsecondSource: \"local2\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t\tUnassignedSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\t\t\top: {\n\t\t\t\t\t\t\tpos1: annotateStart,\n\t\t\t\t\t\t\tpos2: annotateEnd,\n\t\t\t\t\t\t\tprops,\n\t\t\t\t\t\t\ttype: MergeTreeDeltaType.ANNOTATE,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsequencedMessage: {\n\t\t\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t\t\t});\n\n\t\t\t\t\tmergeTree.annotateRange(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tannotateEnd,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tpropertySource: \"remote\",\n\t\t\t\t\t\t\tremoteOnly: 1,\n\t\t\t\t\t\t\tsecondSource: \"remote\",\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tremoteClientId,\n\t\t\t\t\t\t++currentSequenceNumber,\n\t\t\t\t\t\tundefined as never,\n\t\t\t\t\t);\n\n\t\t\t\t\tconst segmentInfo = mergeTree.getContainingSegment(\n\t\t\t\t\t\tannotateStart,\n\t\t\t\t\t\tcurrentSequenceNumber,\n\t\t\t\t\t\tlocalClientId,\n\t\t\t\t\t);\n\t\t\t\t\tconst segment = segmentInfo.segment as BaseSegment;\n\n\t\t\t\t\tassert.equal(segment.properties?.remoteOnly, 1);\n\t\t\t\t\tassert.equal(segment.properties?.propertySource, \"remote\");\n\t\t\t\t\tassert.equal(segment.properties?.secondSource, \"local2\");\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { strict as assert } from "assert";
|
|
5
|
+
import { strict as assert } from "node:assert";
|
|
6
6
|
import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber, } from "../constants.js";
|
|
7
7
|
import { MergeTree } from "../mergeTree.js";
|
|
8
8
|
import { MergeTreeMaintenanceType } from "../mergeTreeDeltaCallback.js";
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"mergeTree.insert.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.insert.deltaCallback.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback.js\";\nimport { MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { countOperations, insertMarker, insertSegments, insertText } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\tbeforeEach(() => {\n\t\tmergeTree = new MergeTree();\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(\"hello world!\")],\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined,\n\t\t});\n\n\t\tcurrentSequenceNumber = 0;\n\t\tmergeTree.startCollaboration(\n\t\t\tlocalClientId,\n\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t);\n\t});\n\n\tdescribe(\"insertText\", () => {\n\t\tit(\"Insert starting text\", () => {\n\t\t\tlet eventCalled: number = 0;\n\n\t\t\tmergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs): void => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.equal(eventCalled, 1);\n\t\t});\n\n\t\tit(\"Insert ending text\", () => {\n\t\t\tconst textLength = mergeTree.getLength(currentSequenceNumber, localClientId);\n\t\t\tlet eventCalled: number = 0;\n\n\t\t\tmergeTree.mergeTreeDeltaCallback = (opArgs, deltaArgs): void => {\n\t\t\t\teventCalled++;\n\t\t\t};\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: textLength,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.equal(eventCalled, 1);\n\t\t});\n\n\t\tit(\"Insert middle text\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 4,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 1,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Insert text remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\ttext: \"more \",\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t});\n\t\t});\n\t});\n\tdescribe(\"insertMarker\", () => {\n\t\tit(\"Insert marker\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tinsertMarker({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 4,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\tbehaviors: ReferenceType.Simple,\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: { op: { type: MergeTreeDeltaType.INSERT } },\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.INSERT]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 1,\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
6
|
-
import { strict as assert } from "assert";
|
|
6
|
+
import { strict as assert } from "node:assert";
|
|
7
7
|
import { MergeTreeTextHelper } from "../MergeTreeTextHelper.js";
|
|
8
8
|
import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber, } from "../constants.js";
|
|
9
9
|
import { MergeTree } from "../mergeTree.js";
|
|
@@ -120,10 +120,10 @@ const treeFactories = [
|
|
|
120
120
|
const remove = Math.round(initialText.length / 4);
|
|
121
121
|
// remove from start
|
|
122
122
|
mergeTree.markRangeRemoved(0, remove, UniversalSequenceNumber, localClientId, UniversalSequenceNumber, false, undefined);
|
|
123
|
-
initialText = initialText.
|
|
123
|
+
initialText = initialText.slice(Math.max(0, remove));
|
|
124
124
|
// remove from end
|
|
125
125
|
mergeTree.markRangeRemoved(initialText.length - remove, initialText.length, UniversalSequenceNumber, localClientId, UniversalSequenceNumber, false, undefined);
|
|
126
|
-
initialText = initialText.
|
|
126
|
+
initialText = initialText.slice(0, Math.max(0, initialText.length - remove));
|
|
127
127
|
mergeTree.startCollaboration(localClientId,
|
|
128
128
|
/* minSeq: */ UniversalSequenceNumber,
|
|
129
129
|
/* currentSeq: */ UniversalSequenceNumber);
|
|
@@ -139,7 +139,7 @@ const treeFactories = [
|
|
|
139
139
|
},
|
|
140
140
|
];
|
|
141
141
|
describe("MergeTree.insertingWalk", () => {
|
|
142
|
-
|
|
142
|
+
for (const tf of treeFactories) {
|
|
143
143
|
describe(tf.name, () => {
|
|
144
144
|
const treeFactory = tf;
|
|
145
145
|
let testData;
|
|
@@ -197,13 +197,13 @@ describe("MergeTree.insertingWalk", () => {
|
|
|
197
197
|
assert.equal(testData.mergeTree.getLength(testData.refSeq, localClientId), testData.initialText.length + 1);
|
|
198
198
|
const currentValue = testData.textHelper.getText(testData.refSeq, localClientId);
|
|
199
199
|
assert.equal(currentValue.length, testData.initialText.length + 1);
|
|
200
|
-
assert.equal(currentValue, `${testData.initialText.
|
|
200
|
+
assert.equal(currentValue, `${testData.initialText.slice(0, Math.max(0, testData.middle))}` +
|
|
201
201
|
"a" +
|
|
202
|
-
`${testData.initialText.
|
|
202
|
+
`${testData.initialText.slice(Math.max(0, testData.middle))}`);
|
|
203
203
|
});
|
|
204
204
|
});
|
|
205
205
|
});
|
|
206
|
-
}
|
|
206
|
+
}
|
|
207
207
|
it("handles conflicts involving removed segments across block boundaries", () => {
|
|
208
208
|
let initialText = "0";
|
|
209
209
|
let seq = 0;
|
|
@@ -219,7 +219,7 @@ describe("MergeTree.insertingWalk", () => {
|
|
|
219
219
|
opArgs: undefined,
|
|
220
220
|
});
|
|
221
221
|
for (let i = 1; i < MaxNodesInBlock; i++) {
|
|
222
|
-
const text = String.
|
|
222
|
+
const text = String.fromCodePoint(i + 64);
|
|
223
223
|
insertText({
|
|
224
224
|
mergeTree,
|
|
225
225
|
pos: 0,
|
|
@@ -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 \"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 } 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: () => {\n\t\t\tconst initialText = \"hello world\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tmergeTree.startCollaboration(\n\t\t\t\tlocalClientId,\n\t\t\t\t/* minSeq: */ UniversalSequenceNumber,\n\t\t\t\t/* currentSeq: */ UniversalSequenceNumber,\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tinitialText,\n\t\t\t\tmergeTree,\n\t\t\t\tmiddle: Math.round(initialText.length / 2),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\ttextHelper: new MergeTreeTextHelper(mergeTree),\n\t\t\t};\n\t\t},\n\t\tname: \"single segment tree\",\n\t},\n\t{\n\t\tcreate: () => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tfor (let i = 1; i < MaxNodesInBlock - 1; i++) {\n\t\t\t\tconst text = i.toString();\n\t\t\t\tinsertText({\n\t\t\t\t\tmergeTree,\n\t\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\t\ttext,\n\t\t\t\t\tprops: undefined,\n\t\t\t\t\topArgs: undefined,\n\t\t\t\t});\n\t\t\t\tinitialText += text;\n\t\t\t}\n\n\t\t\tconst textHelper = new MergeTreeTextHelper(mergeTree);\n\t\t\tassert.equal(textHelper.getText(UniversalSequenceNumber, localClientId), initialText);\n\n\t\t\tconst nodes: 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: () => {\n\t\t\tlet initialText = \"0\";\n\t\t\tconst mergeTree = new MergeTree();\n\t\t\tinsertSegments({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: LocalClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tfor (let i = 1; i < MaxNodesInBlock * 4; i++) {\n\t\t\t\tconst text = i.toString();\n\t\t\t\tinsertText({\n\t\t\t\t\tmergeTree,\n\t\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\tseq: UniversalSequenceNumber,\n\t\t\t\t\ttext,\n\t\t\t\t\tprops: undefined,\n\t\t\t\t\topArgs: undefined,\n\t\t\t\t});\n\t\t\t\tinitialText += text;\n\t\t\t}\n\n\t\t\tconst remove = Math.round(initialText.length / 4);\n\t\t\t// remove from start\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\t0,\n\t\t\t\tremove,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tlocalClientId,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tfalse,\n\t\t\t\tundefined as any,\n\t\t\t);\n\t\t\tinitialText = initialText.substring(remove);\n\n\t\t\t// remove from end\n\t\t\tmergeTree.markRangeRemoved(\n\t\t\t\tinitialText.length - remove,\n\t\t\t\tinitialText.length,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tlocalClientId,\n\t\t\t\tUniversalSequenceNumber,\n\t\t\t\tfalse,\n\t\t\t\tundefined as any,\n\t\t\t);\n\t\t\tinitialText = initialText.substring(0, initialText.length - remove);\n\n\t\t\tmergeTree.startCollaboration(\n\t\t\t\tlocalClientId,\n\t\t\t\t/* minSeq: */ UniversalSequenceNumber,\n\t\t\t\t/* currentSeq: */ UniversalSequenceNumber,\n\t\t\t);\n\n\t\t\treturn {\n\t\t\t\tinitialText,\n\t\t\t\tmergeTree,\n\t\t\t\tmiddle: Math.round(initialText.length / 2),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\ttextHelper: new MergeTreeTextHelper(mergeTree),\n\t\t\t};\n\t\t},\n\t\tname: \"Tree with remove segments\",\n\t},\n];\n\ndescribe(\"MergeTree.insertingWalk\", () => {\n\ttreeFactories.forEach((tf) => {\n\t\tdescribe(tf.name, () => {\n\t\t\tconst treeFactory = tf;\n\t\t\tlet testData: ITestData;\n\t\t\tbeforeEach(() => {\n\t\t\t\ttestData = treeFactory.create();\n\t\t\t\tassert(nodeOrdinalsHaveIntegrity(testData.mergeTree.root));\n\t\t\t});\n\t\t\tafterEach(() => {\n\t\t\t\tassert(nodeOrdinalsHaveIntegrity(testData.mergeTree.root));\n\t\t\t});\n\t\t\tdescribe(\"insertText\", () => {\n\t\t\t\tit(\"at beginning\", () => {\n\t\t\t\t\tinsertText({\n\t\t\t\t\t\tmergeTree: testData.mergeTree,\n\t\t\t\t\t\tpos: 0,\n\t\t\t\t\t\trefSeq: testData.refSeq,\n\t\t\t\t\t\tclientId: localClientId,\n\t\t\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\t\t\ttext: \"a\",\n\t\t\t\t\t\tprops: undefined,\n\t\t\t\t\t\topArgs: undefined,\n\t\t\t\t\t});\n\n\t\t\t\t\tassert.equal(\n\t\t\t\t\t\ttestData.mergeTree.getLength(testData.refSeq, localClientId),\n\t\t\t\t\t\ttestData.initialText.length + 1,\n\t\t\t\t\t);\n\t\t\t\t\tconst currentValue = testData.textHelper.getText(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.substring(0, testData.middle)}` +\n\t\t\t\t\t\t\t\"a\" +\n\t\t\t\t\t\t\t`${testData.initialText.substring(testData.middle)}`,\n\t\t\t\t\t);\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t});\n\n\tit(\"handles conflicts involving removed segments across block boundaries\", () => {\n\t\tlet initialText = \"0\";\n\t\tlet seq = 0;\n\t\tconst mergeTree = new MergeTree();\n\t\tmergeTree.startCollaboration(localClientId, 0, seq);\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(initialText)],\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: localClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined,\n\t\t});\n\t\tfor (let i = 1; i < MaxNodesInBlock; i++) {\n\t\t\tconst text = String.fromCharCode(i + 64);\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: 0,\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\ttext,\n\t\t\t\tprops: undefined,\n\t\t\t\topArgs: undefined,\n\t\t\t});\n\t\t\tinitialText += text;\n\t\t}\n\n\t\tconst textHelper = new MergeTreeTextHelper(mergeTree);\n\n\t\tassert.equal(mergeTree.root.childCount, 2);\n\t\tassert.equal(textHelper.getText(0, localClientId), \"GFEDCBA0\");\n\t\t// Remove \"DCBA\"\n\t\tmarkRangeRemoved({\n\t\t\tmergeTree,\n\t\t\tstart: 3,\n\t\t\tend: 7,\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: localClientId,\n\t\t\tseq: UnassignedSequenceNumber,\n\t\t\toverwrite: false,\n\t\t\topArgs: undefined as any,\n\t\t});\n\t\tassert.equal(textHelper.getText(0, localClientId), \"GFE0\");\n\t\t// Simulate another client inserting concurrently with the above operations. Because\n\t\t// all segments but the 0 are unacked, this insert should place the segment directly\n\t\t// before the 0. Prior to this regression test, an issue with `rightExcursion` in the\n\t\t// merge conflict logic instead caused the segment to be placed before the removed segments.\n\t\tinsertText({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: localClientId + 1,\n\t\t\tseq: ++seq,\n\t\t\ttext: \"x\",\n\t\t});\n\n\t\tconst segments: string[] = [];\n\t\twalkAllChildSegments(mergeTree.root, (seg) => {\n\t\t\tif (TextSegment.is(seg)) {\n\t\t\t\tif (seg.localRemovedSeq !== undefined || seg.removedSeq !== undefined) {\n\t\t\t\t\tsegments.push(`(${seg.text})`);\n\t\t\t\t} else {\n\t\t\t\t\tsegments.push(seg.text);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn true;\n\t\t});\n\n\t\tassert.deepStrictEqual(segments, [\"G\", \"F\", \"E\", \"(D)\", \"(C)\", \"(B)\", \"(A)\", \"x\", \"0\"]);\n\t});\n});\n"]}
|
|
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 } 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\tfalse,\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\tfalse,\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 (seg.localRemovedSeq !== undefined || seg.removedSeq !== undefined) {\n\t\t\t\t\tsegments.push(`(${seg.text})`);\n\t\t\t\t} else {\n\t\t\t\t\tsegments.push(seg.text);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn true;\n\t\t});\n\n\t\tassert.deepStrictEqual(segments, [\"G\", \"F\", \"E\", \"(D)\", \"(C)\", \"(B)\", \"(A)\", \"x\", \"0\"]);\n\t});\n});\n"]}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { strict as assert } from "assert";
|
|
5
|
+
import { strict as assert } from "node:assert";
|
|
6
6
|
import { LocalClientId, UnassignedSequenceNumber, UniversalSequenceNumber, } from "../constants.js";
|
|
7
7
|
import { MergeTree } from "../mergeTree.js";
|
|
8
8
|
import { MergeTreeMaintenanceType } from "../mergeTreeDeltaCallback.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.markRangeRemoved.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.deltaCallback.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { countOperations, insertSegments, markRangeRemoved } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\tbeforeEach(() => {\n\t\tmergeTree = new MergeTree();\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(\"hello world!\")],\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined,\n\t\t});\n\t\tcurrentSequenceNumber = 0;\n\t\tmergeTree.startCollaboration(\n\t\t\tlocalClientId,\n\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t);\n\t});\n\n\tdescribe(\"markRangeRemoved\", () => {\n\t\tit(\"Event on Removal\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\t// Verify that zamboni unlinks a removed segment and raises the appropriate maintenance event.\n\t\tit(\"Event on Unlink\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tconst start = 4;\n\t\t\tconst end = 6;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart,\n\t\t\t\tend,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\t// In order for the removed segment to unlinked by zamboni, we need to ACK the segment\n\t\t\t// and advance the collaboration window's minSeq past the removedSeq.\n\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\top: {\n\t\t\t\t\tpos1: start,\n\t\t\t\t\tpos2: end,\n\t\t\t\t\ttype: MergeTreeDeltaType.REMOVE,\n\t\t\t\t},\n\t\t\t\tsequencedMessage: {\n\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t} as any as ISequencedDocumentMessage,\n\t\t\t});\n\n\t\t\t// Move currentSeq/minSeq past the seq# at which the removal was ACKed.\n\t\t\tmergeTree.collabWindow.currentSeq = currentSequenceNumber;\n\t\t\tmergeTree.setMinSeq(currentSequenceNumber);\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t\t[MergeTreeMaintenanceType.UNLINK]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.ACKNOWLEDGED]: 1,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Remote Before Local\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local Before Remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local delete shadows remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as any,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t/* MergeTreeDeltaType.REMOVE is absent as it should not be fired. */\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
1
|
+
{"version":3,"file":"mergeTree.markRangeRemoved.deltaCallback.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.deltaCallback.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport {\n\tLocalClientId,\n\tUnassignedSequenceNumber,\n\tUniversalSequenceNumber,\n} from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { MergeTreeMaintenanceType } from \"../mergeTreeDeltaCallback.js\";\nimport { MergeTreeDeltaType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { countOperations, insertSegments, markRangeRemoved } from \"./testUtils.js\";\n\ndescribe(\"MergeTree\", () => {\n\tlet mergeTree: MergeTree;\n\tconst localClientId = 17;\n\tlet currentSequenceNumber: number;\n\tbeforeEach(() => {\n\t\tmergeTree = new MergeTree();\n\t\tinsertSegments({\n\t\t\tmergeTree,\n\t\t\tpos: 0,\n\t\t\tsegments: [TextSegment.make(\"hello world!\")],\n\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\tclientId: LocalClientId,\n\t\t\tseq: UniversalSequenceNumber,\n\t\t\topArgs: undefined,\n\t\t});\n\t\tcurrentSequenceNumber = 0;\n\t\tmergeTree.startCollaboration(\n\t\t\tlocalClientId,\n\t\t\t/* minSeq: */ currentSequenceNumber,\n\t\t\t/* currentSeq: */ currentSequenceNumber,\n\t\t);\n\t});\n\n\tdescribe(\"markRangeRemoved\", () => {\n\t\tit(\"Event on Removal\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\t// Verify that zamboni unlinks a removed segment and raises the appropriate maintenance event.\n\t\tit(\"Event on Unlink\", () => {\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tconst start = 4;\n\t\t\tconst end = 6;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart,\n\t\t\t\tend,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\t// In order for the removed segment to unlinked by zamboni, we need to ACK the segment\n\t\t\t// and advance the collaboration window's minSeq past the removedSeq.\n\t\t\tmergeTree.ackPendingSegment({\n\t\t\t\top: {\n\t\t\t\t\tpos1: start,\n\t\t\t\t\tpos2: end,\n\t\t\t\t\ttype: MergeTreeDeltaType.REMOVE,\n\t\t\t\t},\n\t\t\t\tsequencedMessage: {\n\t\t\t\t\tsequenceNumber: ++currentSequenceNumber,\n\t\t\t\t} as unknown as ISequencedDocumentMessage,\n\t\t\t});\n\n\t\t\t// Move currentSeq/minSeq past the seq# at which the removal was ACKed.\n\t\t\tmergeTree.collabWindow.currentSeq = currentSequenceNumber;\n\t\t\tmergeTree.setMinSeq(currentSequenceNumber);\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t\t[MergeTreeMaintenanceType.UNLINK]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.ACKNOWLEDGED]: 1,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Remote Before Local\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local Before Remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t[MergeTreeDeltaType.REMOVE]: 1,\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\n\t\tit(\"Local delete shadows remote\", () => {\n\t\t\tconst remoteClientId: number = 35;\n\t\t\tlet remoteSequenceNumber = currentSequenceNumber;\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 3,\n\t\t\t\tend: 6,\n\t\t\t\trefSeq: currentSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UnassignedSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tconst count = countOperations(mergeTree);\n\n\t\t\tmarkRangeRemoved({\n\t\t\t\tmergeTree,\n\t\t\t\tstart: 4,\n\t\t\t\tend: 5,\n\t\t\t\trefSeq: remoteSequenceNumber,\n\t\t\t\tclientId: remoteClientId,\n\t\t\t\tseq: ++remoteSequenceNumber,\n\t\t\t\toverwrite: false,\n\t\t\t\topArgs: undefined as never,\n\t\t\t});\n\n\t\t\tassert.deepStrictEqual(count, {\n\t\t\t\t/* MergeTreeDeltaType.REMOVE is absent as it should not be fired. */\n\t\t\t\t[MergeTreeMaintenanceType.SPLIT]: 2,\n\t\t\t});\n\t\t});\n\t});\n});\n"]}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
6
|
-
import { strict as assert } from "assert";
|
|
6
|
+
import { strict as assert } from "node:assert";
|
|
7
7
|
import { UnassignedSequenceNumber } from "../constants.js";
|
|
8
8
|
import { createInsertSegmentOp, createRemoveRangeOp } from "../opBuilder.js";
|
|
9
9
|
import { TextSegment } from "../textSegment.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.markRangeRemoved.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"assert\";\n\nimport { UnassignedSequenceNumber } from \"../constants.js\";\nimport { createInsertSegmentOp, createRemoveRangeOp } from \"../opBuilder.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { TestClient } from \"./testClient.js\";\n\ndescribe(\"MergeTree.markRangeRemoved\", () => {\n\tlet client: TestClient;\n\tbeforeEach(() => {\n\t\tclient = new TestClient();\n\t\tclient.startOrUpdateCollaboration(\"local\");\n\t\tfor (const char of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), char),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.equal(client.getText(), \"hello world\");\n\t});\n\n\tit(\"local remove followed by local insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local insert followed by local remove\", () => {\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"texthello world\");\n\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by local insert\", () => {\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote overlapping remove\", () => {\n\t\tconst originalSeq = client.getCurrentSeq();\n\t\tlet seq = originalSeq;\n\t\tconst remoteDeleteMessage = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t++seq,\n\t\t\tundefined,\n\t\t\t\"remote\",\n\t\t);\n\t\tconst segmentExpectedRemovedSeq = seq;\n\t\tconst { segment } = client.getContainingSegment(0);\n\t\tassert(segment !== undefined, \"expected to find segment\");\n\t\tconst localDeleteMessage = client.makeOpMessage(\n\t\t\tclient.removeRangeLocal(0, client.getLength()),\n\t\t\t++seq,\n\t\t\toriginalSeq /* refSeq */,\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\t\tassert.equal(segment.removedSeq, UnassignedSequenceNumber);\n\t\tassert(segment.localRemovedSeq !== undefined);\n\t\tconst expectedLocalRemovedSeq = segment.localRemovedSeq;\n\n\t\tclient.applyMsg(remoteDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, expectedLocalRemovedSeq);\n\t\tassert.equal(client.getText(), \"\");\n\n\t\t// localRemovedSeq should remain on the segment until the local removal has been acked.\n\t\t// This ensures there's enough information to determine segment length in the case of\n\t\t// reconnect.\n\t\tclient.applyMsg(localDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, undefined);\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by remote insert\", () => {\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tclient.applyMsg(removeMsg);\n\t\tclient.applyMsg(insertMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"remote insert followed by remote remove\", () => {\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tclient.applyMsg(insertMsg);\n\t\tclient.applyMsg(removeMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local and remote clients race to insert at position of removed segment\", () => {\n\t\t// Note: This test constructs its own TestClients to avoid being initialized with \"hello world\".\n\n\t\t// First we run through the ops from the perspective of a passive observer (i.e., all operations are remote).\n\t\tconst expected = new TestClient();\n\t\texpected.startOrUpdateCollaboration(\"3\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"a\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"1\",\n\t\t\t);\n\t\t\texpected.removeRangeRemote(0, 1, ++seq, /* refSeq: */ 0, /* longClientId: */ \"1\");\n\t\t\tconst refSeqAt2 = expected.getCurrentSeq();\n\n\t\t\t// In parallel, Client 2 inserted \"x\" without knowledge of Client 1's insertion/removal.\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Client 1 inserts \"c\" having received acks for its own edits, but has not yet having\n\t\t\t// observed the insertion of \"X\" from client 2.\n\t\t\texpected.insertTextRemote(0, \"c\", undefined, ++seq, refSeqAt2, /* longClientId: */ \"1\");\n\t\t}\n\n\t\t// Next, we run through the same sequence from the perspective of client 1:\n\t\tconst actual = new TestClient();\n\t\tactual.startOrUpdateCollaboration(\"1\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\tconst op1 = actual.insertTextLocal(0, \"a\")!;\n\t\t\tconst op2 = actual.removeRangeLocal(0, 1);\n\n\t\t\t// Client 1 receives ACKs for op1 and op2.\n\t\t\tactual.applyMsg(actual.makeOpMessage(op1, ++seq, /* refSeq: */ 0));\n\t\t\tactual.applyMsg(actual.makeOpMessage(op2, ++seq, /* refSeq: */ 0));\n\t\t\tconst refSeqAt2 = actual.getCurrentSeq();\n\n\t\t\t// Client 1 locally inserts \"c\".\n\t\t\tconst op4 = actual.insertTextLocal(0, \"c\");\n\n\t\t\t// Client 1 then processes the parallel insertion of \"X\" from Client 2 at refSeq=0\n\t\t\tactual.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Finally, client 1 receives the ack for its insertion of \"c\".\n\t\t\tactual.applyMsg(actual.makeOpMessage(op4, ++seq, refSeqAt2));\n\t\t}\n\n\t\tassert.equal(actual.getText(), expected.getText());\n\t});\n});\n"]}
|
|
1
|
+
{"version":3,"file":"mergeTree.markRangeRemoved.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.markRangeRemoved.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { UnassignedSequenceNumber } from \"../constants.js\";\nimport { createInsertSegmentOp, createRemoveRangeOp } from \"../opBuilder.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { TestClient } from \"./testClient.js\";\n\ndescribe(\"MergeTree.markRangeRemoved\", () => {\n\tlet client: TestClient;\n\tbeforeEach(() => {\n\t\tclient = new TestClient();\n\t\tclient.startOrUpdateCollaboration(\"local\");\n\t\tfor (const char of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), char),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.equal(client.getText(), \"hello world\");\n\t});\n\n\tit(\"local remove followed by local insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local insert followed by local remove\", () => {\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"texthello world\");\n\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by local insert\", () => {\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.insertTextLocal(0, \"text\");\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote insert\", () => {\n\t\tclient.removeRangeLocal(0, client.getLength());\n\t\tassert.equal(client.getText(), \"\");\n\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\t\"remote\",\n\t\t\t),\n\t\t);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local remove followed by remote overlapping remove\", () => {\n\t\tconst originalSeq = client.getCurrentSeq();\n\t\tlet seq = originalSeq;\n\t\tconst remoteDeleteMessage = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\t++seq,\n\t\t\tundefined,\n\t\t\t\"remote\",\n\t\t);\n\t\tconst segmentExpectedRemovedSeq = seq;\n\t\tconst { segment } = client.getContainingSegment(0);\n\t\tassert(segment !== undefined, \"expected to find segment\");\n\t\tconst localDeleteMessage = client.makeOpMessage(\n\t\t\tclient.removeRangeLocal(0, client.getLength()),\n\t\t\t++seq,\n\t\t\toriginalSeq /* refSeq */,\n\t\t);\n\n\t\tassert.equal(client.getText(), \"\");\n\t\tassert.equal(segment.removedSeq, UnassignedSequenceNumber);\n\t\tassert(segment.localRemovedSeq !== undefined);\n\t\tconst expectedLocalRemovedSeq = segment.localRemovedSeq;\n\n\t\tclient.applyMsg(remoteDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, expectedLocalRemovedSeq);\n\t\tassert.equal(client.getText(), \"\");\n\n\t\t// localRemovedSeq should remain on the segment until the local removal has been acked.\n\t\t// This ensures there's enough information to determine segment length in the case of\n\t\t// reconnect.\n\t\tclient.applyMsg(localDeleteMessage);\n\t\tassert.equal(segment.removedSeq, segmentExpectedRemovedSeq);\n\t\tassert.equal(segment.localRemovedSeq, undefined);\n\t\tassert.equal(client.getText(), \"\");\n\t});\n\n\tit(\"remote remove followed by remote insert\", () => {\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tclient.applyMsg(removeMsg);\n\t\tclient.applyMsg(insertMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"remote insert followed by remote remove\", () => {\n\t\tconst insertMsg = client.makeOpMessage(\n\t\t\tcreateInsertSegmentOp(0, TextSegment.make(\"text\")),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 1,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote\",\n\t\t);\n\n\t\tconst removeMsg = client.makeOpMessage(\n\t\t\tcreateRemoveRangeOp(0, client.getLength()),\n\t\t\tclient.mergeTree.collabWindow.currentSeq + 2,\n\t\t\tclient.mergeTree.collabWindow.currentSeq,\n\t\t\t\"remote2\",\n\t\t);\n\n\t\tclient.applyMsg(insertMsg);\n\t\tclient.applyMsg(removeMsg);\n\n\t\tassert.equal(client.getText(), \"text\");\n\t});\n\n\tit(\"local and remote clients race to insert at position of removed segment\", () => {\n\t\t// Note: This test constructs its own TestClients to avoid being initialized with \"hello world\".\n\n\t\t// First we run through the ops from the perspective of a passive observer (i.e., all operations are remote).\n\t\tconst expected = new TestClient();\n\t\texpected.startOrUpdateCollaboration(\"3\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"a\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"1\",\n\t\t\t);\n\t\t\texpected.removeRangeRemote(0, 1, ++seq, /* refSeq: */ 0, /* longClientId: */ \"1\");\n\t\t\tconst refSeqAt2 = expected.getCurrentSeq();\n\n\t\t\t// In parallel, Client 2 inserted \"x\" without knowledge of Client 1's insertion/removal.\n\t\t\texpected.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Client 1 inserts \"c\" having received acks for its own edits, but has not yet having\n\t\t\t// observed the insertion of \"X\" from client 2.\n\t\t\texpected.insertTextRemote(0, \"c\", undefined, ++seq, refSeqAt2, /* longClientId: */ \"1\");\n\t\t}\n\n\t\t// Next, we run through the same sequence from the perspective of client 1:\n\t\tconst actual = new TestClient();\n\t\tactual.startOrUpdateCollaboration(\"1\");\n\n\t\t{\n\t\t\tlet seq = 0;\n\n\t\t\t// Client 1 locally inserts and removes the letter \"a\".\n\t\t\tconst op1 = actual.insertTextLocal(0, \"a\")!;\n\t\t\tconst op2 = actual.removeRangeLocal(0, 1);\n\n\t\t\t// Client 1 receives ACKs for op1 and op2.\n\t\t\tactual.applyMsg(actual.makeOpMessage(op1, ++seq, /* refSeq: */ 0));\n\t\t\tactual.applyMsg(actual.makeOpMessage(op2, ++seq, /* refSeq: */ 0));\n\t\t\tconst refSeqAt2 = actual.getCurrentSeq();\n\n\t\t\t// Client 1 locally inserts \"c\".\n\t\t\tconst op4 = actual.insertTextLocal(0, \"c\");\n\n\t\t\t// Client 1 then processes the parallel insertion of \"X\" from Client 2 at refSeq=0\n\t\t\tactual.insertTextRemote(\n\t\t\t\t0,\n\t\t\t\t\"X\",\n\t\t\t\tundefined,\n\t\t\t\t++seq,\n\t\t\t\t/* refSeq: */ 0,\n\t\t\t\t/* longClientId: */ \"2\",\n\t\t\t);\n\n\t\t\t// Finally, client 1 receives the ack for its insertion of \"c\".\n\t\t\tactual.applyMsg(actual.makeOpMessage(op4, ++seq, refSeqAt2));\n\t\t}\n\n\t\tassert.equal(actual.getText(), expected.getText());\n\t});\n});\n"]}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { strict as assert } from "assert";
|
|
5
|
+
import { strict as assert } from "node:assert";
|
|
6
6
|
import { LocalClientId, UniversalSequenceNumber } from "../constants.js";
|
|
7
7
|
import { MergeTree } from "../mergeTree.js";
|
|
8
8
|
import { walkAllChildSegments } from "../mergeTreeNodeWalk.js";
|