@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.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"]}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
8
|
-
const
|
|
8
|
+
const node_assert_1 = require("node:assert");
|
|
9
9
|
const constants_js_1 = require("../constants.js");
|
|
10
10
|
const opBuilder_js_1 = require("../opBuilder.js");
|
|
11
11
|
const textSegment_js_1 = require("../textSegment.js");
|
|
@@ -18,31 +18,31 @@ describe("MergeTree.markRangeRemoved", () => {
|
|
|
18
18
|
for (const char of "hello world") {
|
|
19
19
|
client.applyMsg(client.makeOpMessage(client.insertTextLocal(client.getLength(), char), client.getCurrentSeq() + 1));
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
node_assert_1.strict.equal(client.getText(), "hello world");
|
|
22
22
|
});
|
|
23
23
|
it("local remove followed by local insert", () => {
|
|
24
24
|
client.removeRangeLocal(0, client.getLength());
|
|
25
|
-
|
|
25
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
26
26
|
client.insertTextLocal(0, "text");
|
|
27
|
-
|
|
27
|
+
node_assert_1.strict.equal(client.getText(), "text");
|
|
28
28
|
});
|
|
29
29
|
it("local insert followed by local remove", () => {
|
|
30
30
|
client.insertTextLocal(0, "text");
|
|
31
|
-
|
|
31
|
+
node_assert_1.strict.equal(client.getText(), "texthello world");
|
|
32
32
|
client.removeRangeLocal(0, client.getLength());
|
|
33
|
-
|
|
33
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
34
34
|
});
|
|
35
35
|
it("remote remove followed by local insert", () => {
|
|
36
36
|
client.applyMsg(client.makeOpMessage((0, opBuilder_js_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote"));
|
|
37
|
-
|
|
37
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
38
38
|
client.insertTextLocal(0, "text");
|
|
39
|
-
|
|
39
|
+
node_assert_1.strict.equal(client.getText(), "text");
|
|
40
40
|
});
|
|
41
41
|
it("local remove followed by remote insert", () => {
|
|
42
42
|
client.removeRangeLocal(0, client.getLength());
|
|
43
|
-
|
|
43
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
44
44
|
client.applyMsg(client.makeOpMessage((0, opBuilder_js_1.createInsertSegmentOp)(0, textSegment_js_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote"));
|
|
45
|
-
|
|
45
|
+
node_assert_1.strict.equal(client.getText(), "text");
|
|
46
46
|
});
|
|
47
47
|
it("local remove followed by remote overlapping remove", () => {
|
|
48
48
|
const originalSeq = client.getCurrentSeq();
|
|
@@ -50,37 +50,37 @@ describe("MergeTree.markRangeRemoved", () => {
|
|
|
50
50
|
const remoteDeleteMessage = client.makeOpMessage((0, opBuilder_js_1.createRemoveRangeOp)(0, client.getLength()), ++seq, undefined, "remote");
|
|
51
51
|
const segmentExpectedRemovedSeq = seq;
|
|
52
52
|
const { segment } = client.getContainingSegment(0);
|
|
53
|
-
(0,
|
|
53
|
+
(0, node_assert_1.strict)(segment !== undefined, "expected to find segment");
|
|
54
54
|
const localDeleteMessage = client.makeOpMessage(client.removeRangeLocal(0, client.getLength()), ++seq, originalSeq /* refSeq */);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
(0,
|
|
55
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
56
|
+
node_assert_1.strict.equal(segment.removedSeq, constants_js_1.UnassignedSequenceNumber);
|
|
57
|
+
(0, node_assert_1.strict)(segment.localRemovedSeq !== undefined);
|
|
58
58
|
const expectedLocalRemovedSeq = segment.localRemovedSeq;
|
|
59
59
|
client.applyMsg(remoteDeleteMessage);
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
node_assert_1.strict.equal(segment.removedSeq, segmentExpectedRemovedSeq);
|
|
61
|
+
node_assert_1.strict.equal(segment.localRemovedSeq, expectedLocalRemovedSeq);
|
|
62
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
63
63
|
// localRemovedSeq should remain on the segment until the local removal has been acked.
|
|
64
64
|
// This ensures there's enough information to determine segment length in the case of
|
|
65
65
|
// reconnect.
|
|
66
66
|
client.applyMsg(localDeleteMessage);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
node_assert_1.strict.equal(segment.removedSeq, segmentExpectedRemovedSeq);
|
|
68
|
+
node_assert_1.strict.equal(segment.localRemovedSeq, undefined);
|
|
69
|
+
node_assert_1.strict.equal(client.getText(), "");
|
|
70
70
|
});
|
|
71
71
|
it("remote remove followed by remote insert", () => {
|
|
72
72
|
const removeMsg = client.makeOpMessage((0, opBuilder_js_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote2");
|
|
73
73
|
const insertMsg = client.makeOpMessage((0, opBuilder_js_1.createInsertSegmentOp)(0, textSegment_js_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 2, client.mergeTree.collabWindow.currentSeq, "remote");
|
|
74
74
|
client.applyMsg(removeMsg);
|
|
75
75
|
client.applyMsg(insertMsg);
|
|
76
|
-
|
|
76
|
+
node_assert_1.strict.equal(client.getText(), "text");
|
|
77
77
|
});
|
|
78
78
|
it("remote insert followed by remote remove", () => {
|
|
79
79
|
const insertMsg = client.makeOpMessage((0, opBuilder_js_1.createInsertSegmentOp)(0, textSegment_js_1.TextSegment.make("text")), client.mergeTree.collabWindow.currentSeq + 1, client.mergeTree.collabWindow.currentSeq, "remote");
|
|
80
80
|
const removeMsg = client.makeOpMessage((0, opBuilder_js_1.createRemoveRangeOp)(0, client.getLength()), client.mergeTree.collabWindow.currentSeq + 2, client.mergeTree.collabWindow.currentSeq, "remote2");
|
|
81
81
|
client.applyMsg(insertMsg);
|
|
82
82
|
client.applyMsg(removeMsg);
|
|
83
|
-
|
|
83
|
+
node_assert_1.strict.equal(client.getText(), "text");
|
|
84
84
|
});
|
|
85
85
|
it("local and remote clients race to insert at position of removed segment", () => {
|
|
86
86
|
// Note: This test constructs its own TestClients to avoid being initialized with "hello world".
|
|
@@ -124,7 +124,7 @@ describe("MergeTree.markRangeRemoved", () => {
|
|
|
124
124
|
// Finally, client 1 receives the ack for its insertion of "c".
|
|
125
125
|
actual.applyMsg(actual.makeOpMessage(op4, ++seq, refSeqAt2));
|
|
126
126
|
}
|
|
127
|
-
|
|
127
|
+
node_assert_1.strict.equal(actual.getText(), expected.getText());
|
|
128
128
|
});
|
|
129
129
|
});
|
|
130
130
|
//# sourceMappingURL=mergeTree.markRangeRemoved.spec.js.map
|
|
@@ -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"]}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the MIT License.
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
const
|
|
7
|
+
const node_assert_1 = require("node:assert");
|
|
8
8
|
const constants_js_1 = require("../constants.js");
|
|
9
9
|
const mergeTree_js_1 = require("../mergeTree.js");
|
|
10
10
|
const mergeTreeNodeWalk_js_1 = require("../mergeTreeNodeWalk.js");
|
|
@@ -52,10 +52,10 @@ describe("MergeTree walks", () => {
|
|
|
52
52
|
while (current !== block && current !== undefined) {
|
|
53
53
|
current = current.parent;
|
|
54
54
|
}
|
|
55
|
-
(0,
|
|
55
|
+
(0, node_assert_1.strict)(current === block, "Expected all visited segments to be descendants");
|
|
56
56
|
return true;
|
|
57
57
|
});
|
|
58
|
-
(0,
|
|
58
|
+
(0, node_assert_1.strict)(walkedAnySegments, "Walk should have hit segments");
|
|
59
59
|
}
|
|
60
60
|
});
|
|
61
61
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.walk.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.walk.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,
|
|
1
|
+
{"version":3,"file":"mergeTree.walk.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.walk.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,6CAA+C;AAE/C,kDAAyE;AACzE,kDAA4C;AAC5C,kEAA+D;AAC/D,4DAAiF;AACjF,sDAAgD;AAEhD,iDAA4C;AAE5C,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,SAAoB,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE;QACf,IAAI,WAAW,GAAG,GAAG,CAAC;QACtB,SAAS,GAAG,IAAI,wBAAS,EAAE,CAAC;QAC5B,SAAS,CAAC,cAAc,CACvB,CAAC,EACD,CAAC,4BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAC/B,sCAAuB,EACvB,4BAAa,EACb,sCAAuB,EACvB,SAAS,CACT,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mCAAe,GAAG,mCAAe,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAA,yBAAU,EAAC;gBACV,SAAS;gBACT,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,sCAAuB,EAAE,aAAa,CAAC;gBAChE,MAAM,EAAE,sCAAuB;gBAC/B,QAAQ,EAAE,aAAa;gBACvB,GAAG,EAAE,sCAAuB;gBAC5B,IAAI;gBACJ,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,WAAW,IAAI,IAAI,CAAC;QACrB,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACrC,QAAQ,CAAC,CAAC,sBAAsB,CAAC,KAAiB;YACjD,MAAM,KAAK,CAAC;YACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;oBACrB,KAAK,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;QACF,CAAC;QAED,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;YAClC,KAAK,MAAM,KAAK,IAAI,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5D,IAAI,iBAAiB,GAAG,KAAK,CAAC;gBAC9B,IAAA,2CAAoB,EAAC,KAAK,EAAE,CAAC,GAAiB,EAAE,EAAE;oBACjD,iBAAiB,GAAG,IAAI,CAAC;oBACzB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;oBACzB,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBACnD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;oBAC1B,CAAC;oBACD,IAAA,oBAAM,EAAC,OAAO,KAAK,KAAK,EAAE,iDAAiD,CAAC,CAAC;oBAC7E,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC,CAAC;gBACH,IAAA,oBAAM,EAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAC;YAC5D,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport { LocalClientId, UniversalSequenceNumber } from \"../constants.js\";\nimport { MergeTree } from \"../mergeTree.js\";\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk.js\";\nimport { MergeBlock, ISegmentLeaf, MaxNodesInBlock } from \"../mergeTreeNodes.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { insertText } from \"./testUtils.js\";\n\nconst localClientId = 17;\n\ndescribe(\"MergeTree walks\", () => {\n\tlet mergeTree: MergeTree;\n\tbeforeEach(() => {\n\t\tlet initialText = \"0\";\n\t\tmergeTree = new MergeTree();\n\t\tmergeTree.insertSegments(\n\t\t\t0,\n\t\t\t[TextSegment.make(initialText)],\n\t\t\tUniversalSequenceNumber,\n\t\t\tLocalClientId,\n\t\t\tUniversalSequenceNumber,\n\t\t\tundefined,\n\t\t);\n\t\tfor (let i = 1; i < MaxNodesInBlock * MaxNodesInBlock; i++) {\n\t\t\tconst text = i.toString();\n\t\t\tinsertText({\n\t\t\t\tmergeTree,\n\t\t\t\tpos: mergeTree.getLength(UniversalSequenceNumber, localClientId),\n\t\t\t\trefSeq: UniversalSequenceNumber,\n\t\t\t\tclientId: localClientId,\n\t\t\t\tseq: UniversalSequenceNumber,\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\t});\n\n\tdescribe(\"walkAllChildSegments\", () => {\n\t\tfunction* getAllDescendantBlocks(block: MergeBlock): Iterable<MergeBlock> {\n\t\t\tyield block;\n\t\t\tfor (let i = 0; i < block.childCount; i++) {\n\t\t\t\tconst child = block.children[i];\n\t\t\t\tif (!child.isLeaf()) {\n\t\t\t\t\tyield* getAllDescendantBlocks(child);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tit(\"visits only descendants\", () => {\n\t\t\tfor (const block of getAllDescendantBlocks(mergeTree.root)) {\n\t\t\t\tlet walkedAnySegments = false;\n\t\t\t\twalkAllChildSegments(block, (seg: ISegmentLeaf) => {\n\t\t\t\t\twalkedAnySegments = true;\n\t\t\t\t\tlet current = seg.parent;\n\t\t\t\t\twhile (current !== block && current !== undefined) {\n\t\t\t\t\t\tcurrent = current.parent;\n\t\t\t\t\t}\n\t\t\t\t\tassert(current === block, \"Expected all visited segments to be descendants\");\n\t\t\t\t\treturn true;\n\t\t\t\t});\n\t\t\t\tassert(walkedAnySegments, \"Walk should have hit segments\");\n\t\t\t}\n\t\t});\n\t});\n});\n"]}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the MIT License.
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
const
|
|
7
|
+
const node_assert_1 = require("node:assert");
|
|
8
8
|
const zamboni_js_1 = require("../zamboni.js");
|
|
9
9
|
const testClient_js_1 = require("./testClient.js");
|
|
10
10
|
describe("Zamboni Logic", () => {
|
|
@@ -20,33 +20,33 @@ describe("Zamboni Logic", () => {
|
|
|
20
20
|
it("packParent with no children segments", () => {
|
|
21
21
|
client.applyMsg(client.makeOpMessage(client.removeRangeLocal(0, client.getLength() - 1), 1));
|
|
22
22
|
(0, zamboni_js_1.packParent)(client.mergeTree.root, client.mergeTree);
|
|
23
|
-
|
|
23
|
+
node_assert_1.strict.equal(client.mergeTree.root.cachedLength, 1);
|
|
24
24
|
client.applyMsg(client.makeOpMessage(client.removeRangeLocal(0, client.getLength()), client.getCurrentSeq(), client.getCurrentSeq(), undefined, client.getCurrentSeq()));
|
|
25
|
-
|
|
25
|
+
node_assert_1.strict.equal(client.mergeTree.root.cachedLength ?? 0, 0);
|
|
26
26
|
(0, zamboni_js_1.packParent)(client.mergeTree.root, client.mergeTree);
|
|
27
|
-
|
|
27
|
+
node_assert_1.strict.equal(client.mergeTree.root.childCount, 0);
|
|
28
28
|
});
|
|
29
29
|
it("zamboni with no segments to scour", () => {
|
|
30
30
|
const cachedLength = client.mergeTree.root.cachedLength;
|
|
31
31
|
const childCount = client.mergeTree.root.childCount;
|
|
32
32
|
(0, zamboni_js_1.zamboniSegments)(client.mergeTree);
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
node_assert_1.strict.equal(cachedLength, client.mergeTree.root.cachedLength);
|
|
34
|
+
node_assert_1.strict.equal(childCount, client.mergeTree.root.childCount);
|
|
35
35
|
});
|
|
36
36
|
it("zamboni with one segment to scour", () => {
|
|
37
37
|
const initialChildCount = client.mergeTree.root.children[0].childCount;
|
|
38
38
|
const initialCachedLength = client.mergeTree.root.cachedLength ?? 0;
|
|
39
39
|
client.removeRangeLocal(0, 1);
|
|
40
40
|
(0, zamboni_js_1.zamboniSegments)(client.mergeTree);
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
node_assert_1.strict.equal(client.mergeTree.root.cachedLength, initialCachedLength - 1);
|
|
42
|
+
node_assert_1.strict.equal(client.mergeTree.root.children[0].childCount, initialChildCount);
|
|
43
43
|
});
|
|
44
44
|
it("zamboni with many segments to scour", () => {
|
|
45
45
|
client.removeRangeLocal(0, 6);
|
|
46
|
-
|
|
46
|
+
node_assert_1.strict.equal(client.mergeTree.root.children[0].cachedLength, 0);
|
|
47
47
|
(0, zamboni_js_1.zamboniSegments)(client.mergeTree);
|
|
48
48
|
(0, zamboni_js_1.packParent)(client.mergeTree.root, client.mergeTree);
|
|
49
|
-
|
|
49
|
+
node_assert_1.strict.equal(client.mergeTree.root.childCount, 1);
|
|
50
50
|
});
|
|
51
51
|
});
|
|
52
52
|
//# sourceMappingURL=mergeTree.zamboni.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.zamboni.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.zamboni.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,
|
|
1
|
+
{"version":3,"file":"mergeTree.zamboni.spec.js","sourceRoot":"","sources":["../../src/test/mergeTree.zamboni.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 { MergeBlock } from \"../mergeTreeNodes.js\";\nimport { packParent, zamboniSegments } from \"../zamboni.js\";\n\nimport { TestClient } from \"./testClient.js\";\n\ndescribe(\"Zamboni Logic\", () => {\n\tlet client: TestClient;\n\tconst localUserLongId = \"localUser\";\n\tbeforeEach(() => {\n\t\tclient = new TestClient();\n\t\tfor (const c of \"hello world\") {\n\t\t\tclient.insertTextLocal(client.getLength(), c);\n\t\t}\n\t\tclient.startOrUpdateCollaboration(localUserLongId);\n\t});\n\tit(\"packParent with no children segments\", () => {\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(client.removeRangeLocal(0, client.getLength() - 1), 1),\n\t\t);\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\t\tassert.equal(client.mergeTree.root.cachedLength, 1);\n\n\t\tclient.applyMsg(\n\t\t\tclient.makeOpMessage(\n\t\t\t\tclient.removeRangeLocal(0, client.getLength()),\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\tundefined,\n\t\t\t\tclient.getCurrentSeq(),\n\t\t\t),\n\t\t);\n\t\tassert.equal(client.mergeTree.root.cachedLength ?? 0, 0);\n\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.childCount, 0);\n\t});\n\tit(\"zamboni with no segments to scour\", () => {\n\t\tconst cachedLength = client.mergeTree.root.cachedLength;\n\t\tconst childCount = client.mergeTree.root.childCount;\n\n\t\tzamboniSegments(client.mergeTree);\n\n\t\tassert.equal(cachedLength, client.mergeTree.root.cachedLength);\n\t\tassert.equal(childCount, client.mergeTree.root.childCount);\n\t});\n\tit(\"zamboni with one segment to scour\", () => {\n\t\tconst initialChildCount = (client.mergeTree.root.children[0] as MergeBlock).childCount;\n\t\tconst initialCachedLength = client.mergeTree.root.cachedLength ?? 0;\n\t\tclient.removeRangeLocal(0, 1);\n\t\tzamboniSegments(client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.cachedLength, initialCachedLength - 1);\n\t\tassert.equal(\n\t\t\t(client.mergeTree.root.children[0] as MergeBlock).childCount,\n\t\t\tinitialChildCount,\n\t\t);\n\t});\n\tit(\"zamboni with many segments to scour\", () => {\n\t\tclient.removeRangeLocal(0, 6);\n\n\t\tassert.equal(client.mergeTree.root.children[0].cachedLength, 0);\n\n\t\tzamboniSegments(client.mergeTree);\n\t\tpackParent(client.mergeTree.root, client.mergeTree);\n\n\t\tassert.equal(client.mergeTree.root.childCount, 1);\n\t});\n});\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTreeOperationRunner.d.ts","sourceRoot":"","sources":["../../src/test/mergeTreeOperationRunner.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,OAAO,EAAY,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqC,MAAM,WAAW,CAAC;AAI5E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG,CAC3B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,KACX,YAAY,GAAG,SAAS,CAAC;AAE9B,eAAO,MAAM,WAAW,EAAE,aAIkB,CAAC;AAE7C,eAAO,MAAM,eAAe,EAAE,aAIkB,CAAC;AAEjD,eAAO,MAAM,aAAa,EAAE,aAImD,CAAC;AAEhF,eAAO,MAAM,cAAc,EAAE,aAqC5B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,aAWpB,CAAC;AAEF,MAAM,WAAW,YAAY;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACvC;AAED,wBAAgB,WAAW,CAC1B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EAC5C,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"mergeTreeOperationRunner.d.ts","sourceRoot":"","sources":["../../src/test/mergeTreeOperationRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,8 +29,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
30
|
exports.applyMessages = exports.generateClientNames = exports.generateOperationMessagesForClients = exports.runMergeTreeOperationRunner = exports.replayResultsPath = exports.doOverRanges = exports.resolveRanges = exports.resolveRange = exports.doOverRange = exports.insert = exports.insertAtRefPos = exports.annotateRange = exports.obliterateRange = exports.removeRange = void 0;
|
|
31
31
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
32
|
-
const
|
|
33
|
-
const fs = __importStar(require("fs"));
|
|
32
|
+
const node_assert_1 = require("node:assert");
|
|
33
|
+
const fs = __importStar(require("node:fs"));
|
|
34
34
|
const mergeTreeNodeWalk_js_1 = require("../mergeTreeNodeWalk.js");
|
|
35
35
|
const mergeTreeNodes_js_1 = require("../mergeTreeNodes.js");
|
|
36
36
|
const ops_js_1 = require("../ops.js");
|
|
@@ -105,20 +105,28 @@ function resolveRange(range, defaultGrowthFunc) {
|
|
|
105
105
|
}
|
|
106
106
|
exports.resolveRange = resolveRange;
|
|
107
107
|
function resolveRanges(ranges, defaultGrowthFunc) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
108
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
|
|
109
|
+
const resolvedRanges = {};
|
|
110
|
+
for (const [key, value] of Object.entries(ranges)) {
|
|
111
|
+
if (isConfigRange(value)) {
|
|
112
|
+
resolvedRanges[key] = resolveRange(value, defaultGrowthFunc);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return resolvedRanges;
|
|
115
116
|
}
|
|
116
117
|
exports.resolveRanges = resolveRanges;
|
|
118
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
117
119
|
function isConfigRange(t) {
|
|
120
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
118
121
|
return typeof t === "object" && typeof t.min === "number" && typeof t.max === "number";
|
|
119
122
|
}
|
|
120
123
|
function doOverRanges(ranges, doAction) {
|
|
121
|
-
const rangeEntries =
|
|
124
|
+
const rangeEntries = [];
|
|
125
|
+
for (const [key, value] of Object.entries(ranges)) {
|
|
126
|
+
if (isConfigRange(value)) {
|
|
127
|
+
rangeEntries.push([key, value]);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
122
130
|
const doOverRangesHelper = (selections) => {
|
|
123
131
|
if (selections.length === rangeEntries.length) {
|
|
124
132
|
const selectionsObj = {};
|
|
@@ -199,7 +207,7 @@ function generateOperationMessagesForClients(random, startingSeq, clients, logge
|
|
|
199
207
|
if (op !== undefined) {
|
|
200
208
|
// Pre-check to avoid logger.toString() in the string template
|
|
201
209
|
if (sg === client.peekPendingSegmentGroups()) {
|
|
202
|
-
|
|
210
|
+
node_assert_1.strict.notEqual(sg, client.peekPendingSegmentGroups(), `op created but segment group not enqueued.${logger}`);
|
|
203
211
|
}
|
|
204
212
|
const message = client.makeOpMessage(op, --tempSeq);
|
|
205
213
|
message.minimumSequenceNumber = minimumSequenceNumber;
|
|
@@ -215,9 +223,12 @@ exports.generateOperationMessagesForClients = generateOperationMessagesForClient
|
|
|
215
223
|
function generateClientNames() {
|
|
216
224
|
const clientNames = [];
|
|
217
225
|
function addClientNames(startChar, count) {
|
|
218
|
-
const startCode = startChar.
|
|
226
|
+
const startCode = startChar.codePointAt(0);
|
|
227
|
+
if (startCode === undefined) {
|
|
228
|
+
throw new Error("startCode must be a single character");
|
|
229
|
+
}
|
|
219
230
|
for (let i = 0; i < count; i++) {
|
|
220
|
-
clientNames.push(String.
|
|
231
|
+
clientNames.push(String.fromCodePoint(startCode + i));
|
|
221
232
|
}
|
|
222
233
|
}
|
|
223
234
|
addClientNames("A", 26);
|
|
@@ -234,11 +245,12 @@ function applyMessages(startingSeq, messageData, clients, logger) {
|
|
|
234
245
|
for (let i = 0; i < messageData.length; i++) {
|
|
235
246
|
const [message] = messageData[i];
|
|
236
247
|
message.sequenceNumber = ++seq;
|
|
237
|
-
|
|
248
|
+
for (const c of clients)
|
|
249
|
+
c.applyMsg(message);
|
|
238
250
|
}
|
|
239
251
|
}
|
|
240
|
-
catch (
|
|
241
|
-
throw logger.addLogsToError(
|
|
252
|
+
catch (error) {
|
|
253
|
+
throw logger.addLogsToError(error);
|
|
242
254
|
}
|
|
243
255
|
return seq;
|
|
244
256
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTreeOperationRunner.js","sourceRoot":"","sources":["../../src/test/mergeTreeOperationRunner.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\n/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"assert\";\nimport * as fs from \"fs\";\n\nimport { IRandom } from \"@fluid-private/stochastic-test-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk.js\";\nimport { ISegment, SegmentGroup, toRemovalInfo } from \"../mergeTreeNodes.js\";\nimport { IMergeTreeOp, MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { _dirname } from \"./dirname.cjs\";\nimport { TestClient } from \"./testClient.js\";\nimport { TestClientLogger } from \"./testClientLogger.js\";\n\nexport type TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n\trandom: IRandom,\n) => IMergeTreeOp | undefined;\n\nexport const removeRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.removeRangeLocal(opStart, opEnd);\n\nexport const obliterateRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.obliterateRangeLocal(opStart, opEnd);\n\nexport const annotateRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.annotateRangeLocal(opStart, opEnd, { client: client.longClientId });\n\nexport const insertAtRefPos: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n\trandom: IRandom,\n) => {\n\tconst segs: ISegment[] = [];\n\t// gather all the segments at the pos, including removed segments\n\twalkAllChildSegments(client.mergeTree.root, (seg) => {\n\t\tconst pos = client.getPosition(seg);\n\t\tif (pos >= opStart) {\n\t\t\tif (pos <= opStart) {\n\t\t\t\tsegs.push(seg);\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\treturn false;\n\t\t}\n\t\treturn true;\n\t});\n\tif (segs.length > 0) {\n\t\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\t\tconst seg = random.pick(segs);\n\t\tconst lref = client.createLocalReferencePosition(\n\t\t\tseg,\n\t\t\ttoRemovalInfo(seg) ? 0 : random.integer(0, seg.cachedLength - 1),\n\t\t\ttoRemovalInfo(seg)\n\t\t\t\t? ReferenceType.SlideOnRemove\n\t\t\t\t: random.pick([\n\t\t\t\t\t\tReferenceType.Simple,\n\t\t\t\t\t\tReferenceType.SlideOnRemove,\n\t\t\t\t\t\tReferenceType.Transient,\n\t\t\t\t\t]),\n\t\t\tundefined,\n\t\t);\n\n\t\treturn client.insertAtReferencePositionLocal(lref, TextSegment.make(text));\n\t}\n};\n\nexport const insert: TestOperation = (\n\tclient: TestClient,\n\t_start: number,\n\t_end: number,\n\trandom: IRandom,\n) => {\n\t// Note: the _start param is generated using exclusive range. This provides more coverage by allowing\n\t// insertion at the end.\n\tconst start = random.integer(0, client.getLength());\n\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\treturn client.insertTextLocal(start, text);\n};\n\nexport interface IConfigRange {\n\tmin: number;\n\tmax: number;\n\tgrowthFunc?: (input: number) => number;\n}\n\nexport function doOverRange(\n\trange: IConfigRange,\n\tdefaultGrowthFunc: (input: number) => number,\n\tdoAction: (current: number) => void,\n) {\n\tlet lastCurrent = Number.NaN;\n\tfor (\n\t\tlet current = range.min;\n\t\tcurrent <= range.max;\n\t\tcurrent = (range.growthFunc ?? defaultGrowthFunc)(current)\n\t) {\n\t\t// let growth funcs be simple\n\t\t// especially around 0 and 1\n\t\t// if the value didn't change,\n\t\t// just increment it\n\t\tif (current === lastCurrent) {\n\t\t\tcurrent++;\n\t\t}\n\t\tif (current <= range.max) {\n\t\t\tlastCurrent = current;\n\t\t\tdoAction(current);\n\t\t}\n\t}\n}\n\nexport function resolveRange(\n\trange: IConfigRange,\n\tdefaultGrowthFunc: (input: number) => number,\n): number[] {\n\tconst results: number[] = [];\n\tdoOverRange(range, range.growthFunc ?? defaultGrowthFunc, (num) => {\n\t\tresults.push(num);\n\t});\n\treturn results;\n}\n\nexport function resolveRanges<T extends object>(\n\tranges: T,\n\tdefaultGrowthFunc: (input: number) => number,\n): ResolvedRanges<T> {\n\treturn Object.entries(ranges)\n\t\t.filter(([_, value]) => isConfigRange(value))\n\t\t.map(([key, value]) => [key, resolveRange(value, defaultGrowthFunc)] as const)\n\t\t.reduce((prev, [key, resolvedRange]) => {\n\t\t\tprev[key] = resolvedRange;\n\t\t\treturn prev;\n\t\t}, {}) as ResolvedRanges<T>;\n}\n\nfunction isConfigRange(t: any): t is IConfigRange {\n\treturn typeof t === \"object\" && typeof t.min === \"number\" && typeof t.max === \"number\";\n}\n\ntype ReplaceRangeWith<T, TReplace> = T extends { min: number; max: number } ? TReplace : never;\n\ntype RangePropertyNames<T> = {\n\t[K in keyof T]-?: T[K] extends IConfigRange ? K : never;\n}[keyof T];\n\ntype PickFromRanges<T> = {\n\t[K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number>;\n};\n\ntype ResolvedRanges<T> = {\n\t[K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number[]>;\n};\n\ninterface ProvidesGrowthFunc {\n\tgrowthFunc: (input: number) => number;\n}\n\nexport function doOverRanges<T extends ProvidesGrowthFunc>(\n\tranges: T,\n\tdoAction: (selection: PickFromRanges<T>, description: string) => void,\n) {\n\tconst rangeEntries: [string, IConfigRange][] = Object.entries(ranges).filter(([_, value]) =>\n\t\tisConfigRange(value),\n\t);\n\n\tconst doOverRangesHelper = (selections: [string, number][]) => {\n\t\tif (selections.length === rangeEntries.length) {\n\t\t\tconst selectionsObj = {};\n\t\t\tfor (const [key, value] of selections) {\n\t\t\t\tselectionsObj[key] = value;\n\t\t\t}\n\t\t\tconst description = selections.map(([key, value]) => `${key}:${value}`).join(\"_\");\n\t\t\tdoAction(selectionsObj as PickFromRanges<T>, description);\n\t\t} else {\n\t\t\tconst [key, value] = rangeEntries[selections.length];\n\t\t\tdoOverRange(value, value.growthFunc ?? ranges.growthFunc, (selection) => {\n\t\t\t\tselections.push([key, selection]);\n\t\t\t\tdoOverRangesHelper(selections);\n\t\t\t\tselections.pop();\n\t\t\t});\n\t\t}\n\t};\n\n\tdoOverRangesHelper([]);\n}\n\nexport interface IMergeTreeOperationRunnerConfig {\n\treadonly rounds: number;\n\treadonly opsPerRoundRange: IConfigRange;\n\treadonly incrementalLog?: boolean;\n\treadonly operations: readonly TestOperation[];\n\tgrowthFunc(input: number): number;\n\tresultsFilePostfix?: string;\n}\n\nexport interface ReplayGroup {\n\tmsgs: ISequencedDocumentMessage[];\n\tinitialText: string;\n\tresultText: string;\n\tseq: number;\n}\n\nexport const replayResultsPath = `${_dirname}/../../src/test/results`;\n\nexport function runMergeTreeOperationRunner(\n\trandom: IRandom,\n\tstartingSeq: number,\n\tclients: readonly TestClient[],\n\tminLength: number,\n\tconfig: IMergeTreeOperationRunnerConfig,\n\tapply: ApplyMessagesFn = applyMessages,\n) {\n\tlet seq = startingSeq;\n\tconst results: ReplayGroup[] = [];\n\n\tdoOverRange(config.opsPerRoundRange, config.growthFunc, (opsPerRound) => {\n\t\tif (config.incrementalLog) {\n\t\t\tconsole.log(\n\t\t\t\t`MinLength: ${minLength} Clients: ${clients.length} Ops: ${opsPerRound} Seq: ${seq}`,\n\t\t\t);\n\t\t}\n\t\tfor (let round = 0; round < config.rounds; round++) {\n\t\t\tconst initialText = clients[0].getText();\n\t\t\tconst logger = new TestClientLogger(\n\t\t\t\tclients,\n\t\t\t\t`Clients: ${clients.length} Ops: ${opsPerRound} Round: ${round}`,\n\t\t\t);\n\t\t\tconst messageData = generateOperationMessagesForClients(\n\t\t\t\trandom,\n\t\t\t\tseq,\n\t\t\t\tclients,\n\t\t\t\tlogger,\n\t\t\t\topsPerRound,\n\t\t\t\tminLength,\n\t\t\t\tconfig.operations,\n\t\t\t);\n\t\t\tconst msgs = messageData.map((md) => md[0]);\n\t\t\tseq = apply(seq, messageData, clients, logger, random);\n\t\t\tconst resultText = logger.validate();\n\t\t\tresults.push({\n\t\t\t\tinitialText,\n\t\t\t\tresultText,\n\t\t\t\tmsgs,\n\t\t\t\tseq,\n\t\t\t});\n\t\t\tlogger.dispose();\n\t\t}\n\t});\n\n\tif (config.resultsFilePostfix !== undefined) {\n\t\tconst resultsFilePath = `${replayResultsPath}/len_${minLength}-clients_${clients.length}-${config.resultsFilePostfix}`;\n\t\tfs.writeFileSync(resultsFilePath, JSON.stringify(results, undefined, 4));\n\t}\n\n\treturn seq;\n}\n\nexport function generateOperationMessagesForClients(\n\trandom: IRandom,\n\tstartingSeq: number,\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n\topsPerRound: number,\n\tminLength: number,\n\toperations: readonly TestOperation[],\n) {\n\tconst minimumSequenceNumber = startingSeq;\n\tlet tempSeq = startingSeq * -1;\n\tconst messages: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][] = [];\n\n\tfor (let i = 0; i < opsPerRound; i++) {\n\t\t// pick a client greater than 0, client 0 only applies remote ops\n\t\t// and is our baseline\n\t\tconst client = clients[random.integer(1, clients.length - 1)];\n\t\tconst len = client.getLength();\n\t\tconst sg = client.peekPendingSegmentGroups();\n\t\tlet op: IMergeTreeOp | undefined;\n\t\tif (len === 0 || len < minLength) {\n\t\t\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\t\t\top = client.insertTextLocal(random.integer(0, len), text);\n\t\t} else {\n\t\t\tlet opIndex = random.integer(0, operations.length - 1);\n\t\t\tconst start = random.integer(0, len - 1);\n\t\t\tconst end = random.integer(start + 1, len);\n\n\t\t\tfor (let y = 0; y < operations.length && op === undefined; y++) {\n\t\t\t\top = operations[opIndex](client, start, end, random);\n\t\t\t\topIndex++;\n\t\t\t\topIndex %= operations.length;\n\t\t\t}\n\t\t}\n\t\tif (op !== undefined) {\n\t\t\t// Pre-check to avoid logger.toString() in the string template\n\t\t\tif (sg === client.peekPendingSegmentGroups()) {\n\t\t\t\tassert.notEqual(\n\t\t\t\t\tsg,\n\t\t\t\t\tclient.peekPendingSegmentGroups(),\n\t\t\t\t\t`op created but segment group not enqueued.${logger}`,\n\t\t\t\t);\n\t\t\t}\n\t\t\tconst message = client.makeOpMessage(op, --tempSeq);\n\t\t\tmessage.minimumSequenceNumber = minimumSequenceNumber;\n\t\t\tmessages.push([\n\t\t\t\tmessage,\n\t\t\t\tclient.peekPendingSegmentGroups(\n\t\t\t\t\top.type === MergeTreeDeltaType.GROUP ? op.ops.length : 1,\n\t\t\t\t)!,\n\t\t\t]);\n\t\t}\n\t}\n\treturn messages;\n}\n\nexport function generateClientNames(): string[] {\n\tconst clientNames: string[] = [];\n\tfunction addClientNames(startChar: string, count: number) {\n\t\tconst startCode = startChar.charCodeAt(0);\n\t\tfor (let i = 0; i < count; i++) {\n\t\t\tclientNames.push(String.fromCharCode(startCode + i));\n\t\t}\n\t}\n\n\taddClientNames(\"A\", 26);\n\taddClientNames(\"a\", 26);\n\taddClientNames(\"0\", 17);\n\n\treturn clientNames;\n}\n\ntype ApplyMessagesFn = (\n\tstartingSeq: number,\n\tmessageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n\trandom: IRandom,\n) => number;\n\nexport function applyMessages(\n\tstartingSeq: number,\n\tmessageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n) {\n\tlet seq = startingSeq;\n\ttry {\n\t\t// log and apply all the ops created in the round\n\t\t// eslint-disable-next-line @typescript-eslint/prefer-for-of\n\t\tfor (let i = 0; i < messageData.length; i++) {\n\t\t\tconst [message] = messageData[i];\n\t\t\tmessage.sequenceNumber = ++seq;\n\t\t\tclients.forEach((c) => c.applyMsg(message));\n\t\t}\n\t} catch (e) {\n\t\tthrow logger.addLogsToError(e);\n\t}\n\treturn seq;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"mergeTreeOperationRunner.js","sourceRoot":"","sources":["../../src/test/mergeTreeOperationRunner.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\";\nimport * as fs from \"node:fs\";\n\nimport { IRandom } from \"@fluid-private/stochastic-test-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/driver-definitions/internal\";\n\nimport { walkAllChildSegments } from \"../mergeTreeNodeWalk.js\";\nimport { ISegment, SegmentGroup, toRemovalInfo } from \"../mergeTreeNodes.js\";\nimport { IMergeTreeOp, MergeTreeDeltaType, ReferenceType } from \"../ops.js\";\nimport { TextSegment } from \"../textSegment.js\";\n\nimport { _dirname } from \"./dirname.cjs\";\nimport { TestClient } from \"./testClient.js\";\nimport { TestClientLogger } from \"./testClientLogger.js\";\n\nexport type TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n\trandom: IRandom,\n) => IMergeTreeOp | undefined;\n\nexport const removeRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.removeRangeLocal(opStart, opEnd);\n\nexport const obliterateRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.obliterateRangeLocal(opStart, opEnd);\n\nexport const annotateRange: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n) => client.annotateRangeLocal(opStart, opEnd, { client: client.longClientId });\n\nexport const insertAtRefPos: TestOperation = (\n\tclient: TestClient,\n\topStart: number,\n\topEnd: number,\n\trandom: IRandom,\n) => {\n\tconst segs: ISegment[] = [];\n\t// gather all the segments at the pos, including removed segments\n\twalkAllChildSegments(client.mergeTree.root, (seg) => {\n\t\tconst pos = client.getPosition(seg);\n\t\tif (pos >= opStart) {\n\t\t\tif (pos <= opStart) {\n\t\t\t\tsegs.push(seg);\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\treturn false;\n\t\t}\n\t\treturn true;\n\t});\n\tif (segs.length > 0) {\n\t\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\t\tconst seg = random.pick(segs);\n\t\tconst lref = client.createLocalReferencePosition(\n\t\t\tseg,\n\t\t\ttoRemovalInfo(seg) ? 0 : random.integer(0, seg.cachedLength - 1),\n\t\t\ttoRemovalInfo(seg)\n\t\t\t\t? ReferenceType.SlideOnRemove\n\t\t\t\t: random.pick([\n\t\t\t\t\t\tReferenceType.Simple,\n\t\t\t\t\t\tReferenceType.SlideOnRemove,\n\t\t\t\t\t\tReferenceType.Transient,\n\t\t\t\t\t]),\n\t\t\tundefined,\n\t\t);\n\n\t\treturn client.insertAtReferencePositionLocal(lref, TextSegment.make(text));\n\t}\n};\n\nexport const insert: TestOperation = (\n\tclient: TestClient,\n\t_start: number,\n\t_end: number,\n\trandom: IRandom,\n) => {\n\t// Note: the _start param is generated using exclusive range. This provides more coverage by allowing\n\t// insertion at the end.\n\tconst start = random.integer(0, client.getLength());\n\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\treturn client.insertTextLocal(start, text);\n};\n\nexport interface IConfigRange {\n\tmin: number;\n\tmax: number;\n\tgrowthFunc?: (input: number) => number;\n}\n\nexport function doOverRange(\n\trange: IConfigRange,\n\tdefaultGrowthFunc: (input: number) => number,\n\tdoAction: (current: number) => void,\n): void {\n\tlet lastCurrent = Number.NaN;\n\tfor (\n\t\tlet current = range.min;\n\t\tcurrent <= range.max;\n\t\tcurrent = (range.growthFunc ?? defaultGrowthFunc)(current)\n\t) {\n\t\t// let growth funcs be simple\n\t\t// especially around 0 and 1\n\t\t// if the value didn't change,\n\t\t// just increment it\n\t\tif (current === lastCurrent) {\n\t\t\tcurrent++;\n\t\t}\n\t\tif (current <= range.max) {\n\t\t\tlastCurrent = current;\n\t\t\tdoAction(current);\n\t\t}\n\t}\n}\n\nexport function resolveRange(\n\trange: IConfigRange,\n\tdefaultGrowthFunc: (input: number) => number,\n): number[] {\n\tconst results: number[] = [];\n\tdoOverRange(range, range.growthFunc ?? defaultGrowthFunc, (num) => {\n\t\tresults.push(num);\n\t});\n\treturn results;\n}\n\nexport function resolveRanges<T extends object>(\n\tranges: T,\n\tdefaultGrowthFunc: (input: number) => number,\n): ResolvedRanges<T> {\n\t// eslint-disable-next-line @typescript-eslint/consistent-type-assertions\n\tconst resolvedRanges: ResolvedRanges<T> = {} as ResolvedRanges<T>;\n\tfor (const [key, value] of Object.entries(ranges)) {\n\t\tif (isConfigRange(value)) {\n\t\t\tresolvedRanges[key] = resolveRange(value, defaultGrowthFunc);\n\t\t}\n\t}\n\treturn resolvedRanges;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction isConfigRange(t: any): t is IConfigRange {\n\t// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n\treturn typeof t === \"object\" && typeof t.min === \"number\" && typeof t.max === \"number\";\n}\n\ntype ReplaceRangeWith<T, TReplace> = T extends { min: number; max: number } ? TReplace : never;\n\ntype RangePropertyNames<T> = {\n\t[K in keyof T]-?: T[K] extends IConfigRange ? K : never;\n}[keyof T];\n\ntype PickFromRanges<T> = {\n\t[K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number>;\n};\n\ntype ResolvedRanges<T> = {\n\t[K in RangePropertyNames<T>]: ReplaceRangeWith<T[K], number[]>;\n};\n\ninterface ProvidesGrowthFunc {\n\tgrowthFunc: (input: number) => number;\n}\n\nexport function doOverRanges<T extends ProvidesGrowthFunc>(\n\tranges: T,\n\tdoAction: (selection: PickFromRanges<T>, description: string) => void,\n): void {\n\tconst rangeEntries: [string, IConfigRange][] = [];\n\tfor (const [key, value] of Object.entries(ranges)) {\n\t\tif (isConfigRange(value)) {\n\t\t\trangeEntries.push([key, value]);\n\t\t}\n\t}\n\n\tconst doOverRangesHelper = (selections: [string, number][]): void => {\n\t\tif (selections.length === rangeEntries.length) {\n\t\t\tconst selectionsObj = {};\n\t\t\tfor (const [key, value] of selections) {\n\t\t\t\tselectionsObj[key] = value;\n\t\t\t}\n\t\t\tconst description = selections.map(([key, value]) => `${key}:${value}`).join(\"_\");\n\t\t\tdoAction(selectionsObj as PickFromRanges<T>, description);\n\t\t} else {\n\t\t\tconst [key, value] = rangeEntries[selections.length];\n\t\t\tdoOverRange(value, value.growthFunc ?? ranges.growthFunc, (selection) => {\n\t\t\t\tselections.push([key, selection]);\n\t\t\t\tdoOverRangesHelper(selections);\n\t\t\t\tselections.pop();\n\t\t\t});\n\t\t}\n\t};\n\n\tdoOverRangesHelper([]);\n}\n\nexport interface IMergeTreeOperationRunnerConfig {\n\treadonly rounds: number;\n\treadonly opsPerRoundRange: IConfigRange;\n\treadonly incrementalLog?: boolean;\n\treadonly operations: readonly TestOperation[];\n\tgrowthFunc(input: number): number;\n\tresultsFilePostfix?: string;\n}\n\nexport interface ReplayGroup {\n\tmsgs: ISequencedDocumentMessage[];\n\tinitialText: string;\n\tresultText: string;\n\tseq: number;\n}\n\nexport const replayResultsPath = `${_dirname}/../../src/test/results`;\n\nexport function runMergeTreeOperationRunner(\n\trandom: IRandom,\n\tstartingSeq: number,\n\tclients: readonly TestClient[],\n\tminLength: number,\n\tconfig: IMergeTreeOperationRunnerConfig,\n\tapply: ApplyMessagesFn = applyMessages,\n): number {\n\tlet seq = startingSeq;\n\tconst results: ReplayGroup[] = [];\n\n\tdoOverRange(config.opsPerRoundRange, config.growthFunc, (opsPerRound) => {\n\t\tif (config.incrementalLog) {\n\t\t\tconsole.log(\n\t\t\t\t`MinLength: ${minLength} Clients: ${clients.length} Ops: ${opsPerRound} Seq: ${seq}`,\n\t\t\t);\n\t\t}\n\t\tfor (let round = 0; round < config.rounds; round++) {\n\t\t\tconst initialText = clients[0].getText();\n\t\t\tconst logger = new TestClientLogger(\n\t\t\t\tclients,\n\t\t\t\t`Clients: ${clients.length} Ops: ${opsPerRound} Round: ${round}`,\n\t\t\t);\n\t\t\tconst messageData = generateOperationMessagesForClients(\n\t\t\t\trandom,\n\t\t\t\tseq,\n\t\t\t\tclients,\n\t\t\t\tlogger,\n\t\t\t\topsPerRound,\n\t\t\t\tminLength,\n\t\t\t\tconfig.operations,\n\t\t\t);\n\t\t\tconst msgs = messageData.map((md) => md[0]);\n\t\t\tseq = apply(seq, messageData, clients, logger, random);\n\t\t\tconst resultText = logger.validate();\n\t\t\tresults.push({\n\t\t\t\tinitialText,\n\t\t\t\tresultText,\n\t\t\t\tmsgs,\n\t\t\t\tseq,\n\t\t\t});\n\t\t\tlogger.dispose();\n\t\t}\n\t});\n\n\tif (config.resultsFilePostfix !== undefined) {\n\t\tconst resultsFilePath = `${replayResultsPath}/len_${minLength}-clients_${clients.length}-${config.resultsFilePostfix}`;\n\t\tfs.writeFileSync(resultsFilePath, JSON.stringify(results, undefined, 4));\n\t}\n\n\treturn seq;\n}\n\nexport function generateOperationMessagesForClients(\n\trandom: IRandom,\n\tstartingSeq: number,\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n\topsPerRound: number,\n\tminLength: number,\n\toperations: readonly TestOperation[],\n): [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][] {\n\tconst minimumSequenceNumber = startingSeq;\n\tlet tempSeq = startingSeq * -1;\n\tconst messages: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][] = [];\n\n\tfor (let i = 0; i < opsPerRound; i++) {\n\t\t// pick a client greater than 0, client 0 only applies remote ops\n\t\t// and is our baseline\n\t\tconst client = clients[random.integer(1, clients.length - 1)];\n\t\tconst len = client.getLength();\n\t\tconst sg = client.peekPendingSegmentGroups();\n\t\tlet op: IMergeTreeOp | undefined;\n\t\tif (len === 0 || len < minLength) {\n\t\t\tconst text = client.longClientId!.repeat(random.integer(1, 3));\n\t\t\top = client.insertTextLocal(random.integer(0, len), text);\n\t\t} else {\n\t\t\tlet opIndex = random.integer(0, operations.length - 1);\n\t\t\tconst start = random.integer(0, len - 1);\n\t\t\tconst end = random.integer(start + 1, len);\n\n\t\t\tfor (let y = 0; y < operations.length && op === undefined; y++) {\n\t\t\t\top = operations[opIndex](client, start, end, random);\n\t\t\t\topIndex++;\n\t\t\t\topIndex %= operations.length;\n\t\t\t}\n\t\t}\n\t\tif (op !== undefined) {\n\t\t\t// Pre-check to avoid logger.toString() in the string template\n\t\t\tif (sg === client.peekPendingSegmentGroups()) {\n\t\t\t\tassert.notEqual(\n\t\t\t\t\tsg,\n\t\t\t\t\tclient.peekPendingSegmentGroups(),\n\t\t\t\t\t`op created but segment group not enqueued.${logger}`,\n\t\t\t\t);\n\t\t\t}\n\t\t\tconst message = client.makeOpMessage(op, --tempSeq);\n\t\t\tmessage.minimumSequenceNumber = minimumSequenceNumber;\n\t\t\tmessages.push([\n\t\t\t\tmessage,\n\t\t\t\tclient.peekPendingSegmentGroups(\n\t\t\t\t\top.type === MergeTreeDeltaType.GROUP ? op.ops.length : 1,\n\t\t\t\t)!,\n\t\t\t]);\n\t\t}\n\t}\n\treturn messages;\n}\n\nexport function generateClientNames(): string[] {\n\tconst clientNames: string[] = [];\n\tfunction addClientNames(startChar: string, count: number): void {\n\t\tconst startCode = startChar.codePointAt(0);\n\t\tif (startCode === undefined) {\n\t\t\tthrow new Error(\"startCode must be a single character\");\n\t\t}\n\t\tfor (let i = 0; i < count; i++) {\n\t\t\tclientNames.push(String.fromCodePoint(startCode + i));\n\t\t}\n\t}\n\n\taddClientNames(\"A\", 26);\n\taddClientNames(\"a\", 26);\n\taddClientNames(\"0\", 17);\n\n\treturn clientNames;\n}\n\ntype ApplyMessagesFn = (\n\tstartingSeq: number,\n\tmessageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n\trandom: IRandom,\n) => number;\n\nexport function applyMessages(\n\tstartingSeq: number,\n\tmessageData: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tlogger: TestClientLogger,\n): number {\n\tlet seq = startingSeq;\n\ttry {\n\t\t// log and apply all the ops created in the round\n\t\t// eslint-disable-next-line @typescript-eslint/prefer-for-of\n\t\tfor (let i = 0; i < messageData.length; i++) {\n\t\t\tconst [message] = messageData[i];\n\t\t\tmessage.sequenceNumber = ++seq;\n\t\t\tfor (const c of clients) c.applyMsg(message);\n\t\t}\n\t} catch (error) {\n\t\tthrow logger.addLogsToError(error);\n\t}\n\treturn seq;\n}\n"]}
|