@fluidframework/merge-tree 2.0.0-rc.1.0.4 → 2.0.0-rc.2.0.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.js → .eslintrc.cjs} +4 -1
- package/{.mocharc.js → .mocharc.cjs} +1 -1
- package/CHANGELOG.md +4 -0
- package/api-extractor-cjs.json +8 -0
- package/api-extractor-lint.json +1 -1
- package/api-extractor.json +1 -9
- package/api-report/merge-tree.api.md +6 -12
- package/dist/MergeTreeTextHelper.d.ts +2 -2
- package/dist/MergeTreeTextHelper.d.ts.map +1 -1
- package/dist/MergeTreeTextHelper.js +3 -3
- package/dist/MergeTreeTextHelper.js.map +1 -1
- package/dist/attributionCollection.d.ts +1 -1
- package/dist/attributionCollection.d.ts.map +1 -1
- package/dist/attributionCollection.js.map +1 -1
- package/dist/attributionPolicy.d.ts +1 -1
- package/dist/attributionPolicy.d.ts.map +1 -1
- package/dist/attributionPolicy.js +15 -15
- package/dist/attributionPolicy.js.map +1 -1
- package/dist/client.d.ts +31 -12
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +103 -92
- package/dist/client.js.map +1 -1
- package/dist/collections/index.d.ts +2 -2
- package/dist/collections/index.d.ts.map +1 -1
- package/dist/collections/index.js +6 -6
- package/dist/collections/index.js.map +1 -1
- package/dist/endOfTreeSegment.d.ts +3 -3
- package/dist/endOfTreeSegment.d.ts.map +1 -1
- package/dist/endOfTreeSegment.js +8 -8
- package/dist/endOfTreeSegment.js.map +1 -1
- package/dist/index.d.ts +20 -20
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +71 -71
- package/dist/index.js.map +1 -1
- package/dist/localReference.d.ts +9 -39
- package/dist/localReference.d.ts.map +1 -1
- package/dist/localReference.js +29 -24
- package/dist/localReference.js.map +1 -1
- package/dist/merge-tree-alpha.d.ts +28 -450
- package/dist/merge-tree-beta.d.ts +0 -438
- package/dist/merge-tree-public.d.ts +0 -438
- package/dist/merge-tree-untrimmed.d.ts +28 -787
- package/dist/mergeTree.d.ts +11 -19
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +201 -189
- package/dist/mergeTree.js.map +1 -1
- package/dist/mergeTreeDeltaCallback.d.ts +3 -7
- package/dist/mergeTreeDeltaCallback.d.ts.map +1 -1
- package/dist/mergeTreeDeltaCallback.js.map +1 -1
- package/dist/mergeTreeNodeWalk.d.ts +1 -1
- package/dist/mergeTreeNodeWalk.d.ts.map +1 -1
- package/dist/mergeTreeNodeWalk.js.map +1 -1
- package/dist/mergeTreeNodes.d.ts +17 -14
- package/dist/mergeTreeNodes.d.ts.map +1 -1
- package/dist/mergeTreeNodes.js +32 -32
- package/dist/mergeTreeNodes.js.map +1 -1
- package/dist/mergeTreeTracking.d.ts +2 -2
- package/dist/mergeTreeTracking.d.ts.map +1 -1
- package/dist/mergeTreeTracking.js +2 -2
- package/dist/mergeTreeTracking.js.map +1 -1
- package/dist/opBuilder.d.ts +3 -3
- package/dist/opBuilder.d.ts.map +1 -1
- package/dist/opBuilder.js +7 -7
- package/dist/opBuilder.js.map +1 -1
- package/dist/package.json +3 -0
- package/dist/partialLengths.d.ts +5 -5
- package/dist/partialLengths.d.ts.map +1 -1
- package/dist/partialLengths.js +29 -29
- package/dist/partialLengths.js.map +1 -1
- package/dist/referencePositions.d.ts +4 -4
- package/dist/referencePositions.d.ts.map +1 -1
- package/dist/referencePositions.js +2 -2
- package/dist/referencePositions.js.map +1 -1
- package/dist/revertibles.d.ts +7 -7
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +39 -39
- package/dist/revertibles.js.map +1 -1
- package/dist/segmentGroupCollection.d.ts +1 -1
- package/dist/segmentGroupCollection.d.ts.map +1 -1
- package/dist/segmentGroupCollection.js +3 -3
- package/dist/segmentGroupCollection.js.map +1 -1
- package/dist/segmentPropertiesManager.d.ts +2 -2
- package/dist/segmentPropertiesManager.d.ts.map +1 -1
- package/dist/segmentPropertiesManager.js +8 -8
- package/dist/segmentPropertiesManager.js.map +1 -1
- package/dist/snapshotChunks.d.ts +3 -3
- package/dist/snapshotChunks.d.ts.map +1 -1
- package/dist/snapshotChunks.js +5 -5
- package/dist/snapshotChunks.js.map +1 -1
- package/dist/snapshotLoader.d.ts +3 -3
- package/dist/snapshotLoader.d.ts.map +1 -1
- package/dist/snapshotLoader.js +19 -19
- package/dist/snapshotLoader.js.map +1 -1
- package/dist/snapshotV1.d.ts +3 -3
- package/dist/snapshotV1.d.ts.map +1 -1
- package/dist/snapshotV1.js +35 -18
- package/dist/snapshotV1.js.map +1 -1
- package/dist/snapshotlegacy.d.ts +2 -2
- package/dist/snapshotlegacy.d.ts.map +1 -1
- package/dist/snapshotlegacy.js +22 -10
- package/dist/snapshotlegacy.js.map +1 -1
- package/dist/sortedSegmentSet.d.ts +3 -3
- package/dist/sortedSegmentSet.d.ts.map +1 -1
- package/dist/sortedSegmentSet.js +2 -2
- package/dist/sortedSegmentSet.js.map +1 -1
- package/dist/test/Insertion.perf.spec.js +15 -15
- package/dist/test/Insertion.perf.spec.js.map +1 -1
- package/dist/test/PartialLengths.perf.spec.js +13 -13
- package/dist/test/PartialLengths.perf.spec.js.map +1 -1
- package/dist/test/Removal.perf.spec.js +25 -25
- package/dist/test/Removal.perf.spec.js.map +1 -1
- package/dist/test/Snapshot.perf.spec.js +3 -3
- package/dist/test/Snapshot.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.perf.spec.js +9 -9
- package/dist/test/attributionCollection.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.spec.js +46 -46
- package/dist/test/attributionCollection.spec.js.map +1 -1
- package/dist/test/attributionPolicy.spec.js +13 -13
- package/dist/test/attributionPolicy.spec.js.map +1 -1
- package/dist/test/{beastTest.d.ts → beastTest.spec.d.ts} +3 -3
- package/dist/test/beastTest.spec.d.ts.map +1 -0
- package/dist/test/{beastTest.js → beastTest.spec.js} +120 -119
- package/dist/test/beastTest.spec.js.map +1 -0
- package/dist/test/client.annotateMarker.spec.js +13 -13
- package/dist/test/client.annotateMarker.spec.js.map +1 -1
- package/dist/test/{client.apis.d.ts → client.apis.spec.d.ts} +1 -1
- package/dist/test/client.apis.spec.d.ts.map +1 -0
- package/dist/test/{client.apis.js → client.apis.spec.js} +8 -8
- package/dist/test/client.apis.spec.js.map +1 -0
- package/dist/test/client.applyMsg.spec.js +106 -43
- package/dist/test/client.applyMsg.spec.js.map +1 -1
- package/dist/test/client.applyStashedOpFarm.spec.d.ts +1 -1
- package/dist/test/client.applyStashedOpFarm.spec.d.ts.map +1 -1
- package/dist/test/client.applyStashedOpFarm.spec.js +33 -21
- package/dist/test/client.applyStashedOpFarm.spec.js.map +1 -1
- package/dist/test/client.attributionFarm.spec.d.ts +1 -1
- package/dist/test/client.attributionFarm.spec.d.ts.map +1 -1
- package/dist/test/client.attributionFarm.spec.js +13 -13
- package/dist/test/client.attributionFarm.spec.js.map +1 -1
- package/dist/test/client.conflictFarm.spec.d.ts +1 -1
- package/dist/test/client.conflictFarm.spec.d.ts.map +1 -1
- package/dist/test/client.conflictFarm.spec.js +9 -9
- package/dist/test/client.conflictFarm.spec.js.map +1 -1
- package/dist/test/client.getPosition.spec.js +4 -4
- package/dist/test/client.getPosition.spec.js.map +1 -1
- package/dist/test/client.localReference.spec.js +72 -72
- package/dist/test/client.localReference.spec.js.map +1 -1
- package/dist/test/client.localReferenceFarm.spec.js +18 -18
- package/dist/test/client.localReferenceFarm.spec.js.map +1 -1
- package/dist/test/client.rebasePosition.spec.js +2 -2
- package/dist/test/client.rebasePosition.spec.js.map +1 -1
- package/dist/test/client.reconnectFarm.spec.d.ts +1 -1
- package/dist/test/client.reconnectFarm.spec.d.ts.map +1 -1
- package/dist/test/client.reconnectFarm.spec.js +10 -10
- package/dist/test/client.reconnectFarm.spec.js.map +1 -1
- package/dist/test/client.replay.spec.js +11 -11
- package/dist/test/client.replay.spec.js.map +1 -1
- package/dist/test/client.rollback.spec.js +83 -83
- package/dist/test/client.rollback.spec.js.map +1 -1
- package/dist/test/client.rollbackFarm.spec.js +9 -9
- package/dist/test/client.rollbackFarm.spec.js.map +1 -1
- package/dist/test/client.searchForMarker.spec.js +137 -137
- package/dist/test/client.searchForMarker.spec.js.map +1 -1
- package/dist/test/client.walkSegments.spec.js +2 -2
- package/dist/test/client.walkSegments.spec.js.map +1 -1
- package/dist/test/collections.list.spec.js +4 -4
- package/dist/test/collections.list.spec.js.map +1 -1
- package/dist/test/createInsertOnlyAttributionPolicy.spec.js +4 -4
- package/dist/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -1
- package/dist/test/dirname.cjs +16 -0
- package/dist/test/dirname.cjs.map +1 -0
- package/dist/test/dirname.d.cts +6 -0
- package/dist/test/dirname.d.cts.map +1 -0
- package/dist/test/index.d.ts +8 -8
- package/dist/test/index.d.ts.map +1 -1
- package/dist/test/index.js +82 -81
- package/dist/test/index.js.map +1 -1
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js +39 -39
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.annotate.spec.js +39 -39
- package/dist/test/mergeTree.annotate.spec.js.map +1 -1
- package/dist/test/mergeTree.insert.deltaCallback.spec.js +35 -35
- package/dist/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.insertingWalk.spec.js +77 -77
- package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +42 -42
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.spec.js +15 -15
- package/dist/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/dist/test/mergeTree.walk.spec.js +14 -14
- package/dist/test/mergeTree.walk.spec.js.map +1 -1
- package/dist/test/mergeTree.zamboni.spec.js +9 -9
- package/dist/test/mergeTree.zamboni.spec.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.d.ts +4 -4
- package/dist/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/dist/test/mergeTreeOperationRunner.js +16 -15
- package/dist/test/mergeTreeOperationRunner.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.spec.js +5 -5
- package/dist/test/mergeTreeOperationRunner.spec.js.map +1 -1
- package/dist/test/obliterate.concurrent.spec.js +85 -88
- package/dist/test/obliterate.concurrent.spec.js.map +1 -1
- package/dist/test/obliterate.deltaCallback.spec.d.ts +6 -0
- package/dist/test/obliterate.deltaCallback.spec.d.ts.map +1 -0
- package/dist/test/obliterate.deltaCallback.spec.js +146 -0
- package/dist/test/obliterate.deltaCallback.spec.js.map +1 -0
- package/dist/test/obliterate.partialLength.spec.js +39 -44
- package/dist/test/obliterate.partialLength.spec.js.map +1 -1
- package/dist/test/obliterate.reconnect.spec.js +15 -18
- package/dist/test/obliterate.reconnect.spec.js.map +1 -1
- package/dist/test/obliterate.spec.js +16 -16
- package/dist/test/obliterate.spec.js.map +1 -1
- package/dist/test/ordinal.spec.js +5 -5
- package/dist/test/ordinal.spec.js.map +1 -1
- package/dist/test/partialLength.spec.js +58 -64
- 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 +8 -8
- package/dist/test/reconnectHelper.d.ts.map +1 -1
- package/dist/test/reconnectHelper.js +3 -3
- package/dist/test/reconnectHelper.js.map +1 -1
- package/dist/test/resetPendingSegmentsToOp.spec.js +18 -18
- package/dist/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/dist/test/revertibleFarm.spec.js +21 -21
- package/dist/test/revertibleFarm.spec.js.map +1 -1
- package/dist/test/revertibles.spec.js +67 -67
- package/dist/test/revertibles.spec.js.map +1 -1
- package/dist/test/segmentGroupCollection.spec.js +3 -3
- package/dist/test/segmentGroupCollection.spec.js.map +1 -1
- package/dist/test/snapshot.spec.js +16 -16
- package/dist/test/snapshot.spec.js.map +1 -1
- package/dist/test/snapshot.utils.d.ts +4 -4
- package/dist/test/snapshot.utils.d.ts.map +1 -1
- package/dist/test/snapshot.utils.js +11 -11
- package/dist/test/snapshot.utils.js.map +1 -1
- package/dist/test/snapshotlegacy.spec.js +22 -22
- package/dist/test/snapshotlegacy.spec.js.map +1 -1
- package/dist/test/sortedSegmentSet.spec.js +9 -9
- package/dist/test/sortedSegmentSet.spec.js.map +1 -1
- package/dist/test/testClient.d.ts +13 -16
- package/dist/test/testClient.d.ts.map +1 -1
- package/dist/test/testClient.js +57 -59
- package/dist/test/testClient.js.map +1 -1
- package/dist/test/testClientLogger.d.ts +3 -3
- package/dist/test/testClientLogger.d.ts.map +1 -1
- package/dist/test/testClientLogger.js +19 -19
- package/dist/test/testClientLogger.js.map +1 -1
- package/dist/test/testServer.d.ts +3 -3
- package/dist/test/testServer.d.ts.map +1 -1
- package/dist/test/testServer.js +8 -8
- package/dist/test/testServer.js.map +1 -1
- package/dist/test/testUtils.d.ts +14 -6
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +36 -17
- package/dist/test/testUtils.js.map +1 -1
- package/dist/test/text.d.ts +2 -2
- package/dist/test/text.d.ts.map +1 -1
- package/dist/test/text.js +10 -10
- package/dist/test/text.js.map +1 -1
- package/dist/test/tracking.spec.js +12 -12
- package/dist/test/tracking.spec.js.map +1 -1
- package/dist/test/{wordUnitTests.d.ts → wordUnitTests.spec.d.ts} +1 -1
- package/dist/test/wordUnitTests.spec.d.ts.map +1 -0
- package/dist/test/{wordUnitTests.js → wordUnitTests.spec.js} +16 -15
- package/dist/test/wordUnitTests.spec.js.map +1 -0
- package/dist/textSegment.d.ts +3 -3
- package/dist/textSegment.d.ts.map +1 -1
- package/dist/textSegment.js +2 -2
- package/dist/textSegment.js.map +1 -1
- package/dist/tsdoc-metadata.json +1 -1
- package/dist/zamboni.d.ts +2 -2
- package/dist/zamboni.d.ts.map +1 -1
- package/dist/zamboni.js +19 -19
- package/dist/zamboni.js.map +1 -1
- package/lib/{MergeTreeTextHelper.d.mts → MergeTreeTextHelper.d.ts} +3 -3
- package/lib/MergeTreeTextHelper.d.ts.map +1 -0
- package/lib/{MergeTreeTextHelper.mjs → MergeTreeTextHelper.js} +3 -2
- package/lib/MergeTreeTextHelper.js.map +1 -0
- package/lib/{attributionCollection.d.mts → attributionCollection.d.ts} +2 -2
- package/lib/attributionCollection.d.ts.map +1 -0
- package/lib/{attributionCollection.mjs → attributionCollection.js} +1 -1
- package/lib/attributionCollection.js.map +1 -0
- package/lib/{attributionPolicy.d.mts → attributionPolicy.d.ts} +2 -2
- package/lib/attributionPolicy.d.ts.map +1 -0
- package/lib/{attributionPolicy.mjs → attributionPolicy.js} +4 -4
- package/lib/attributionPolicy.js.map +1 -0
- package/lib/{client.d.mts → client.d.ts} +32 -13
- package/lib/client.d.ts.map +1 -0
- package/lib/{client.mjs → client.js} +42 -31
- package/lib/client.js.map +1 -0
- package/lib/collections/{index.d.mts → index.d.ts} +3 -3
- package/lib/collections/index.d.ts.map +1 -0
- package/lib/collections/index.js +7 -0
- package/lib/collections/index.js.map +1 -0
- package/lib/collections/{list.d.mts → list.d.ts} +1 -1
- package/lib/collections/list.d.ts.map +1 -0
- package/lib/collections/{list.mjs → list.js} +1 -1
- package/lib/collections/list.js.map +1 -0
- package/lib/collections/{rbTree.d.mts → rbTree.d.ts} +1 -1
- package/lib/collections/rbTree.d.ts.map +1 -0
- package/lib/collections/{rbTree.mjs → rbTree.js} +1 -1
- package/lib/collections/rbTree.js.map +1 -0
- package/lib/{constants.d.mts → constants.d.ts} +1 -1
- package/lib/constants.d.ts.map +1 -0
- package/lib/{constants.mjs → constants.js} +1 -1
- package/lib/constants.js.map +1 -0
- package/lib/{endOfTreeSegment.d.mts → endOfTreeSegment.d.ts} +4 -4
- package/lib/endOfTreeSegment.d.ts.map +1 -0
- package/lib/{endOfTreeSegment.mjs → endOfTreeSegment.js} +3 -3
- package/lib/endOfTreeSegment.js.map +1 -0
- package/lib/{index.d.mts → index.d.ts} +21 -21
- package/lib/index.d.ts.map +1 -0
- package/lib/{index.mjs → index.js} +20 -20
- package/lib/index.js.map +1 -0
- package/lib/{localReference.d.mts → localReference.d.ts} +10 -40
- package/lib/localReference.d.ts.map +1 -0
- package/lib/{localReference.mjs → localReference.js} +12 -6
- package/lib/localReference.js.map +1 -0
- package/lib/{merge-tree-alpha.d.mts → merge-tree-alpha.d.ts} +28 -450
- package/lib/merge-tree-beta.d.ts +230 -0
- package/lib/merge-tree-public.d.ts +230 -0
- package/lib/{merge-tree-untrimmed.d.mts → merge-tree-untrimmed.d.ts} +28 -787
- package/lib/{mergeTree.d.mts → mergeTree.d.ts} +12 -20
- package/lib/mergeTree.d.ts.map +1 -0
- package/lib/{mergeTree.mjs → mergeTree.js} +47 -32
- package/lib/mergeTree.js.map +1 -0
- package/lib/{mergeTreeDeltaCallback.d.mts → mergeTreeDeltaCallback.d.ts} +8 -8
- package/lib/mergeTreeDeltaCallback.d.ts.map +1 -0
- package/lib/{mergeTreeDeltaCallback.mjs → mergeTreeDeltaCallback.js} +1 -1
- package/lib/mergeTreeDeltaCallback.js.map +1 -0
- package/lib/{mergeTreeNodeWalk.d.mts → mergeTreeNodeWalk.d.ts} +2 -2
- package/lib/mergeTreeNodeWalk.d.ts.map +1 -0
- package/lib/{mergeTreeNodeWalk.mjs → mergeTreeNodeWalk.js} +1 -1
- package/lib/mergeTreeNodeWalk.js.map +1 -0
- package/lib/{mergeTreeNodes.d.mts → mergeTreeNodes.d.ts} +18 -15
- package/lib/mergeTreeNodes.d.ts.map +1 -0
- package/lib/{mergeTreeNodes.mjs → mergeTreeNodes.js} +12 -10
- package/lib/mergeTreeNodes.js.map +1 -0
- package/lib/{mergeTreeTracking.d.mts → mergeTreeTracking.d.ts} +3 -3
- package/lib/mergeTreeTracking.d.ts.map +1 -0
- package/lib/{mergeTreeTracking.mjs → mergeTreeTracking.js} +3 -2
- package/lib/mergeTreeTracking.js.map +1 -0
- package/lib/{opBuilder.d.mts → opBuilder.d.ts} +4 -4
- package/lib/{opBuilder.d.mts.map → opBuilder.d.ts.map} +1 -1
- package/lib/{opBuilder.mjs → opBuilder.js} +2 -2
- package/lib/opBuilder.js.map +1 -0
- package/lib/{ops.d.mts → ops.d.ts} +1 -1
- package/lib/ops.d.ts.map +1 -0
- package/lib/{ops.mjs → ops.js} +1 -1
- package/lib/ops.js.map +1 -0
- package/lib/{ordinal.d.mts → ordinal.d.ts} +1 -1
- package/lib/ordinal.d.ts.map +1 -0
- package/lib/{ordinal.mjs → ordinal.js} +2 -1
- package/lib/ordinal.js.map +1 -0
- package/lib/{partialLengths.d.mts → partialLengths.d.ts} +6 -6
- package/lib/partialLengths.d.ts.map +1 -0
- package/lib/{partialLengths.mjs → partialLengths.js} +11 -10
- package/lib/partialLengths.js.map +1 -0
- package/lib/{properties.d.mts → properties.d.ts} +1 -1
- package/lib/properties.d.ts.map +1 -0
- package/lib/{properties.mjs → properties.js} +1 -1
- package/lib/properties.js.map +1 -0
- package/lib/{referencePositions.d.mts → referencePositions.d.ts} +5 -5
- package/lib/referencePositions.d.ts.map +1 -0
- package/lib/{referencePositions.mjs → referencePositions.js} +2 -2
- package/lib/referencePositions.js.map +1 -0
- package/lib/{revertibles.d.mts → revertibles.d.ts} +8 -8
- package/lib/revertibles.d.ts.map +1 -0
- package/lib/{revertibles.mjs → revertibles.js} +13 -13
- package/lib/revertibles.js.map +1 -0
- package/lib/{segmentGroupCollection.d.mts → segmentGroupCollection.d.ts} +2 -2
- package/lib/segmentGroupCollection.d.ts.map +1 -0
- package/lib/{segmentGroupCollection.mjs → segmentGroupCollection.js} +2 -2
- package/lib/segmentGroupCollection.js.map +1 -0
- package/lib/{segmentPropertiesManager.d.mts → segmentPropertiesManager.d.ts} +3 -3
- package/lib/segmentPropertiesManager.d.ts.map +1 -0
- package/lib/{segmentPropertiesManager.mjs → segmentPropertiesManager.js} +5 -3
- package/lib/segmentPropertiesManager.js.map +1 -0
- package/lib/{snapshotChunks.d.mts → snapshotChunks.d.ts} +4 -4
- package/lib/snapshotChunks.d.ts.map +1 -0
- package/lib/{snapshotChunks.mjs → snapshotChunks.js} +2 -2
- package/lib/snapshotChunks.js.map +1 -0
- package/lib/{snapshotLoader.d.mts → snapshotLoader.d.ts} +4 -4
- package/lib/snapshotLoader.d.ts.map +1 -0
- package/lib/{snapshotLoader.mjs → snapshotLoader.js} +10 -9
- package/lib/snapshotLoader.js.map +1 -0
- package/lib/{snapshotV1.d.mts → snapshotV1.d.ts} +4 -4
- package/lib/snapshotV1.d.ts.map +1 -0
- package/lib/{snapshotV1.mjs → snapshotV1.js} +24 -7
- package/lib/snapshotV1.js.map +1 -0
- package/lib/{snapshotlegacy.d.mts → snapshotlegacy.d.ts} +3 -3
- package/lib/snapshotlegacy.d.ts.map +1 -0
- package/lib/{snapshotlegacy.mjs → snapshotlegacy.js} +17 -4
- package/lib/snapshotlegacy.js.map +1 -0
- package/lib/{sortedSegmentSet.d.mts → sortedSegmentSet.d.ts} +4 -4
- package/lib/sortedSegmentSet.d.ts.map +1 -0
- package/lib/{sortedSegmentSet.mjs → sortedSegmentSet.js} +3 -2
- package/lib/sortedSegmentSet.js.map +1 -0
- package/lib/{sortedSet.d.mts → sortedSet.d.ts} +1 -1
- package/lib/sortedSet.d.ts.map +1 -0
- package/lib/{sortedSet.mjs → sortedSet.js} +1 -1
- package/lib/sortedSet.js.map +1 -0
- package/lib/test/Insertion.perf.spec.d.ts +6 -0
- package/lib/test/Insertion.perf.spec.d.ts.map +1 -0
- package/lib/test/Insertion.perf.spec.js +111 -0
- package/lib/test/Insertion.perf.spec.js.map +1 -0
- package/lib/test/PartialLengths.perf.spec.d.ts +6 -0
- package/lib/test/PartialLengths.perf.spec.d.ts.map +1 -0
- package/lib/test/PartialLengths.perf.spec.js +65 -0
- package/lib/test/PartialLengths.perf.spec.js.map +1 -0
- package/lib/test/Removal.perf.spec.d.ts +6 -0
- package/lib/test/Removal.perf.spec.d.ts.map +1 -0
- package/lib/test/Removal.perf.spec.js +164 -0
- package/lib/test/Removal.perf.spec.js.map +1 -0
- package/lib/test/Snapshot.perf.spec.d.ts +6 -0
- package/lib/test/Snapshot.perf.spec.d.ts.map +1 -0
- package/lib/test/Snapshot.perf.spec.js +31 -0
- package/lib/test/Snapshot.perf.spec.js.map +1 -0
- package/lib/test/attributionCollection.perf.spec.d.ts +6 -0
- package/lib/test/attributionCollection.perf.spec.d.ts.map +1 -0
- package/lib/test/attributionCollection.perf.spec.js +229 -0
- package/lib/test/attributionCollection.perf.spec.js.map +1 -0
- package/lib/test/attributionCollection.spec.d.ts +6 -0
- package/lib/test/attributionCollection.spec.d.ts.map +1 -0
- package/lib/test/attributionCollection.spec.js +484 -0
- package/lib/test/attributionCollection.spec.js.map +1 -0
- package/lib/test/attributionPolicy.spec.d.ts +6 -0
- package/lib/test/attributionPolicy.spec.d.ts.map +1 -0
- package/lib/test/attributionPolicy.spec.js +187 -0
- package/lib/test/attributionPolicy.spec.js.map +1 -0
- package/lib/test/beastTest.spec.d.ts +54 -0
- package/lib/test/beastTest.spec.d.ts.map +1 -0
- package/lib/test/beastTest.spec.js +1318 -0
- package/lib/test/beastTest.spec.js.map +1 -0
- package/lib/test/client.annotateMarker.spec.d.ts +6 -0
- package/lib/test/client.annotateMarker.spec.d.ts.map +1 -0
- package/lib/test/client.annotateMarker.spec.js +43 -0
- package/lib/test/client.annotateMarker.spec.js.map +1 -0
- package/lib/test/client.apis.spec.d.ts +7 -0
- package/lib/test/client.apis.spec.d.ts.map +1 -0
- package/lib/test/client.apis.spec.js +67 -0
- package/lib/test/client.apis.spec.js.map +1 -0
- package/lib/test/client.applyMsg.spec.d.ts +6 -0
- package/lib/test/client.applyMsg.spec.d.ts.map +1 -0
- package/lib/test/client.applyMsg.spec.js +561 -0
- package/lib/test/client.applyMsg.spec.js.map +1 -0
- package/lib/test/client.applyStashedOpFarm.spec.d.ts +12 -0
- package/lib/test/client.applyStashedOpFarm.spec.d.ts.map +1 -0
- package/lib/test/client.applyStashedOpFarm.spec.js +153 -0
- package/lib/test/client.applyStashedOpFarm.spec.js.map +1 -0
- package/lib/test/client.attributionFarm.spec.d.ts +7 -0
- package/lib/test/client.attributionFarm.spec.d.ts.map +1 -0
- package/lib/test/client.attributionFarm.spec.js +92 -0
- package/lib/test/client.attributionFarm.spec.js.map +1 -0
- package/lib/test/client.conflictFarm.spec.d.ts +15 -0
- package/lib/test/client.conflictFarm.spec.d.ts.map +1 -0
- package/lib/test/client.conflictFarm.spec.js +85 -0
- package/lib/test/client.conflictFarm.spec.js.map +1 -0
- package/lib/test/client.getPosition.spec.d.ts +6 -0
- package/lib/test/client.getPosition.spec.d.ts.map +1 -0
- package/lib/test/client.getPosition.spec.js +52 -0
- package/lib/test/client.getPosition.spec.js.map +1 -0
- package/lib/test/client.localReference.spec.d.ts +6 -0
- package/lib/test/client.localReference.spec.d.ts.map +1 -0
- package/lib/test/client.localReference.spec.js +468 -0
- package/lib/test/client.localReference.spec.js.map +1 -0
- package/lib/test/client.localReferenceFarm.spec.d.ts +6 -0
- package/lib/test/client.localReferenceFarm.spec.d.ts.map +1 -0
- package/lib/test/client.localReferenceFarm.spec.js +86 -0
- package/lib/test/client.localReferenceFarm.spec.js.map +1 -0
- package/lib/test/client.rebasePosition.spec.d.ts +6 -0
- package/lib/test/client.rebasePosition.spec.d.ts.map +1 -0
- package/lib/test/client.rebasePosition.spec.js +100 -0
- package/lib/test/client.rebasePosition.spec.js.map +1 -0
- package/lib/test/client.reconnectFarm.spec.d.ts +12 -0
- package/lib/test/client.reconnectFarm.spec.d.ts.map +1 -0
- package/lib/test/client.reconnectFarm.spec.js +88 -0
- package/lib/test/client.reconnectFarm.spec.js.map +1 -0
- package/lib/test/client.replay.spec.d.ts +6 -0
- package/lib/test/client.replay.spec.d.ts.map +1 -0
- package/lib/test/client.replay.spec.js +57 -0
- package/lib/test/client.replay.spec.js.map +1 -0
- package/lib/test/client.rollback.spec.d.ts +6 -0
- package/lib/test/client.rollback.spec.d.ts.map +1 -0
- package/lib/test/client.rollback.spec.js +451 -0
- package/lib/test/client.rollback.spec.js.map +1 -0
- package/lib/test/client.rollbackFarm.spec.d.ts +6 -0
- package/lib/test/client.rollbackFarm.spec.d.ts.map +1 -0
- package/lib/test/client.rollbackFarm.spec.js +46 -0
- package/lib/test/client.rollbackFarm.spec.js.map +1 -0
- package/lib/test/client.searchForMarker.spec.d.ts +6 -0
- package/lib/test/client.searchForMarker.spec.d.ts.map +1 -0
- package/lib/test/client.searchForMarker.spec.js +495 -0
- package/lib/test/client.searchForMarker.spec.js.map +1 -0
- package/lib/test/client.walkSegments.spec.d.ts +6 -0
- package/lib/test/client.walkSegments.spec.d.ts.map +1 -0
- package/lib/test/client.walkSegments.spec.js +52 -0
- package/lib/test/client.walkSegments.spec.js.map +1 -0
- package/lib/test/collections.list.spec.d.ts +6 -0
- package/lib/test/collections.list.spec.d.ts.map +1 -0
- package/lib/test/collections.list.spec.js +82 -0
- package/lib/test/collections.list.spec.js.map +1 -0
- package/lib/test/createInsertOnlyAttributionPolicy.spec.d.ts +6 -0
- package/lib/test/createInsertOnlyAttributionPolicy.spec.d.ts.map +1 -0
- package/lib/test/createInsertOnlyAttributionPolicy.spec.js +33 -0
- package/lib/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -0
- package/lib/test/dirname.cjs +16 -0
- package/lib/test/dirname.cjs.map +1 -0
- package/lib/test/dirname.d.cts +6 -0
- package/lib/test/dirname.d.cts.map +1 -0
- package/lib/test/index.d.ts +13 -0
- package/lib/test/index.d.ts.map +1 -0
- package/lib/test/index.js +13 -0
- package/lib/test/index.js.map +1 -0
- package/lib/test/mergeTree.annotate.deltaCallback.spec.d.ts +6 -0
- package/lib/test/mergeTree.annotate.deltaCallback.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js +140 -0
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -0
- package/lib/test/mergeTree.annotate.spec.d.ts +6 -0
- package/lib/test/mergeTree.annotate.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.annotate.spec.js +446 -0
- package/lib/test/mergeTree.annotate.spec.js.map +1 -0
- package/lib/test/mergeTree.insert.deltaCallback.spec.d.ts +6 -0
- package/lib/test/mergeTree.insert.deltaCallback.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.insert.deltaCallback.spec.js +124 -0
- package/lib/test/mergeTree.insert.deltaCallback.spec.js.map +1 -0
- package/lib/test/mergeTree.insertingWalk.spec.d.ts +6 -0
- package/lib/test/mergeTree.insertingWalk.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.insertingWalk.spec.js +277 -0
- package/lib/test/mergeTree.insertingWalk.spec.js.map +1 -0
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.d.ts +6 -0
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +176 -0
- package/lib/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -0
- package/lib/test/mergeTree.markRangeRemoved.spec.d.ts +6 -0
- package/lib/test/mergeTree.markRangeRemoved.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.markRangeRemoved.spec.js +128 -0
- package/lib/test/mergeTree.markRangeRemoved.spec.js.map +1 -0
- package/lib/test/mergeTree.walk.spec.d.ts +6 -0
- package/lib/test/mergeTree.walk.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.walk.spec.js +61 -0
- package/lib/test/mergeTree.walk.spec.js.map +1 -0
- package/lib/test/mergeTree.zamboni.spec.d.ts +6 -0
- package/lib/test/mergeTree.zamboni.spec.d.ts.map +1 -0
- package/lib/test/mergeTree.zamboni.spec.js +50 -0
- package/lib/test/mergeTree.zamboni.spec.js.map +1 -0
- package/lib/test/mergeTreeOperationRunner.d.ts +63 -0
- package/lib/test/mergeTreeOperationRunner.d.ts.map +1 -0
- package/lib/test/mergeTreeOperationRunner.js +207 -0
- package/lib/test/mergeTreeOperationRunner.js.map +1 -0
- package/lib/test/mergeTreeOperationRunner.spec.d.ts +6 -0
- package/lib/test/mergeTreeOperationRunner.spec.d.ts.map +1 -0
- package/lib/test/mergeTreeOperationRunner.spec.js +154 -0
- package/lib/test/mergeTreeOperationRunner.spec.js.map +1 -0
- package/lib/test/obliterate.concurrent.spec.d.ts +6 -0
- package/lib/test/obliterate.concurrent.spec.d.ts.map +1 -0
- package/lib/test/obliterate.concurrent.spec.js +1441 -0
- package/lib/test/obliterate.concurrent.spec.js.map +1 -0
- package/lib/test/obliterate.deltaCallback.spec.d.ts +6 -0
- package/lib/test/obliterate.deltaCallback.spec.d.ts.map +1 -0
- package/lib/test/obliterate.deltaCallback.spec.js +144 -0
- package/lib/test/obliterate.deltaCallback.spec.js.map +1 -0
- package/lib/test/obliterate.partialLength.spec.d.ts +6 -0
- package/lib/test/obliterate.partialLength.spec.d.ts.map +1 -0
- package/lib/test/obliterate.partialLength.spec.js +272 -0
- package/lib/test/obliterate.partialLength.spec.js.map +1 -0
- package/lib/test/obliterate.reconnect.spec.d.ts +6 -0
- package/lib/test/obliterate.reconnect.spec.d.ts.map +1 -0
- package/lib/test/obliterate.reconnect.spec.js +159 -0
- package/lib/test/obliterate.reconnect.spec.js.map +1 -0
- package/lib/test/obliterate.spec.d.ts +6 -0
- package/lib/test/obliterate.spec.d.ts.map +1 -0
- package/lib/test/obliterate.spec.js +160 -0
- package/lib/test/obliterate.spec.js.map +1 -0
- package/lib/test/ordinal.spec.d.ts +2 -0
- package/lib/test/ordinal.spec.d.ts.map +1 -0
- package/lib/test/ordinal.spec.js +38 -0
- package/lib/test/ordinal.spec.js.map +1 -0
- package/lib/test/partialLength.spec.d.ts +6 -0
- package/lib/test/partialLength.spec.d.ts.map +1 -0
- package/lib/test/partialLength.spec.js +274 -0
- package/lib/test/partialLength.spec.js.map +1 -0
- package/lib/test/properties.spec.d.ts +6 -0
- package/lib/test/properties.spec.d.ts.map +1 -0
- package/lib/test/properties.spec.js +53 -0
- package/lib/test/properties.spec.js.map +1 -0
- package/lib/test/reconnectHelper.d.ts +48 -0
- package/lib/test/reconnectHelper.d.ts.map +1 -0
- package/lib/test/reconnectHelper.js +82 -0
- package/lib/test/reconnectHelper.js.map +1 -0
- package/lib/test/resetPendingSegmentsToOp.spec.d.ts +6 -0
- package/lib/test/resetPendingSegmentsToOp.spec.d.ts.map +1 -0
- package/lib/test/resetPendingSegmentsToOp.spec.js +235 -0
- package/lib/test/resetPendingSegmentsToOp.spec.js.map +1 -0
- package/lib/test/revertibleFarm.spec.d.ts +6 -0
- package/lib/test/revertibleFarm.spec.d.ts.map +1 -0
- package/lib/test/revertibleFarm.spec.js +119 -0
- package/lib/test/revertibleFarm.spec.js.map +1 -0
- package/lib/test/revertibles.spec.d.ts +17 -0
- package/lib/test/revertibles.spec.d.ts.map +1 -0
- package/lib/test/revertibles.spec.js +381 -0
- package/lib/test/revertibles.spec.js.map +1 -0
- package/lib/test/segmentGroupCollection.spec.d.ts +6 -0
- package/lib/test/segmentGroupCollection.spec.d.ts.map +1 -0
- package/lib/test/segmentGroupCollection.spec.js +58 -0
- package/lib/test/segmentGroupCollection.spec.js.map +1 -0
- package/lib/test/snapshot.spec.d.ts +6 -0
- package/lib/test/snapshot.spec.d.ts.map +1 -0
- package/lib/test/snapshot.spec.js +176 -0
- package/lib/test/snapshot.spec.js.map +1 -0
- package/lib/test/snapshot.utils.d.ts +33 -0
- package/lib/test/snapshot.utils.d.ts.map +1 -0
- package/lib/test/snapshot.utils.js +104 -0
- package/lib/test/snapshot.utils.js.map +1 -0
- package/lib/test/snapshotlegacy.spec.d.ts +6 -0
- package/lib/test/snapshotlegacy.spec.d.ts.map +1 -0
- package/lib/test/snapshotlegacy.spec.js +137 -0
- package/lib/test/snapshotlegacy.spec.js.map +1 -0
- package/lib/test/sortedSegmentSet.spec.d.ts +6 -0
- package/lib/test/sortedSegmentSet.spec.d.ts.map +1 -0
- package/lib/test/sortedSegmentSet.spec.js +93 -0
- package/lib/test/sortedSegmentSet.spec.js.map +1 -0
- package/lib/test/testClient.d.ts +116 -0
- package/lib/test/testClient.d.ts.map +1 -0
- package/lib/test/testClient.js +430 -0
- package/lib/test/testClient.js.map +1 -0
- package/lib/test/testClientLogger.d.ts +44 -0
- package/lib/test/testClientLogger.d.ts.map +1 -0
- package/lib/test/testClientLogger.js +282 -0
- package/lib/test/testClientLogger.js.map +1 -0
- package/lib/test/testSerializer.d.ts +18 -0
- package/lib/test/testSerializer.d.ts.map +1 -0
- package/lib/test/testSerializer.js +29 -0
- package/lib/test/testSerializer.js.map +1 -0
- package/lib/test/testServer.d.ts +36 -0
- package/lib/test/testServer.d.ts.map +1 -0
- package/lib/test/testServer.js +133 -0
- package/lib/test/testServer.js.map +1 -0
- package/lib/test/testUtils.d.ts +77 -0
- package/lib/test/testUtils.d.ts.map +1 -0
- package/lib/test/testUtils.js +151 -0
- package/lib/test/testUtils.js.map +1 -0
- package/lib/test/text.d.ts +9 -0
- package/lib/test/text.d.ts.map +1 -0
- package/lib/test/text.js +71 -0
- package/lib/test/text.js.map +1 -0
- package/lib/test/tracking.spec.d.ts +6 -0
- package/lib/test/tracking.spec.d.ts.map +1 -0
- package/lib/test/tracking.spec.js +118 -0
- package/lib/test/tracking.spec.js.map +1 -0
- package/lib/test/types/validateMergeTreePrevious.generated.d.ts +2 -0
- package/lib/test/types/validateMergeTreePrevious.generated.d.ts.map +1 -0
- package/lib/test/types/validateMergeTreePrevious.generated.js +228 -0
- package/lib/test/types/validateMergeTreePrevious.generated.js.map +1 -0
- package/lib/test/wordUnitTests.spec.d.ts +6 -0
- package/lib/test/wordUnitTests.spec.d.ts.map +1 -0
- package/lib/test/wordUnitTests.spec.js +166 -0
- package/lib/test/wordUnitTests.spec.js.map +1 -0
- package/lib/{textSegment.d.mts → textSegment.d.ts} +4 -4
- package/lib/textSegment.d.ts.map +1 -0
- package/lib/{textSegment.mjs → textSegment.js} +2 -2
- package/lib/textSegment.js.map +1 -0
- package/lib/{zamboni.d.mts → zamboni.d.ts} +3 -3
- package/lib/zamboni.d.ts.map +1 -0
- package/lib/{zamboni.mjs → zamboni.js} +7 -6
- package/lib/zamboni.js.map +1 -0
- package/package.json +50 -57
- package/src/MergeTreeTextHelper.ts +4 -4
- package/src/attributionCollection.ts +1 -1
- package/src/attributionPolicy.ts +5 -5
- package/src/client.ts +50 -41
- package/src/collections/index.ts +2 -2
- package/src/endOfTreeSegment.ts +5 -5
- package/src/index.ts +20 -20
- package/src/localReference.ts +13 -7
- package/src/mergeTree.ts +53 -44
- package/src/mergeTreeDeltaCallback.ts +3 -8
- package/src/mergeTreeNodeWalk.ts +1 -1
- package/src/mergeTreeNodes.ts +21 -19
- package/src/mergeTreeTracking.ts +3 -3
- package/src/opBuilder.ts +3 -3
- package/src/partialLengths.ts +10 -10
- package/src/referencePositions.ts +4 -4
- package/src/revertibles.ts +14 -18
- package/src/segmentGroupCollection.ts +2 -2
- package/src/segmentPropertiesManager.ts +3 -3
- package/src/snapshotChunks.ts +4 -4
- package/src/snapshotLoader.ts +14 -11
- package/src/snapshotV1.ts +29 -9
- package/src/snapshotlegacy.ts +19 -5
- package/src/sortedSegmentSet.ts +3 -3
- package/src/textSegment.ts +3 -3
- package/src/zamboni.ts +7 -7
- package/tsconfig.cjs.json +7 -0
- package/tsconfig.json +2 -5
- package/api-extractor-esm.json +0 -17
- package/dist/test/beastTest.d.ts.map +0 -1
- package/dist/test/beastTest.js.map +0 -1
- package/dist/test/client.apis.d.ts.map +0 -1
- package/dist/test/client.apis.js.map +0 -1
- package/dist/test/wordUnitTests.d.ts.map +0 -1
- package/dist/test/wordUnitTests.js.map +0 -1
- package/lib/MergeTreeTextHelper.d.mts.map +0 -1
- package/lib/MergeTreeTextHelper.mjs.map +0 -1
- package/lib/attributionCollection.d.mts.map +0 -1
- package/lib/attributionCollection.mjs.map +0 -1
- package/lib/attributionPolicy.d.mts.map +0 -1
- package/lib/attributionPolicy.mjs.map +0 -1
- package/lib/client.d.mts.map +0 -1
- package/lib/client.mjs.map +0 -1
- package/lib/collections/index.d.mts.map +0 -1
- package/lib/collections/index.mjs +0 -7
- package/lib/collections/index.mjs.map +0 -1
- package/lib/collections/list.d.mts.map +0 -1
- package/lib/collections/list.mjs.map +0 -1
- package/lib/collections/rbTree.d.mts.map +0 -1
- package/lib/collections/rbTree.mjs.map +0 -1
- package/lib/constants.d.mts.map +0 -1
- package/lib/constants.mjs.map +0 -1
- package/lib/endOfTreeSegment.d.mts.map +0 -1
- package/lib/endOfTreeSegment.mjs.map +0 -1
- package/lib/index.d.mts.map +0 -1
- package/lib/index.mjs.map +0 -1
- package/lib/localReference.d.mts.map +0 -1
- package/lib/localReference.mjs.map +0 -1
- package/lib/merge-tree-beta.d.mts +0 -668
- package/lib/merge-tree-public.d.mts +0 -668
- package/lib/mergeTree.d.mts.map +0 -1
- package/lib/mergeTree.mjs.map +0 -1
- package/lib/mergeTreeDeltaCallback.d.mts.map +0 -1
- package/lib/mergeTreeDeltaCallback.mjs.map +0 -1
- package/lib/mergeTreeNodeWalk.d.mts.map +0 -1
- package/lib/mergeTreeNodeWalk.mjs.map +0 -1
- package/lib/mergeTreeNodes.d.mts.map +0 -1
- package/lib/mergeTreeNodes.mjs.map +0 -1
- package/lib/mergeTreeTracking.d.mts.map +0 -1
- package/lib/mergeTreeTracking.mjs.map +0 -1
- package/lib/opBuilder.mjs.map +0 -1
- package/lib/ops.d.mts.map +0 -1
- package/lib/ops.mjs.map +0 -1
- package/lib/ordinal.d.mts.map +0 -1
- package/lib/ordinal.mjs.map +0 -1
- package/lib/partialLengths.d.mts.map +0 -1
- package/lib/partialLengths.mjs.map +0 -1
- package/lib/properties.d.mts.map +0 -1
- package/lib/properties.mjs.map +0 -1
- package/lib/referencePositions.d.mts.map +0 -1
- package/lib/referencePositions.mjs.map +0 -1
- package/lib/revertibles.d.mts.map +0 -1
- package/lib/revertibles.mjs.map +0 -1
- package/lib/segmentGroupCollection.d.mts.map +0 -1
- package/lib/segmentGroupCollection.mjs.map +0 -1
- package/lib/segmentPropertiesManager.d.mts.map +0 -1
- package/lib/segmentPropertiesManager.mjs.map +0 -1
- package/lib/snapshotChunks.d.mts.map +0 -1
- package/lib/snapshotChunks.mjs.map +0 -1
- package/lib/snapshotLoader.d.mts.map +0 -1
- package/lib/snapshotLoader.mjs.map +0 -1
- package/lib/snapshotV1.d.mts.map +0 -1
- package/lib/snapshotV1.mjs.map +0 -1
- package/lib/snapshotlegacy.d.mts.map +0 -1
- package/lib/snapshotlegacy.mjs.map +0 -1
- package/lib/sortedSegmentSet.d.mts.map +0 -1
- package/lib/sortedSegmentSet.mjs.map +0 -1
- package/lib/sortedSet.d.mts.map +0 -1
- package/lib/sortedSet.mjs.map +0 -1
- package/lib/textSegment.d.mts.map +0 -1
- package/lib/textSegment.mjs.map +0 -1
- package/lib/zamboni.d.mts.map +0 -1
- package/lib/zamboni.mjs.map +0 -1
|
@@ -6,9 +6,10 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.defaultOptions = void 0;
|
|
8
8
|
const stochastic_test_utils_1 = require("@fluid-private/stochastic-test-utils");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
9
|
+
const ops_js_1 = require("../ops.js");
|
|
10
|
+
const mergeTreeOperationRunner_js_1 = require("./mergeTreeOperationRunner.js");
|
|
11
|
+
const testClient_js_1 = require("./testClient.js");
|
|
12
|
+
const testClientLogger_js_1 = require("./testClientLogger.js");
|
|
12
13
|
function applyMessagesWithReconnect(startingSeq, messageDatas, clients, stashClients) {
|
|
13
14
|
let seq = startingSeq;
|
|
14
15
|
const reconnectClientMsgs = [];
|
|
@@ -20,18 +21,24 @@ function applyMessagesWithReconnect(startingSeq, messageDatas, clients, stashCli
|
|
|
20
21
|
const index = clients
|
|
21
22
|
.map((c) => c.longClientId)
|
|
22
23
|
.indexOf(messageData[0].clientId);
|
|
23
|
-
const
|
|
24
|
-
|
|
24
|
+
const op = messageData[0].contents;
|
|
25
|
+
stashClients[index].applyStashedOp(op);
|
|
26
|
+
stashedOps.push([
|
|
27
|
+
op,
|
|
28
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
29
|
+
stashClients[index].peekPendingSegmentGroups(op.type === ops_js_1.MergeTreeDeltaType.GROUP ? op.ops.length : 1),
|
|
30
|
+
index,
|
|
31
|
+
]);
|
|
25
32
|
}
|
|
26
33
|
}
|
|
27
34
|
// this should put all stash clients (except #1) in the same state as the
|
|
28
35
|
// respective normal clients, having local changes only.
|
|
29
36
|
for (let i = 0; i < clients.length; ++i) {
|
|
30
37
|
if (i !== 1) {
|
|
31
|
-
|
|
38
|
+
testClientLogger_js_1.TestClientLogger.validate([clients[i], stashClients[i]]);
|
|
32
39
|
}
|
|
33
40
|
}
|
|
34
|
-
|
|
41
|
+
testClientLogger_js_1.TestClientLogger.validate([clients[0], stashClients[1]]);
|
|
35
42
|
// apply the ops to the normal clients. they will all be the same now,
|
|
36
43
|
// except #1 which has local changes other clients haven't seen yet
|
|
37
44
|
for (const [message, sg] of messageDatas) {
|
|
@@ -54,7 +61,7 @@ function applyMessagesWithReconnect(startingSeq, messageDatas, clients, stashCli
|
|
|
54
61
|
}
|
|
55
62
|
// all stash and normal clients should now be in the same state,
|
|
56
63
|
// except #1 (normal) which still has local changes
|
|
57
|
-
|
|
64
|
+
testClientLogger_js_1.TestClientLogger.validate([...clients.filter((_, i) => i !== 1), ...stashClients]);
|
|
58
65
|
// regenerate ops for client #1
|
|
59
66
|
const reconnectMsgs = [];
|
|
60
67
|
reconnectClientMsgs.forEach((opData) => {
|
|
@@ -64,11 +71,16 @@ function applyMessagesWithReconnect(startingSeq, messageDatas, clients, stashCli
|
|
|
64
71
|
});
|
|
65
72
|
// apply regenerated ops as stashed ops for client #1
|
|
66
73
|
const stashedRegeneratedOps = reconnectMsgs.map((message) => {
|
|
67
|
-
const
|
|
68
|
-
|
|
74
|
+
const op = message.contents;
|
|
75
|
+
stashClients[1].applyStashedOp(op);
|
|
76
|
+
return [
|
|
77
|
+
op,
|
|
78
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
79
|
+
stashClients[1].peekPendingSegmentGroups(op.type === ops_js_1.MergeTreeDeltaType.GROUP ? op.ops.length : 1),
|
|
80
|
+
];
|
|
69
81
|
});
|
|
70
82
|
// now both clients at index 1 should be the same
|
|
71
|
-
|
|
83
|
+
testClientLogger_js_1.TestClientLogger.validate([clients[1], stashClients[1]]);
|
|
72
84
|
// apply the regenerated ops from client #1
|
|
73
85
|
for (const message of reconnectMsgs) {
|
|
74
86
|
message.sequenceNumber = ++seq;
|
|
@@ -81,7 +93,7 @@ function applyMessagesWithReconnect(startingSeq, messageDatas, clients, stashCli
|
|
|
81
93
|
stashClients.forEach((c) => c.applyMsg(reRegeneratedStashedOp));
|
|
82
94
|
}
|
|
83
95
|
// all clients should now be the same
|
|
84
|
-
|
|
96
|
+
testClientLogger_js_1.TestClientLogger.validate([...clients, ...stashClients]);
|
|
85
97
|
return seq;
|
|
86
98
|
}
|
|
87
99
|
exports.defaultOptions = {
|
|
@@ -89,13 +101,13 @@ exports.defaultOptions = {
|
|
|
89
101
|
clients: { min: 3, max: 12 },
|
|
90
102
|
opsPerRoundRange: { min: 40, max: 120 },
|
|
91
103
|
rounds: 3,
|
|
92
|
-
operations: [
|
|
104
|
+
operations: [mergeTreeOperationRunner_js_1.annotateRange, mergeTreeOperationRunner_js_1.removeRange, mergeTreeOperationRunner_js_1.insert],
|
|
93
105
|
growthFunc: (input) => input * 2,
|
|
94
106
|
};
|
|
95
107
|
// Generate a list of single character client names, support up to 69 clients
|
|
96
|
-
const clientNames = (0,
|
|
108
|
+
const clientNames = (0, mergeTreeOperationRunner_js_1.generateClientNames)();
|
|
97
109
|
function runApplyStashedOpFarmTests(opts, extraSeed) {
|
|
98
|
-
(0,
|
|
110
|
+
(0, mergeTreeOperationRunner_js_1.doOverRange)(opts.clients, opts.growthFunc.bind(opts), (clientCount) => {
|
|
99
111
|
it(`applyStashedOpFarm_${clientCount}`, async () => {
|
|
100
112
|
const random = (0, stochastic_test_utils_1.makeRandom)(0xdeadbeef, 0xfeedbed, clientCount, extraSeed ?? 0);
|
|
101
113
|
const testOpts = { ...opts };
|
|
@@ -103,14 +115,14 @@ function runApplyStashedOpFarmTests(opts, extraSeed) {
|
|
|
103
115
|
testOpts.resultsFilePostfix ?? (testOpts.resultsFilePostfix = "");
|
|
104
116
|
testOpts.resultsFilePostfix += extraSeed;
|
|
105
117
|
}
|
|
106
|
-
const clients = [new
|
|
118
|
+
const clients = [new testClient_js_1.TestClient()];
|
|
107
119
|
// This test is based on reconnectFarm, but we keep a second set of clients. For
|
|
108
120
|
// these clients, we apply the generated ops as stashed ops, then regenerate
|
|
109
121
|
// them to simulate resubmit(), then apply them. In the end, they should arrive
|
|
110
122
|
// at the same state as the "normal" set of clients
|
|
111
123
|
let stashClients = [];
|
|
112
124
|
clients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));
|
|
113
|
-
stashClients = [new
|
|
125
|
+
stashClients = [new testClient_js_1.TestClient()];
|
|
114
126
|
stashClients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));
|
|
115
127
|
let seq = 0;
|
|
116
128
|
clients.forEach((c) => c.updateMinSeq(seq));
|
|
@@ -118,20 +130,20 @@ function runApplyStashedOpFarmTests(opts, extraSeed) {
|
|
|
118
130
|
// Add double the number of clients each iteration
|
|
119
131
|
const targetClients = Math.max(opts.clients.min, clientCount);
|
|
120
132
|
for (let cc = clients.length; cc < targetClients; cc++) {
|
|
121
|
-
const newClient = await
|
|
133
|
+
const newClient = await testClient_js_1.TestClient.createFromClientSnapshot(clients[0], clientNames[cc]);
|
|
122
134
|
clients.push(newClient);
|
|
123
135
|
// add 1 stash client per normal client
|
|
124
|
-
const anotherNewClient = await
|
|
136
|
+
const anotherNewClient = await testClient_js_1.TestClient.createFromClientSnapshot(clients[0], clientNames[cc]);
|
|
125
137
|
stashClients.push(anotherNewClient);
|
|
126
138
|
}
|
|
127
|
-
seq = (0,
|
|
139
|
+
seq = (0, mergeTreeOperationRunner_js_1.runMergeTreeOperationRunner)(random, seq, clients, opts.minLength, opts, (s, m, c) => applyMessagesWithReconnect(s, m, c, stashClients));
|
|
128
140
|
}).timeout(30 * 1000);
|
|
129
141
|
});
|
|
130
142
|
}
|
|
131
143
|
(0, stochastic_test_utils_1.describeFuzz)("MergeTree.Client", ({ testCount }) => {
|
|
132
144
|
const opts = exports.defaultOptions;
|
|
133
145
|
if (testCount > 1) {
|
|
134
|
-
(0,
|
|
146
|
+
(0, mergeTreeOperationRunner_js_1.doOverRange)({ min: 0, max: testCount - 1 }, (x) => x + 1, (seed) => {
|
|
135
147
|
describe(`with seed ${seed}`, () => {
|
|
136
148
|
runApplyStashedOpFarmTests(opts, seed);
|
|
137
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.applyStashedOpFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.applyStashedOpFarm.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 { describeFuzz, makeRandom } from \"@fluid-private/stochastic-test-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { IMergeTreeOp } from \"../ops\";\nimport { SegmentGroup } from \"../mergeTreeNodes\";\nimport {\n\tgenerateClientNames,\n\tdoOverRange,\n\trunMergeTreeOperationRunner,\n\tannotateRange,\n\tremoveRange,\n\tIMergeTreeOperationRunnerConfig,\n\tIConfigRange,\n\tinsert,\n} from \"./mergeTreeOperationRunner\";\nimport { TestClient } from \"./testClient\";\nimport { TestClientLogger } from \"./testClientLogger\";\n\nfunction applyMessagesWithReconnect(\n\tstartingSeq: number,\n\tmessageDatas: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tstashClients: readonly TestClient[],\n) {\n\tlet seq = startingSeq;\n\tconst reconnectClientMsgs: [IMergeTreeOp, SegmentGroup | SegmentGroup[]][] = [];\n\tlet minSeq = 0;\n\n\t// apply ops as stashed ops except for client #1\n\tconst stashedOps: [IMergeTreeOp, SegmentGroup | SegmentGroup[], number][] = [];\n\tfor (const messageData of messageDatas) {\n\t\tif (messageData[0].clientId !== clients[1].longClientId) {\n\t\t\tconst index = clients\n\t\t\t\t.map((c) => c.longClientId)\n\t\t\t\t.indexOf(messageData[0].clientId as string);\n\t\t\tconst localMetadata = stashClients[index].applyStashedOp(\n\t\t\t\tmessageData[0].contents as IMergeTreeOp,\n\t\t\t);\n\t\t\tstashedOps.push([messageData[0].contents as IMergeTreeOp, localMetadata, index]);\n\t\t}\n\t}\n\t// this should put all stash clients (except #1) in the same state as the\n\t// respective normal clients, having local changes only.\n\tfor (let i = 0; i < clients.length; ++i) {\n\t\tif (i !== 1) {\n\t\t\tTestClientLogger.validate([clients[i], stashClients[i]]);\n\t\t}\n\t}\n\tTestClientLogger.validate([clients[0], stashClients[1]]);\n\n\t// apply the ops to the normal clients. they will all be the same now,\n\t// except #1 which has local changes other clients haven't seen yet\n\tfor (const [message, sg] of messageDatas) {\n\t\tif (message.clientId === clients[1].longClientId) {\n\t\t\treconnectClientMsgs.push([message.contents as IMergeTreeOp, sg]);\n\t\t} else {\n\t\t\tmessage.sequenceNumber = ++seq;\n\t\t\tclients.forEach((c) => c.applyMsg(message));\n\t\t\tminSeq = message.minimumSequenceNumber;\n\t\t}\n\t}\n\n\t// regenerate the ops that were applied as stashed ops. this simulates resubmit()\n\tconst regeneratedStashedOps = stashedOps.map((op) =>\n\t\tstashClients[op[2]].makeOpMessage(stashClients[op[2]].regeneratePendingOp(op[0], op[1])),\n\t);\n\n\t// apply the regenerated stashed ops\n\tlet stashedOpSeq = startingSeq;\n\tfor (const msg of regeneratedStashedOps) {\n\t\tmsg.sequenceNumber = ++stashedOpSeq;\n\t\tstashClients.forEach((c) => c.applyMsg(msg));\n\t}\n\t// all stash and normal clients should now be in the same state,\n\t// except #1 (normal) which still has local changes\n\tTestClientLogger.validate([...clients.filter((_, i) => i !== 1), ...stashClients]);\n\n\t// regenerate ops for client #1\n\tconst reconnectMsgs: ISequencedDocumentMessage[] = [];\n\treconnectClientMsgs.forEach((opData) => {\n\t\tconst newMsg = clients[1].makeOpMessage(\n\t\t\tclients[1].regeneratePendingOp(opData[0], opData[1]),\n\t\t);\n\t\tnewMsg.minimumSequenceNumber = minSeq;\n\t\treconnectMsgs.push(newMsg);\n\t});\n\n\t// apply regenerated ops as stashed ops for client #1\n\tconst stashedRegeneratedOps: [IMergeTreeOp, SegmentGroup | SegmentGroup[]][] =\n\t\treconnectMsgs.map((message) => {\n\t\t\tconst localMetadata = stashClients[1].applyStashedOp(message.contents as IMergeTreeOp);\n\t\t\treturn [message.contents as IMergeTreeOp, localMetadata];\n\t\t});\n\t// now both clients at index 1 should be the same\n\tTestClientLogger.validate([clients[1], stashClients[1]]);\n\n\t// apply the regenerated ops from client #1\n\tfor (const message of reconnectMsgs) {\n\t\tmessage.sequenceNumber = ++seq;\n\t\tclients.forEach((c) => c.applyMsg(message));\n\t}\n\n\t// resubmit regenerated stashed ops\n\tconst reRegeneratedStashedMessages = stashedRegeneratedOps.map((stashedOp) =>\n\t\tstashClients[1].makeOpMessage(\n\t\t\tstashClients[1].regeneratePendingOp(stashedOp[0], stashedOp[1]),\n\t\t),\n\t);\n\n\tfor (const reRegeneratedStashedOp of reRegeneratedStashedMessages) {\n\t\treRegeneratedStashedOp.sequenceNumber = ++stashedOpSeq;\n\t\tstashClients.forEach((c) => c.applyMsg(reRegeneratedStashedOp));\n\t}\n\n\t// all clients should now be the same\n\tTestClientLogger.validate([...clients, ...stashClients]);\n\n\treturn seq;\n}\n\ninterface IApplyStashedOpFarmConfig extends IMergeTreeOperationRunnerConfig {\n\tminLength: number;\n\tclients: IConfigRange;\n}\n\nexport const defaultOptions: IApplyStashedOpFarmConfig = {\n\tminLength: 16,\n\tclients: { min: 3, max: 12 },\n\topsPerRoundRange: { min: 40, max: 120 },\n\trounds: 3,\n\toperations: [annotateRange, removeRange, insert],\n\tgrowthFunc: (input: number) => input * 2,\n};\n\n// Generate a list of single character client names, support up to 69 clients\nconst clientNames = generateClientNames();\n\nfunction runApplyStashedOpFarmTests(opts: IApplyStashedOpFarmConfig, extraSeed?: number): void {\n\tdoOverRange(opts.clients, opts.growthFunc.bind(opts), (clientCount) => {\n\t\tit(`applyStashedOpFarm_${clientCount}`, async () => {\n\t\t\tconst random = makeRandom(0xdeadbeef, 0xfeedbed, clientCount, extraSeed ?? 0);\n\t\t\tconst testOpts = { ...opts };\n\t\t\tif (extraSeed) {\n\t\t\t\ttestOpts.resultsFilePostfix ??= \"\";\n\t\t\t\ttestOpts.resultsFilePostfix += extraSeed;\n\t\t\t}\n\n\t\t\tconst clients: TestClient[] = [new TestClient()];\n\t\t\t// This test is based on reconnectFarm, but we keep a second set of clients. For\n\t\t\t// these clients, we apply the generated ops as stashed ops, then regenerate\n\t\t\t// them to simulate resubmit(), then apply them. In the end, they should arrive\n\t\t\t// at the same state as the \"normal\" set of clients\n\t\t\tlet stashClients: TestClient[] = [];\n\n\t\t\tclients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\t\t\tstashClients = [new TestClient()];\n\t\t\tstashClients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\n\t\t\tlet seq = 0;\n\t\t\tclients.forEach((c) => c.updateMinSeq(seq));\n\t\t\tstashClients.forEach((c) => c.updateMinSeq(seq));\n\n\t\t\t// Add double the number of clients each iteration\n\t\t\tconst targetClients = Math.max(opts.clients.min, clientCount);\n\t\t\tfor (let cc = clients.length; cc < targetClients; cc++) {\n\t\t\t\tconst newClient = await TestClient.createFromClientSnapshot(\n\t\t\t\t\tclients[0],\n\t\t\t\t\tclientNames[cc],\n\t\t\t\t);\n\t\t\t\tclients.push(newClient);\n\t\t\t\t// add 1 stash client per normal client\n\t\t\t\tconst anotherNewClient = await TestClient.createFromClientSnapshot(\n\t\t\t\t\tclients[0],\n\t\t\t\t\tclientNames[cc],\n\t\t\t\t);\n\t\t\t\tstashClients.push(anotherNewClient);\n\t\t\t}\n\n\t\t\tseq = runMergeTreeOperationRunner(\n\t\t\t\trandom,\n\t\t\t\tseq,\n\t\t\t\tclients,\n\t\t\t\topts.minLength,\n\t\t\t\topts,\n\t\t\t\t(s, m, c) => applyMessagesWithReconnect(s, m, c, stashClients),\n\t\t\t);\n\t\t}).timeout(30 * 1000);\n\t});\n}\n\ndescribeFuzz(\"MergeTree.Client\", ({ testCount }) => {\n\tconst opts = defaultOptions;\n\n\tif (testCount > 1) {\n\t\tdoOverRange(\n\t\t\t{ min: 0, max: testCount - 1 },\n\t\t\t(x) => x + 1,\n\t\t\t(seed) => {\n\t\t\t\tdescribe(`with seed ${seed}`, () => {\n\t\t\t\t\trunApplyStashedOpFarmTests(opts, seed);\n\t\t\t\t});\n\t\t\t},\n\t\t);\n\t} else {\n\t\trunApplyStashedOpFarmTests(opts);\n\t}\n});\n"]}
|
|
1
|
+
{"version":3,"file":"client.applyStashedOpFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.applyStashedOpFarm.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 { describeFuzz, makeRandom } from \"@fluid-private/stochastic-test-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { IMergeTreeOp, MergeTreeDeltaType } from \"../ops.js\";\nimport { SegmentGroup } from \"../mergeTreeNodes.js\";\nimport {\n\tgenerateClientNames,\n\tdoOverRange,\n\trunMergeTreeOperationRunner,\n\tannotateRange,\n\tremoveRange,\n\tIMergeTreeOperationRunnerConfig,\n\tIConfigRange,\n\tinsert,\n} from \"./mergeTreeOperationRunner.js\";\nimport { TestClient } from \"./testClient.js\";\nimport { TestClientLogger } from \"./testClientLogger.js\";\n\nfunction applyMessagesWithReconnect(\n\tstartingSeq: number,\n\tmessageDatas: [ISequencedDocumentMessage, SegmentGroup | SegmentGroup[]][],\n\tclients: readonly TestClient[],\n\tstashClients: readonly TestClient[],\n) {\n\tlet seq = startingSeq;\n\tconst reconnectClientMsgs: [IMergeTreeOp, SegmentGroup | SegmentGroup[]][] = [];\n\tlet minSeq = 0;\n\n\t// apply ops as stashed ops except for client #1\n\tconst stashedOps: [IMergeTreeOp, SegmentGroup | SegmentGroup[], number][] = [];\n\tfor (const messageData of messageDatas) {\n\t\tif (messageData[0].clientId !== clients[1].longClientId) {\n\t\t\tconst index = clients\n\t\t\t\t.map((c) => c.longClientId)\n\t\t\t\t.indexOf(messageData[0].clientId as string);\n\t\t\tconst op = messageData[0].contents as IMergeTreeOp;\n\t\t\tstashClients[index].applyStashedOp(op);\n\t\t\tstashedOps.push([\n\t\t\t\top,\n\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\t\tstashClients[index].peekPendingSegmentGroups(\n\t\t\t\t\top.type === MergeTreeDeltaType.GROUP ? op.ops.length : 1,\n\t\t\t\t)!,\n\t\t\t\tindex,\n\t\t\t]);\n\t\t}\n\t}\n\t// this should put all stash clients (except #1) in the same state as the\n\t// respective normal clients, having local changes only.\n\tfor (let i = 0; i < clients.length; ++i) {\n\t\tif (i !== 1) {\n\t\t\tTestClientLogger.validate([clients[i], stashClients[i]]);\n\t\t}\n\t}\n\tTestClientLogger.validate([clients[0], stashClients[1]]);\n\n\t// apply the ops to the normal clients. they will all be the same now,\n\t// except #1 which has local changes other clients haven't seen yet\n\tfor (const [message, sg] of messageDatas) {\n\t\tif (message.clientId === clients[1].longClientId) {\n\t\t\treconnectClientMsgs.push([message.contents as IMergeTreeOp, sg]);\n\t\t} else {\n\t\t\tmessage.sequenceNumber = ++seq;\n\t\t\tclients.forEach((c) => c.applyMsg(message));\n\t\t\tminSeq = message.minimumSequenceNumber;\n\t\t}\n\t}\n\n\t// regenerate the ops that were applied as stashed ops. this simulates resubmit()\n\tconst regeneratedStashedOps = stashedOps.map((op) =>\n\t\tstashClients[op[2]].makeOpMessage(stashClients[op[2]].regeneratePendingOp(op[0], op[1])),\n\t);\n\n\t// apply the regenerated stashed ops\n\tlet stashedOpSeq = startingSeq;\n\tfor (const msg of regeneratedStashedOps) {\n\t\tmsg.sequenceNumber = ++stashedOpSeq;\n\t\tstashClients.forEach((c) => c.applyMsg(msg));\n\t}\n\t// all stash and normal clients should now be in the same state,\n\t// except #1 (normal) which still has local changes\n\tTestClientLogger.validate([...clients.filter((_, i) => i !== 1), ...stashClients]);\n\n\t// regenerate ops for client #1\n\tconst reconnectMsgs: ISequencedDocumentMessage[] = [];\n\treconnectClientMsgs.forEach((opData) => {\n\t\tconst newMsg = clients[1].makeOpMessage(\n\t\t\tclients[1].regeneratePendingOp(opData[0], opData[1]),\n\t\t);\n\t\tnewMsg.minimumSequenceNumber = minSeq;\n\t\treconnectMsgs.push(newMsg);\n\t});\n\n\t// apply regenerated ops as stashed ops for client #1\n\tconst stashedRegeneratedOps: [IMergeTreeOp, SegmentGroup | SegmentGroup[]][] =\n\t\treconnectMsgs.map((message) => {\n\t\t\tconst op = message.contents as IMergeTreeOp;\n\t\t\tstashClients[1].applyStashedOp(op);\n\t\t\treturn [\n\t\t\t\top,\n\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\t\tstashClients[1].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// now both clients at index 1 should be the same\n\tTestClientLogger.validate([clients[1], stashClients[1]]);\n\n\t// apply the regenerated ops from client #1\n\tfor (const message of reconnectMsgs) {\n\t\tmessage.sequenceNumber = ++seq;\n\t\tclients.forEach((c) => c.applyMsg(message));\n\t}\n\n\t// resubmit regenerated stashed ops\n\tconst reRegeneratedStashedMessages = stashedRegeneratedOps.map((stashedOp) =>\n\t\tstashClients[1].makeOpMessage(\n\t\t\tstashClients[1].regeneratePendingOp(stashedOp[0], stashedOp[1]),\n\t\t),\n\t);\n\n\tfor (const reRegeneratedStashedOp of reRegeneratedStashedMessages) {\n\t\treRegeneratedStashedOp.sequenceNumber = ++stashedOpSeq;\n\t\tstashClients.forEach((c) => c.applyMsg(reRegeneratedStashedOp));\n\t}\n\n\t// all clients should now be the same\n\tTestClientLogger.validate([...clients, ...stashClients]);\n\n\treturn seq;\n}\n\ninterface IApplyStashedOpFarmConfig extends IMergeTreeOperationRunnerConfig {\n\tminLength: number;\n\tclients: IConfigRange;\n}\n\nexport const defaultOptions: IApplyStashedOpFarmConfig = {\n\tminLength: 16,\n\tclients: { min: 3, max: 12 },\n\topsPerRoundRange: { min: 40, max: 120 },\n\trounds: 3,\n\toperations: [annotateRange, removeRange, insert],\n\tgrowthFunc: (input: number) => input * 2,\n};\n\n// Generate a list of single character client names, support up to 69 clients\nconst clientNames = generateClientNames();\n\nfunction runApplyStashedOpFarmTests(opts: IApplyStashedOpFarmConfig, extraSeed?: number): void {\n\tdoOverRange(opts.clients, opts.growthFunc.bind(opts), (clientCount) => {\n\t\tit(`applyStashedOpFarm_${clientCount}`, async () => {\n\t\t\tconst random = makeRandom(0xdeadbeef, 0xfeedbed, clientCount, extraSeed ?? 0);\n\t\t\tconst testOpts = { ...opts };\n\t\t\tif (extraSeed) {\n\t\t\t\ttestOpts.resultsFilePostfix ??= \"\";\n\t\t\t\ttestOpts.resultsFilePostfix += extraSeed;\n\t\t\t}\n\n\t\t\tconst clients: TestClient[] = [new TestClient()];\n\t\t\t// This test is based on reconnectFarm, but we keep a second set of clients. For\n\t\t\t// these clients, we apply the generated ops as stashed ops, then regenerate\n\t\t\t// them to simulate resubmit(), then apply them. In the end, they should arrive\n\t\t\t// at the same state as the \"normal\" set of clients\n\t\t\tlet stashClients: TestClient[] = [];\n\n\t\t\tclients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\t\t\tstashClients = [new TestClient()];\n\t\t\tstashClients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\n\t\t\tlet seq = 0;\n\t\t\tclients.forEach((c) => c.updateMinSeq(seq));\n\t\t\tstashClients.forEach((c) => c.updateMinSeq(seq));\n\n\t\t\t// Add double the number of clients each iteration\n\t\t\tconst targetClients = Math.max(opts.clients.min, clientCount);\n\t\t\tfor (let cc = clients.length; cc < targetClients; cc++) {\n\t\t\t\tconst newClient = await TestClient.createFromClientSnapshot(\n\t\t\t\t\tclients[0],\n\t\t\t\t\tclientNames[cc],\n\t\t\t\t);\n\t\t\t\tclients.push(newClient);\n\t\t\t\t// add 1 stash client per normal client\n\t\t\t\tconst anotherNewClient = await TestClient.createFromClientSnapshot(\n\t\t\t\t\tclients[0],\n\t\t\t\t\tclientNames[cc],\n\t\t\t\t);\n\t\t\t\tstashClients.push(anotherNewClient);\n\t\t\t}\n\n\t\t\tseq = runMergeTreeOperationRunner(\n\t\t\t\trandom,\n\t\t\t\tseq,\n\t\t\t\tclients,\n\t\t\t\topts.minLength,\n\t\t\t\topts,\n\t\t\t\t(s, m, c) => applyMessagesWithReconnect(s, m, c, stashClients),\n\t\t\t);\n\t\t}).timeout(30 * 1000);\n\t});\n}\n\ndescribeFuzz(\"MergeTree.Client\", ({ testCount }) => {\n\tconst opts = defaultOptions;\n\n\tif (testCount > 1) {\n\t\tdoOverRange(\n\t\t\t{ min: 0, max: testCount - 1 },\n\t\t\t(x) => x + 1,\n\t\t\t(seed) => {\n\t\t\t\tdescribe(`with seed ${seed}`, () => {\n\t\t\t\t\trunApplyStashedOpFarmTests(opts, seed);\n\t\t\t\t});\n\t\t\t},\n\t\t);\n\t} else {\n\t\trunApplyStashedOpFarmTests(opts);\n\t}\n});\n"]}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { TestOperation } from "./mergeTreeOperationRunner";
|
|
5
|
+
import { TestOperation } from "./mergeTreeOperationRunner.js";
|
|
6
6
|
export declare const annotateRange: TestOperation;
|
|
7
7
|
//# sourceMappingURL=client.attributionFarm.spec.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.attributionFarm.spec.d.ts","sourceRoot":"","sources":["../../src/test/client.attributionFarm.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAMN,aAAa,EAGb,MAAM,
|
|
1
|
+
{"version":3,"file":"client.attributionFarm.spec.d.ts","sourceRoot":"","sources":["../../src/test/client.attributionFarm.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAMN,aAAa,EAGb,MAAM,+BAA+B,CAAC;AAIvC,eAAO,MAAM,aAAa,EAAE,aACoD,CAAC"}
|
|
@@ -8,10 +8,10 @@ exports.annotateRange = void 0;
|
|
|
8
8
|
const assert_1 = require("assert");
|
|
9
9
|
const test_pairwise_generator_1 = require("@fluid-private/test-pairwise-generator");
|
|
10
10
|
const stochastic_test_utils_1 = require("@fluid-private/stochastic-test-utils");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
11
|
+
const attributionPolicy_js_1 = require("../attributionPolicy.js");
|
|
12
|
+
const mergeTreeOperationRunner_js_1 = require("./mergeTreeOperationRunner.js");
|
|
13
|
+
const testClient_js_1 = require("./testClient.js");
|
|
14
|
+
const testClientLogger_js_1 = require("./testClientLogger.js");
|
|
15
15
|
const annotateRange = (client, opStart, opEnd) => client.annotateRangeLocal(opStart, opEnd, { trackedProp: client.longClientId });
|
|
16
16
|
exports.annotateRange = annotateRange;
|
|
17
17
|
const defaultOptions = {
|
|
@@ -19,21 +19,21 @@ const defaultOptions = {
|
|
|
19
19
|
modLen: { min: 1, max: 8 },
|
|
20
20
|
opsPerRoundRange: { min: 10, max: 40 },
|
|
21
21
|
rounds: 10,
|
|
22
|
-
operations: [
|
|
22
|
+
operations: [mergeTreeOperationRunner_js_1.removeRange, exports.annotateRange, mergeTreeOperationRunner_js_1.insert],
|
|
23
23
|
growthFunc: (input) => input * 2,
|
|
24
24
|
};
|
|
25
25
|
(0, stochastic_test_utils_1.describeFuzz)("MergeTree.Attribution", ({ testCount }) => {
|
|
26
26
|
// Generate a list of single character client names, support up to 69 clients
|
|
27
|
-
const clientNames = (0,
|
|
28
|
-
const rangeOptions = (0,
|
|
27
|
+
const clientNames = (0, mergeTreeOperationRunner_js_1.generateClientNames)();
|
|
28
|
+
const rangeOptions = (0, mergeTreeOperationRunner_js_1.resolveRanges)(defaultOptions, defaultOptions.growthFunc);
|
|
29
29
|
for (let extraSeed = 0; extraSeed < testCount; extraSeed++) {
|
|
30
30
|
(0, test_pairwise_generator_1.generatePairwiseOptions)(rangeOptions).forEach(({ initLen, modLen, opsPerRoundRange }) => {
|
|
31
31
|
it(`AttributionFarm_${initLen}_${modLen}_${opsPerRoundRange}`, async () => {
|
|
32
32
|
const random = (0, stochastic_test_utils_1.makeRandom)(0xdeadbeef, initLen, modLen, extraSeed ?? 0);
|
|
33
|
-
const clients = new Array(3).fill(0).map(() => new
|
|
33
|
+
const clients = new Array(3).fill(0).map(() => new testClient_js_1.TestClient({
|
|
34
34
|
attribution: {
|
|
35
35
|
track: true,
|
|
36
|
-
policyFactory: (0,
|
|
36
|
+
policyFactory: (0, attributionPolicy_js_1.createPropertyTrackingAndInsertionAttributionPolicyFactory)("trackedProp"),
|
|
37
37
|
},
|
|
38
38
|
}));
|
|
39
39
|
clients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));
|
|
@@ -54,7 +54,7 @@ const defaultOptions = {
|
|
|
54
54
|
return channels;
|
|
55
55
|
};
|
|
56
56
|
const validateAnnotation = (reason, workload) => {
|
|
57
|
-
const preWorkload =
|
|
57
|
+
const preWorkload = testClientLogger_js_1.TestClientLogger.toString(clients);
|
|
58
58
|
workload();
|
|
59
59
|
const attributions = Array.from({ length: clients[0].getLength() }).map((_, i) => getAttributionAtPosition(clients[0], i));
|
|
60
60
|
for (let c = 1; c < clients.length; c++) {
|
|
@@ -62,7 +62,7 @@ const defaultOptions = {
|
|
|
62
62
|
const attribution0 = attributions[i];
|
|
63
63
|
const attributionC = getAttributionAtPosition(clients[c], i);
|
|
64
64
|
if (attribution0 !== attributionC) {
|
|
65
|
-
assert_1.strict.deepEqual(attribution0, attributionC, `${reason}:\n${preWorkload}\n${
|
|
65
|
+
assert_1.strict.deepEqual(attribution0, attributionC, `${reason}:\n${preWorkload}\n${testClientLogger_js_1.TestClientLogger.toString([
|
|
66
66
|
clients[0],
|
|
67
67
|
clients[c],
|
|
68
68
|
])}`);
|
|
@@ -72,7 +72,7 @@ const defaultOptions = {
|
|
|
72
72
|
};
|
|
73
73
|
let seq = 0;
|
|
74
74
|
validateAnnotation("Initialize", () => {
|
|
75
|
-
seq = (0,
|
|
75
|
+
seq = (0, mergeTreeOperationRunner_js_1.runMergeTreeOperationRunner)(random, seq, clients, initLen, defaultOptions);
|
|
76
76
|
});
|
|
77
77
|
validateAnnotation("After Init Zamboni", () => {
|
|
78
78
|
// trigger zamboni multiple times as it is incremental
|
|
@@ -81,7 +81,7 @@ const defaultOptions = {
|
|
|
81
81
|
}
|
|
82
82
|
});
|
|
83
83
|
validateAnnotation("After More Ops", () => {
|
|
84
|
-
seq = (0,
|
|
84
|
+
seq = (0, mergeTreeOperationRunner_js_1.runMergeTreeOperationRunner)(random, seq, clients, modLen, defaultOptions);
|
|
85
85
|
});
|
|
86
86
|
validateAnnotation("After Final Zamboni", () => {
|
|
87
87
|
// trigger zamboni multiple times as it is incremental
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.attributionFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.attributionFarm.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mCAA0C;AAC1C,oFAAiF;AACjF,gFAAgF;AAEhF,
|
|
1
|
+
{"version":3,"file":"client.attributionFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.attributionFarm.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\";\nimport { generatePairwiseOptions } from \"@fluid-private/test-pairwise-generator\";\nimport { describeFuzz, makeRandom } from \"@fluid-private/stochastic-test-utils\";\nimport { AttributionKey } from \"@fluidframework/runtime-definitions\";\nimport { createPropertyTrackingAndInsertionAttributionPolicyFactory } from \"../attributionPolicy.js\";\nimport {\n\tIMergeTreeOperationRunnerConfig,\n\tremoveRange,\n\trunMergeTreeOperationRunner,\n\tgenerateClientNames,\n\tIConfigRange,\n\tTestOperation,\n\tresolveRanges,\n\tinsert,\n} from \"./mergeTreeOperationRunner.js\";\nimport { TestClient } from \"./testClient.js\";\nimport { TestClientLogger } from \"./testClientLogger.js\";\n\nexport const annotateRange: TestOperation = (client: TestClient, opStart: number, opEnd: number) =>\n\tclient.annotateRangeLocal(opStart, opEnd, { trackedProp: client.longClientId });\n\nconst defaultOptions: Record<\"initLen\" | \"modLen\", IConfigRange> & IMergeTreeOperationRunnerConfig =\n\t{\n\t\tinitLen: { min: 2, max: 4 },\n\t\tmodLen: { min: 1, max: 8 },\n\t\topsPerRoundRange: { min: 10, max: 40 },\n\t\trounds: 10,\n\t\toperations: [removeRange, annotateRange, insert],\n\t\tgrowthFunc: (input: number) => input * 2,\n\t};\n\ndescribeFuzz(\"MergeTree.Attribution\", ({ testCount }) => {\n\t// Generate a list of single character client names, support up to 69 clients\n\tconst clientNames = generateClientNames();\n\tconst rangeOptions = resolveRanges(defaultOptions, defaultOptions.growthFunc);\n\tfor (let extraSeed = 0; extraSeed < testCount; extraSeed++) {\n\t\tgeneratePairwiseOptions(rangeOptions).forEach(({ initLen, modLen, opsPerRoundRange }) => {\n\t\t\tit(`AttributionFarm_${initLen}_${modLen}_${opsPerRoundRange}`, async () => {\n\t\t\t\tconst random = makeRandom(0xdeadbeef, initLen, modLen, extraSeed ?? 0);\n\n\t\t\t\tconst clients: TestClient[] = new Array(3).fill(0).map(\n\t\t\t\t\t() =>\n\t\t\t\t\t\tnew TestClient({\n\t\t\t\t\t\t\tattribution: {\n\t\t\t\t\t\t\t\ttrack: true,\n\t\t\t\t\t\t\t\tpolicyFactory:\n\t\t\t\t\t\t\t\t\tcreatePropertyTrackingAndInsertionAttributionPolicyFactory(\n\t\t\t\t\t\t\t\t\t\t\"trackedProp\",\n\t\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t}),\n\t\t\t\t);\n\t\t\t\tclients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\n\t\t\t\tconst getAttributionAtPosition = (client: TestClient, pos: number) => {\n\t\t\t\t\tconst { segment, offset } = client.getContainingSegment(pos);\n\t\t\t\t\tif (segment?.attribution === undefined || offset === undefined) {\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t}\n\t\t\t\t\tconst { attribution } = segment;\n\t\t\t\t\tlet channels: { [name: string]: AttributionKey | undefined } | undefined;\n\t\t\t\t\tconst result: {\n\t\t\t\t\t\troot: AttributionKey | undefined;\n\t\t\t\t\t\tchannels?: { [name: string]: AttributionKey | undefined };\n\t\t\t\t\t} = {\n\t\t\t\t\t\troot: attribution.getAtOffset(offset),\n\t\t\t\t\t};\n\t\t\t\t\tfor (const name of attribution.channelNames) {\n\t\t\t\t\t\t(channels ??= {})[name] = attribution.getAtOffset(offset, name);\n\t\t\t\t\t\tresult.channels = channels;\n\t\t\t\t\t}\n\t\t\t\t\treturn channels;\n\t\t\t\t};\n\n\t\t\t\tconst validateAnnotation = (reason: string, workload: () => void) => {\n\t\t\t\t\tconst preWorkload = TestClientLogger.toString(clients);\n\t\t\t\t\tworkload();\n\t\t\t\t\tconst attributions = Array.from({ length: clients[0].getLength() }).map(\n\t\t\t\t\t\t(_, i) => getAttributionAtPosition(clients[0], i),\n\t\t\t\t\t);\n\t\t\t\t\tfor (let c = 1; c < clients.length; c++) {\n\t\t\t\t\t\tfor (let i = 0; i < clients[c].getLength(); i++) {\n\t\t\t\t\t\t\tconst attribution0 = attributions[i];\n\t\t\t\t\t\t\tconst attributionC = getAttributionAtPosition(clients[c], i);\n\t\t\t\t\t\t\tif (attribution0 !== attributionC) {\n\t\t\t\t\t\t\t\tassert.deepEqual(\n\t\t\t\t\t\t\t\t\tattribution0,\n\t\t\t\t\t\t\t\t\tattributionC,\n\t\t\t\t\t\t\t\t\t`${reason}:\\n${preWorkload}\\n${TestClientLogger.toString([\n\t\t\t\t\t\t\t\t\t\tclients[0],\n\t\t\t\t\t\t\t\t\t\tclients[c],\n\t\t\t\t\t\t\t\t\t])}`,\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t};\n\n\t\t\t\tlet seq = 0;\n\n\t\t\t\tvalidateAnnotation(\"Initialize\", () => {\n\t\t\t\t\tseq = runMergeTreeOperationRunner(\n\t\t\t\t\t\trandom,\n\t\t\t\t\t\tseq,\n\t\t\t\t\t\tclients,\n\t\t\t\t\t\tinitLen,\n\t\t\t\t\t\tdefaultOptions,\n\t\t\t\t\t);\n\t\t\t\t});\n\n\t\t\t\tvalidateAnnotation(\"After Init Zamboni\", () => {\n\t\t\t\t\t// trigger zamboni multiple times as it is incremental\n\t\t\t\t\tfor (let i = clients[0].getCollabWindow().minSeq; i <= seq; i++) {\n\t\t\t\t\t\tclients.forEach((c) => c.updateMinSeq(i));\n\t\t\t\t\t}\n\t\t\t\t});\n\n\t\t\t\tvalidateAnnotation(\"After More Ops\", () => {\n\t\t\t\t\tseq = runMergeTreeOperationRunner(random, seq, clients, modLen, defaultOptions);\n\t\t\t\t});\n\n\t\t\t\tvalidateAnnotation(\"After Final Zamboni\", () => {\n\t\t\t\t\t// trigger zamboni multiple times as it is incremental\n\t\t\t\t\tfor (let i = clients[0].getCollabWindow().minSeq; i <= seq; i++) {\n\t\t\t\t\t\tclients.forEach((c) => c.updateMinSeq(i));\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t}\n});\n"]}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { IConfigRange, IMergeTreeOperationRunnerConfig } from "./mergeTreeOperationRunner";
|
|
5
|
+
import { IConfigRange, IMergeTreeOperationRunnerConfig } from "./mergeTreeOperationRunner.js";
|
|
6
6
|
interface IConflictFarmConfig extends IMergeTreeOperationRunnerConfig {
|
|
7
7
|
minLength: IConfigRange;
|
|
8
8
|
clients: IConfigRange;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.conflictFarm.spec.d.ts","sourceRoot":"","sources":["../../src/test/client.conflictFarm.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAGN,YAAY,EACZ,+BAA+B,EAM/B,MAAM,
|
|
1
|
+
{"version":3,"file":"client.conflictFarm.spec.d.ts","sourceRoot":"","sources":["../../src/test/client.conflictFarm.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAGN,YAAY,EACZ,+BAA+B,EAM/B,MAAM,+BAA+B,CAAC;AAGvC,UAAU,mBAAoB,SAAQ,+BAA+B;IACpE,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,YAAY,CAAC;CACtB;AAID,eAAO,MAAM,YAAY,EAAE,mBAQ1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,mBAO5B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,mBAOzB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,mBAO3B,CAAC"}
|
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.stressOptions = exports.longOptions = exports.defaultOptions = exports.debugOptions = void 0;
|
|
8
8
|
const stochastic_test_utils_1 = require("@fluid-private/stochastic-test-utils");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const allOperations = [
|
|
9
|
+
const mergeTreeOperationRunner_js_1 = require("./mergeTreeOperationRunner.js");
|
|
10
|
+
const testClient_js_1 = require("./testClient.js");
|
|
11
|
+
const allOperations = [mergeTreeOperationRunner_js_1.removeRange, mergeTreeOperationRunner_js_1.annotateRange, mergeTreeOperationRunner_js_1.insertAtRefPos];
|
|
12
12
|
exports.debugOptions = {
|
|
13
13
|
minLength: { min: 1, max: 1 },
|
|
14
14
|
clients: { min: 3, max: 3 },
|
|
@@ -43,9 +43,9 @@ exports.stressOptions = {
|
|
|
43
43
|
growthFunc: (input) => input * 2,
|
|
44
44
|
};
|
|
45
45
|
// Generate a list of single character client names, support up to 69 clients
|
|
46
|
-
const clientNames = (0,
|
|
46
|
+
const clientNames = (0, mergeTreeOperationRunner_js_1.generateClientNames)();
|
|
47
47
|
function runConflictFarmTests(opts, extraSeed) {
|
|
48
|
-
(0,
|
|
48
|
+
(0, mergeTreeOperationRunner_js_1.doOverRange)(opts.minLength, opts.growthFunc, (minLength) => {
|
|
49
49
|
it(`ConflictFarm_${minLength}`, async () => {
|
|
50
50
|
const random = (0, stochastic_test_utils_1.makeRandom)(0xdeadbeef, 0xfeedbed, minLength, extraSeed ?? 0);
|
|
51
51
|
const testOpts = { ...opts };
|
|
@@ -53,7 +53,7 @@ function runConflictFarmTests(opts, extraSeed) {
|
|
|
53
53
|
testOpts.resultsFilePostfix ?? (testOpts.resultsFilePostfix = "");
|
|
54
54
|
testOpts.resultsFilePostfix += extraSeed;
|
|
55
55
|
}
|
|
56
|
-
const clients = [new
|
|
56
|
+
const clients = [new testClient_js_1.TestClient()];
|
|
57
57
|
clients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));
|
|
58
58
|
let seq = 0;
|
|
59
59
|
while (clients.length < opts.clients.max) {
|
|
@@ -61,10 +61,10 @@ function runConflictFarmTests(opts, extraSeed) {
|
|
|
61
61
|
// Add double the number of clients each iteration
|
|
62
62
|
const targetClients = Math.max(opts.clients.min, opts.growthFunc(clients.length));
|
|
63
63
|
for (let cc = clients.length; cc < targetClients; cc++) {
|
|
64
|
-
const newClient = await
|
|
64
|
+
const newClient = await testClient_js_1.TestClient.createFromClientSnapshot(clients[0], clientNames[cc]);
|
|
65
65
|
clients.push(newClient);
|
|
66
66
|
}
|
|
67
|
-
seq = (0,
|
|
67
|
+
seq = (0, mergeTreeOperationRunner_js_1.runMergeTreeOperationRunner)(random, seq, clients, minLength, opts);
|
|
68
68
|
}
|
|
69
69
|
}).timeout(30 * 10000);
|
|
70
70
|
});
|
|
@@ -75,7 +75,7 @@ function runConflictFarmTests(opts, extraSeed) {
|
|
|
75
75
|
// debugOptions;
|
|
76
76
|
// longOptions;
|
|
77
77
|
if (testCount > 1) {
|
|
78
|
-
(0,
|
|
78
|
+
(0, mergeTreeOperationRunner_js_1.doOverRange)({ min: 0, max: testCount - 1 }, (x) => x + 1, (seed) => {
|
|
79
79
|
describe(`with seed ${seed}`, () => {
|
|
80
80
|
runConflictFarmTests(opts, seed);
|
|
81
81
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.conflictFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.conflictFarm.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gFAAgF;AAChF
|
|
1
|
+
{"version":3,"file":"client.conflictFarm.spec.js","sourceRoot":"","sources":["../../src/test/client.conflictFarm.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 { describeFuzz, makeRandom } from \"@fluid-private/stochastic-test-utils\";\nimport {\n\tannotateRange,\n\tdoOverRange,\n\tIConfigRange,\n\tIMergeTreeOperationRunnerConfig,\n\tinsertAtRefPos,\n\tremoveRange,\n\trunMergeTreeOperationRunner,\n\tTestOperation,\n\tgenerateClientNames,\n} from \"./mergeTreeOperationRunner.js\";\nimport { TestClient } from \"./testClient.js\";\n\ninterface IConflictFarmConfig extends IMergeTreeOperationRunnerConfig {\n\tminLength: IConfigRange;\n\tclients: IConfigRange;\n}\n\nconst allOperations: TestOperation[] = [removeRange, annotateRange, insertAtRefPos];\n\nexport const debugOptions: IConflictFarmConfig = {\n\tminLength: { min: 1, max: 1 },\n\tclients: { min: 3, max: 3 },\n\topsPerRoundRange: { min: 1, max: 100 },\n\trounds: 1000,\n\toperations: allOperations,\n\tincrementalLog: true,\n\tgrowthFunc: (input: number) => input + 1,\n};\n\nexport const defaultOptions: IConflictFarmConfig = {\n\tminLength: { min: 1, max: 512 },\n\tclients: { min: 1, max: 8 },\n\topsPerRoundRange: { min: 1, max: 128 },\n\trounds: 8,\n\toperations: allOperations,\n\tgrowthFunc: (input: number) => input * 2,\n};\n\nexport const longOptions: IConflictFarmConfig = {\n\tminLength: { min: 1, max: 512 },\n\tclients: { min: 1, max: 32 },\n\topsPerRoundRange: { min: 1, max: 512 },\n\trounds: 32,\n\toperations: allOperations,\n\tgrowthFunc: (input: number) => input * 2,\n};\n\nexport const stressOptions: IConflictFarmConfig = {\n\tminLength: { min: 1, max: 512 },\n\tclients: { min: 1, max: 32 },\n\topsPerRoundRange: { min: 1, max: 128 },\n\trounds: 32,\n\toperations: allOperations,\n\tgrowthFunc: (input: number) => input * 2,\n};\n\n// Generate a list of single character client names, support up to 69 clients\nconst clientNames = generateClientNames();\n\nfunction runConflictFarmTests(opts: IConflictFarmConfig, extraSeed?: number): void {\n\tdoOverRange(opts.minLength, opts.growthFunc, (minLength) => {\n\t\tit(`ConflictFarm_${minLength}`, async () => {\n\t\t\tconst random = makeRandom(0xdeadbeef, 0xfeedbed, minLength, extraSeed ?? 0);\n\t\t\tconst testOpts = { ...opts };\n\t\t\tif (extraSeed) {\n\t\t\t\ttestOpts.resultsFilePostfix ??= \"\";\n\t\t\t\ttestOpts.resultsFilePostfix += extraSeed;\n\t\t\t}\n\n\t\t\tconst clients: TestClient[] = [new TestClient()];\n\t\t\tclients.forEach((c, i) => c.startOrUpdateCollaboration(clientNames[i]));\n\n\t\t\tlet seq = 0;\n\t\t\twhile (clients.length < opts.clients.max) {\n\t\t\t\tclients.forEach((c) => c.updateMinSeq(seq));\n\n\t\t\t\t// Add double the number of clients each iteration\n\t\t\t\tconst targetClients = Math.max(opts.clients.min, opts.growthFunc(clients.length));\n\t\t\t\tfor (let cc = clients.length; cc < targetClients; cc++) {\n\t\t\t\t\tconst newClient = await TestClient.createFromClientSnapshot(\n\t\t\t\t\t\tclients[0],\n\t\t\t\t\t\tclientNames[cc],\n\t\t\t\t\t);\n\t\t\t\t\tclients.push(newClient);\n\t\t\t\t}\n\n\t\t\t\tseq = runMergeTreeOperationRunner(random, seq, clients, minLength, opts);\n\t\t\t}\n\t\t}).timeout(30 * 10000);\n\t});\n}\n\ndescribeFuzz(\"MergeTree.Client\", ({ testCount, isStress }) => {\n\tconst opts = isStress ? stressOptions : defaultOptions;\n\t// defaultOptions;\n\t// debugOptions;\n\t// longOptions;\n\n\tif (testCount > 1) {\n\t\tdoOverRange(\n\t\t\t{ min: 0, max: testCount - 1 },\n\t\t\t(x) => x + 1,\n\t\t\t(seed) => {\n\t\t\t\tdescribe(`with seed ${seed}`, () => {\n\t\t\t\t\trunConflictFarmTests(opts, seed);\n\t\t\t\t});\n\t\t\t},\n\t\t);\n\t} else {\n\t\trunConflictFarmTests(opts);\n\t}\n});\n"]}
|
|
@@ -6,21 +6,21 @@
|
|
|
6
6
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
const assert_1 = require("assert");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const textSegment_js_1 = require("../textSegment.js");
|
|
10
|
+
const testClient_js_1 = require("./testClient.js");
|
|
11
11
|
describe("client.getPosition", () => {
|
|
12
12
|
const localUserLongId = "localUser";
|
|
13
13
|
let client;
|
|
14
14
|
let segment;
|
|
15
15
|
const segPos = 4;
|
|
16
16
|
beforeEach(() => {
|
|
17
|
-
client = new
|
|
17
|
+
client = new testClient_js_1.TestClient();
|
|
18
18
|
for (const c of "hello world") {
|
|
19
19
|
client.insertTextLocal(client.getLength(), c);
|
|
20
20
|
}
|
|
21
21
|
client.startOrUpdateCollaboration(localUserLongId);
|
|
22
22
|
const segOff = client.getContainingSegment(segPos);
|
|
23
|
-
(0, assert_1.strict)(
|
|
23
|
+
(0, assert_1.strict)(textSegment_js_1.TextSegment.is(segOff.segment));
|
|
24
24
|
assert_1.strict.strictEqual(segOff.offset, 0);
|
|
25
25
|
assert_1.strict.strictEqual(segOff.segment.text, "o");
|
|
26
26
|
segment = segOff.segment;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.getPosition.spec.js","sourceRoot":"","sources":["../../src/test/client.getPosition.spec.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACH,6DAA6D;;AAE7D,mCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"client.getPosition.spec.js","sourceRoot":"","sources":["../../src/test/client.getPosition.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/* eslint-disable @typescript-eslint/no-non-null-assertion */\n\nimport { strict as assert } from \"assert\";\nimport { TextSegment } from \"../textSegment.js\";\nimport { TestClient } from \"./testClient.js\";\n\ndescribe(\"client.getPosition\", () => {\n\tconst localUserLongId = \"localUser\";\n\tlet client: TestClient;\n\tlet segment: TextSegment;\n\tconst segPos = 4;\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\n\t\tconst segOff = client.getContainingSegment(segPos);\n\t\tassert(TextSegment.is(segOff.segment!));\n\t\tassert.strictEqual(segOff.offset, 0);\n\t\tassert.strictEqual(segOff.segment.text, \"o\");\n\t\tsegment = segOff.segment;\n\t});\n\n\tit(\"Existing Segment\", () => {\n\t\tconst pos = client.getPosition(segment);\n\t\tassert.strictEqual(pos, segPos);\n\t});\n\n\tit(\"Deleted Segment\", () => {\n\t\tclient.removeRangeLocal(segPos, segPos + 1);\n\t\tassert.notStrictEqual(segment.removedSeq, undefined);\n\t\tconst pos = client.getPosition(segment);\n\t\tassert.strictEqual(pos, segPos);\n\t});\n\n\tit(\"Detached Segment\", () => {\n\t\tclient.applyMsg(client.makeOpMessage(client.removeRangeLocal(segPos, segPos + 1), 1));\n\t\t// do some work and move the client's min seq forward, so zamboni runs\n\t\tfor (const c of \"hello world\") {\n\t\t\tclient.applyMsg(\n\t\t\t\tclient.makeOpMessage(\n\t\t\t\t\tclient.insertTextLocal(client.getLength(), c),\n\t\t\t\t\tclient.getCurrentSeq() + 1,\n\t\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\t\tundefined,\n\t\t\t\t\tclient.getCurrentSeq(),\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t\tassert.notStrictEqual(segment.removedSeq, undefined);\n\n\t\tconst pos = client.getPosition(segment);\n\t\tassert.strictEqual(pos, -1);\n\t});\n\n\tit(\"Moved Segment\", () => {\n\t\tclient.removeRangeLocal(segPos - 1, segPos);\n\t\tconst pos = client.getPosition(segment);\n\t\tassert.strictEqual(pos, segPos - 1);\n\t});\n});\n"]}
|