@fluidframework/merge-tree 2.0.0-rc.2.0.1 → 2.0.0-rc.3.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/CHANGELOG.md +23 -0
- package/api-report/merge-tree.api.md +16 -4
- package/dist/MergeTreeTextHelper.d.ts.map +1 -1
- 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 +6 -6
- package/dist/attributionCollection.js.map +1 -1
- package/dist/attributionPolicy.d.ts +2 -2
- package/dist/attributionPolicy.d.ts.map +1 -1
- package/dist/attributionPolicy.js +5 -5
- package/dist/attributionPolicy.js.map +1 -1
- package/dist/client.d.ts +8 -8
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +37 -48
- package/dist/client.js.map +1 -1
- package/dist/collections/list.js +3 -3
- package/dist/collections/list.js.map +1 -1
- package/dist/endOfTreeSegment.d.ts +5 -5
- package/dist/endOfTreeSegment.d.ts.map +1 -1
- package/dist/endOfTreeSegment.js +2 -2
- package/dist/endOfTreeSegment.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/legacy.d.ts +76 -0
- package/dist/localReference.d.ts.map +1 -1
- package/dist/localReference.js +7 -7
- package/dist/localReference.js.map +1 -1
- package/dist/mergeTree.d.ts +8 -8
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +44 -57
- package/dist/mergeTree.js.map +1 -1
- package/dist/mergeTreeDeltaCallback.d.ts +1 -1
- package/dist/mergeTreeDeltaCallback.d.ts.map +1 -1
- package/dist/mergeTreeDeltaCallback.js +4 -0
- package/dist/mergeTreeDeltaCallback.js.map +1 -1
- package/dist/mergeTreeNodeWalk.d.ts +3 -3
- package/dist/mergeTreeNodeWalk.d.ts.map +1 -1
- package/dist/mergeTreeNodeWalk.js.map +1 -1
- package/dist/mergeTreeNodes.d.ts +37 -55
- package/dist/mergeTreeNodes.d.ts.map +1 -1
- package/dist/mergeTreeNodes.js +40 -19
- package/dist/mergeTreeNodes.js.map +1 -1
- package/dist/opBuilder.d.ts +1 -1
- package/dist/opBuilder.d.ts.map +1 -1
- package/dist/opBuilder.js.map +1 -1
- package/dist/ordinal.js +2 -2
- package/dist/ordinal.js.map +1 -1
- package/dist/partialLengths.d.ts +6 -6
- package/dist/partialLengths.d.ts.map +1 -1
- package/dist/partialLengths.js +13 -13
- package/dist/partialLengths.js.map +1 -1
- package/dist/public.d.ts +12 -0
- package/dist/revertibles.d.ts +1 -1
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +15 -15
- package/dist/revertibles.js.map +1 -1
- package/dist/segmentPropertiesManager.d.ts.map +1 -1
- package/dist/segmentPropertiesManager.js +2 -2
- package/dist/segmentPropertiesManager.js.map +1 -1
- package/dist/snapshotChunks.d.ts +2 -2
- package/dist/snapshotChunks.d.ts.map +1 -1
- package/dist/snapshotChunks.js.map +1 -1
- package/dist/snapshotLoader.d.ts +2 -2
- package/dist/snapshotLoader.d.ts.map +1 -1
- package/dist/snapshotLoader.js +11 -11
- 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 +10 -10
- package/dist/snapshotV1.js.map +1 -1
- package/dist/snapshotlegacy.d.ts +4 -4
- package/dist/snapshotlegacy.d.ts.map +1 -1
- package/dist/snapshotlegacy.js +9 -10
- package/dist/snapshotlegacy.js.map +1 -1
- package/dist/test/Insertion.perf.spec.js.map +1 -1
- package/dist/test/PartialLengths.perf.spec.js +1 -1
- package/dist/test/PartialLengths.perf.spec.js.map +1 -1
- package/dist/test/Removal.perf.spec.js +1 -1
- package/dist/test/Removal.perf.spec.js.map +1 -1
- package/dist/test/Snapshot.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.perf.spec.js +2 -2
- package/dist/test/attributionCollection.perf.spec.js.map +1 -1
- package/dist/test/attributionCollection.spec.js.map +1 -1
- package/dist/test/attributionPolicy.spec.js.map +1 -1
- package/dist/test/beastTest.spec.d.ts.map +1 -1
- package/dist/test/beastTest.spec.js +7 -7
- package/dist/test/beastTest.spec.js.map +1 -1
- 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.map +1 -1
- package/dist/test/client.applyMsg.spec.js +2 -2
- 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.map +1 -1
- package/dist/test/client.attributionFarm.spec.d.ts.map +1 -1
- package/dist/test/client.attributionFarm.spec.js +1 -1
- package/dist/test/client.attributionFarm.spec.js.map +1 -1
- package/dist/test/client.conflictFarm.spec.d.ts.map +1 -1
- package/dist/test/client.conflictFarm.spec.js.map +1 -1
- package/dist/test/client.getPosition.spec.js +1 -1
- package/dist/test/client.getPosition.spec.js.map +1 -1
- package/dist/test/client.localReference.spec.js +6 -6
- package/dist/test/client.localReference.spec.js.map +1 -1
- package/dist/test/client.localReferenceFarm.spec.js +2 -2
- package/dist/test/client.localReferenceFarm.spec.js.map +1 -1
- 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 +1 -1
- package/dist/test/client.reconnectFarm.spec.js.map +1 -1
- package/dist/test/client.replay.spec.js +4 -4
- package/dist/test/client.replay.spec.js.map +1 -1
- package/dist/test/client.rollback.spec.js +2 -2
- package/dist/test/client.rollback.spec.js.map +1 -1
- package/dist/test/client.rollbackFarm.spec.js.map +1 -1
- package/dist/test/client.searchForMarker.spec.js +1 -1
- package/dist/test/client.searchForMarker.spec.js.map +1 -1
- package/dist/test/client.walkSegments.spec.js.map +1 -1
- package/dist/test/collections.list.spec.js.map +1 -1
- package/dist/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -1
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js +3 -3
- package/dist/test/mergeTree.annotate.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.annotate.spec.js +1 -1
- package/dist/test/mergeTree.annotate.spec.js.map +1 -1
- package/dist/test/mergeTree.insert.deltaCallback.spec.js +1 -1
- package/dist/test/mergeTree.insert.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.insertingWalk.spec.js +3 -3
- package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js +1 -1
- package/dist/test/mergeTree.markRangeRemoved.deltaCallback.spec.js.map +1 -1
- package/dist/test/mergeTree.markRangeRemoved.spec.js +1 -1
- package/dist/test/mergeTree.markRangeRemoved.spec.js.map +1 -1
- package/dist/test/mergeTree.walk.spec.js +2 -2
- package/dist/test/mergeTree.walk.spec.js.map +1 -1
- package/dist/test/mergeTree.zamboni.spec.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.d.ts +2 -2
- package/dist/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/dist/test/mergeTreeOperationRunner.js +3 -3
- package/dist/test/mergeTreeOperationRunner.js.map +1 -1
- package/dist/test/mergeTreeOperationRunner.spec.js.map +1 -1
- package/dist/test/obliterate.concurrent.spec.js +2 -2
- package/dist/test/obliterate.concurrent.spec.js.map +1 -1
- package/dist/test/obliterate.deltaCallback.spec.js +1 -1
- package/dist/test/obliterate.deltaCallback.spec.js.map +1 -1
- package/dist/test/obliterate.partialLength.spec.js.map +1 -1
- package/dist/test/obliterate.reconnect.spec.js.map +1 -1
- package/dist/test/obliterate.spec.js.map +1 -1
- package/dist/test/ordinal.spec.d.ts +4 -0
- package/dist/test/ordinal.spec.d.ts.map +1 -1
- package/dist/test/ordinal.spec.js +4 -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.map +1 -1
- package/dist/test/reconnectHelper.d.ts +1 -1
- package/dist/test/reconnectHelper.d.ts.map +1 -1
- package/dist/test/reconnectHelper.js.map +1 -1
- package/dist/test/resetPendingSegmentsToOp.spec.js +1 -1
- package/dist/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/dist/test/revertibleFarm.spec.js +1 -1
- 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 +1 -1
- package/dist/test/revertibles.spec.js.map +1 -1
- package/dist/test/segmentGroupCollection.spec.js.map +1 -1
- package/dist/test/snapshot.spec.js +1 -1
- package/dist/test/snapshot.spec.js.map +1 -1
- package/dist/test/snapshot.utils.d.ts +1 -1
- package/dist/test/snapshot.utils.d.ts.map +1 -1
- package/dist/test/snapshot.utils.js +3 -3
- package/dist/test/snapshot.utils.js.map +1 -1
- package/dist/test/snapshotlegacy.spec.js +8 -8
- package/dist/test/snapshotlegacy.spec.js.map +1 -1
- package/dist/test/sortedSegmentSet.spec.js +2 -2
- package/dist/test/sortedSegmentSet.spec.js.map +1 -1
- package/dist/test/testClient.d.ts +5 -5
- package/dist/test/testClient.d.ts.map +1 -1
- package/dist/test/testClient.js +11 -11
- package/dist/test/testClient.js.map +1 -1
- package/dist/test/testClientLogger.d.ts +1 -1
- package/dist/test/testClientLogger.d.ts.map +1 -1
- package/dist/test/testClientLogger.js +10 -8
- package/dist/test/testClientLogger.js.map +1 -1
- package/dist/test/testSerializer.d.ts.map +1 -1
- package/dist/test/testSerializer.js +2 -2
- package/dist/test/testSerializer.js.map +1 -1
- package/dist/test/testServer.d.ts +1 -1
- package/dist/test/testServer.d.ts.map +1 -1
- package/dist/test/testServer.js +4 -4
- package/dist/test/testServer.js.map +1 -1
- package/dist/test/testUtils.d.ts +5 -5
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +3 -3
- package/dist/test/testUtils.js.map +1 -1
- package/dist/test/text.d.ts +1 -1
- package/dist/test/text.d.ts.map +1 -1
- package/dist/test/text.js.map +1 -1
- 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 +2 -2
- package/dist/test/wordUnitTests.spec.js.map +1 -1
- package/dist/textSegment.d.ts.map +1 -1
- package/dist/textSegment.js +2 -2
- package/dist/textSegment.js.map +1 -1
- package/dist/zamboni.d.ts +2 -2
- package/dist/zamboni.d.ts.map +1 -1
- package/dist/zamboni.js.map +1 -1
- package/internal.d.ts +11 -0
- package/legacy.d.ts +11 -0
- package/lib/MergeTreeTextHelper.d.ts.map +1 -1
- package/lib/MergeTreeTextHelper.js.map +1 -1
- package/lib/attributionCollection.d.ts +1 -1
- package/lib/attributionCollection.d.ts.map +1 -1
- package/lib/attributionCollection.js +1 -1
- package/lib/attributionCollection.js.map +1 -1
- package/lib/attributionPolicy.d.ts +2 -2
- package/lib/attributionPolicy.d.ts.map +1 -1
- package/lib/attributionPolicy.js +4 -4
- package/lib/attributionPolicy.js.map +1 -1
- package/lib/client.d.ts +8 -8
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +14 -25
- package/lib/client.js.map +1 -1
- package/lib/collections/list.js +1 -1
- package/lib/collections/list.js.map +1 -1
- package/lib/endOfTreeSegment.d.ts +5 -5
- package/lib/endOfTreeSegment.d.ts.map +1 -1
- package/lib/endOfTreeSegment.js +2 -2
- package/lib/endOfTreeSegment.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/legacy.d.ts +76 -0
- package/lib/localReference.d.ts.map +1 -1
- package/lib/localReference.js +2 -2
- package/lib/localReference.js.map +1 -1
- package/lib/mergeTree.d.ts +8 -8
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +23 -36
- package/lib/mergeTree.js.map +1 -1
- package/lib/mergeTreeDeltaCallback.d.ts +1 -1
- package/lib/mergeTreeDeltaCallback.d.ts.map +1 -1
- package/lib/mergeTreeDeltaCallback.js +4 -0
- package/lib/mergeTreeDeltaCallback.js.map +1 -1
- package/lib/mergeTreeNodeWalk.d.ts +3 -3
- package/lib/mergeTreeNodeWalk.d.ts.map +1 -1
- package/lib/mergeTreeNodeWalk.js.map +1 -1
- package/lib/mergeTreeNodes.d.ts +37 -55
- package/lib/mergeTreeNodes.d.ts.map +1 -1
- package/lib/mergeTreeNodes.js +28 -8
- package/lib/mergeTreeNodes.js.map +1 -1
- package/lib/opBuilder.d.ts +1 -1
- package/lib/opBuilder.d.ts.map +1 -1
- package/lib/opBuilder.js.map +1 -1
- package/lib/ordinal.js +1 -1
- package/lib/ordinal.js.map +1 -1
- package/lib/partialLengths.d.ts +6 -6
- package/lib/partialLengths.d.ts.map +1 -1
- package/lib/partialLengths.js +3 -3
- package/lib/partialLengths.js.map +1 -1
- package/lib/public.d.ts +12 -0
- package/lib/revertibles.d.ts +1 -1
- package/lib/revertibles.d.ts.map +1 -1
- package/lib/revertibles.js +4 -4
- package/lib/revertibles.js.map +1 -1
- package/lib/segmentPropertiesManager.d.ts.map +1 -1
- package/lib/segmentPropertiesManager.js +1 -1
- package/lib/segmentPropertiesManager.js.map +1 -1
- package/lib/snapshotChunks.d.ts +2 -2
- package/lib/snapshotChunks.d.ts.map +1 -1
- package/lib/snapshotChunks.js.map +1 -1
- package/lib/snapshotLoader.d.ts +2 -2
- package/lib/snapshotLoader.d.ts.map +1 -1
- package/lib/snapshotLoader.js +2 -2
- package/lib/snapshotLoader.js.map +1 -1
- package/lib/snapshotV1.d.ts +3 -3
- package/lib/snapshotV1.d.ts.map +1 -1
- package/lib/snapshotV1.js +5 -5
- package/lib/snapshotV1.js.map +1 -1
- package/lib/snapshotlegacy.d.ts +4 -4
- package/lib/snapshotlegacy.d.ts.map +1 -1
- package/lib/snapshotlegacy.js +3 -4
- package/lib/snapshotlegacy.js.map +1 -1
- package/lib/test/Insertion.perf.spec.js +1 -1
- package/lib/test/Insertion.perf.spec.js.map +1 -1
- package/lib/test/PartialLengths.perf.spec.js +2 -2
- package/lib/test/PartialLengths.perf.spec.js.map +1 -1
- package/lib/test/Removal.perf.spec.js +2 -2
- package/lib/test/Removal.perf.spec.js.map +1 -1
- package/lib/test/Snapshot.perf.spec.js +2 -2
- package/lib/test/Snapshot.perf.spec.js.map +1 -1
- package/lib/test/attributionCollection.perf.spec.js +4 -4
- package/lib/test/attributionCollection.perf.spec.js.map +1 -1
- package/lib/test/attributionCollection.spec.js.map +1 -1
- package/lib/test/attributionPolicy.spec.js.map +1 -1
- package/lib/test/beastTest.spec.d.ts.map +1 -1
- package/lib/test/beastTest.spec.js +8 -8
- package/lib/test/beastTest.spec.js.map +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.map +1 -1
- package/lib/test/client.applyMsg.spec.js +3 -3
- package/lib/test/client.applyMsg.spec.js.map +1 -1
- package/lib/test/client.applyStashedOpFarm.spec.d.ts +1 -1
- package/lib/test/client.applyStashedOpFarm.spec.d.ts.map +1 -1
- package/lib/test/client.applyStashedOpFarm.spec.js +1 -1
- package/lib/test/client.applyStashedOpFarm.spec.js.map +1 -1
- package/lib/test/client.attributionFarm.spec.d.ts.map +1 -1
- package/lib/test/client.attributionFarm.spec.js +2 -2
- package/lib/test/client.attributionFarm.spec.js.map +1 -1
- package/lib/test/client.conflictFarm.spec.d.ts.map +1 -1
- package/lib/test/client.conflictFarm.spec.js +1 -1
- package/lib/test/client.conflictFarm.spec.js.map +1 -1
- package/lib/test/client.getPosition.spec.js.map +1 -1
- package/lib/test/client.localReference.spec.js +5 -5
- package/lib/test/client.localReference.spec.js.map +1 -1
- package/lib/test/client.localReferenceFarm.spec.js +2 -2
- package/lib/test/client.localReferenceFarm.spec.js.map +1 -1
- package/lib/test/client.rebasePosition.spec.js.map +1 -1
- package/lib/test/client.reconnectFarm.spec.d.ts +1 -1
- package/lib/test/client.reconnectFarm.spec.d.ts.map +1 -1
- package/lib/test/client.reconnectFarm.spec.js +2 -2
- package/lib/test/client.reconnectFarm.spec.js.map +1 -1
- package/lib/test/client.replay.spec.js +3 -3
- package/lib/test/client.replay.spec.js.map +1 -1
- package/lib/test/client.rollback.spec.js +1 -1
- package/lib/test/client.rollback.spec.js.map +1 -1
- package/lib/test/client.rollbackFarm.spec.js +1 -1
- package/lib/test/client.rollbackFarm.spec.js.map +1 -1
- package/lib/test/client.searchForMarker.spec.js +2 -2
- package/lib/test/client.searchForMarker.spec.js.map +1 -1
- package/lib/test/client.walkSegments.spec.js.map +1 -1
- package/lib/test/collections.list.spec.js.map +1 -1
- package/lib/test/createInsertOnlyAttributionPolicy.spec.js.map +1 -1
- package/lib/test/mergeTree.annotate.deltaCallback.spec.js +3 -3
- 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 +3 -3
- 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.map +1 -1
- package/lib/test/mergeTree.walk.spec.js +2 -2
- 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 +2 -2
- package/lib/test/mergeTreeOperationRunner.d.ts.map +1 -1
- package/lib/test/mergeTreeOperationRunner.js +3 -3
- package/lib/test/mergeTreeOperationRunner.js.map +1 -1
- package/lib/test/mergeTreeOperationRunner.spec.js.map +1 -1
- package/lib/test/obliterate.concurrent.spec.js +1 -1
- package/lib/test/obliterate.concurrent.spec.js.map +1 -1
- package/lib/test/obliterate.deltaCallback.spec.js +1 -1
- package/lib/test/obliterate.deltaCallback.spec.js.map +1 -1
- package/lib/test/obliterate.partialLength.spec.js.map +1 -1
- package/lib/test/obliterate.reconnect.spec.js.map +1 -1
- package/lib/test/obliterate.spec.js.map +1 -1
- package/lib/test/ordinal.spec.d.ts +4 -0
- package/lib/test/ordinal.spec.d.ts.map +1 -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.map +1 -1
- package/lib/test/reconnectHelper.d.ts +1 -1
- package/lib/test/reconnectHelper.d.ts.map +1 -1
- package/lib/test/reconnectHelper.js +1 -1
- package/lib/test/reconnectHelper.js.map +1 -1
- package/lib/test/resetPendingSegmentsToOp.spec.js.map +1 -1
- package/lib/test/revertibleFarm.spec.js +3 -3
- 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 +2 -2
- package/lib/test/revertibles.spec.js.map +1 -1
- package/lib/test/segmentGroupCollection.spec.js.map +1 -1
- package/lib/test/snapshot.spec.js +2 -2
- package/lib/test/snapshot.spec.js.map +1 -1
- package/lib/test/snapshot.utils.d.ts +1 -1
- package/lib/test/snapshot.utils.d.ts.map +1 -1
- package/lib/test/snapshot.utils.js +2 -2
- package/lib/test/snapshot.utils.js.map +1 -1
- package/lib/test/snapshotlegacy.spec.js +4 -4
- package/lib/test/snapshotlegacy.spec.js.map +1 -1
- package/lib/test/sortedSegmentSet.spec.js +2 -2
- package/lib/test/sortedSegmentSet.spec.js.map +1 -1
- package/lib/test/testClient.d.ts +5 -5
- package/lib/test/testClient.d.ts.map +1 -1
- package/lib/test/testClient.js +7 -7
- package/lib/test/testClient.js.map +1 -1
- package/lib/test/testClientLogger.d.ts +1 -1
- package/lib/test/testClientLogger.d.ts.map +1 -1
- package/lib/test/testClientLogger.js +9 -7
- package/lib/test/testClientLogger.js.map +1 -1
- package/lib/test/testSerializer.d.ts.map +1 -1
- package/lib/test/testSerializer.js +1 -1
- package/lib/test/testSerializer.js.map +1 -1
- package/lib/test/testServer.d.ts +1 -1
- package/lib/test/testServer.d.ts.map +1 -1
- package/lib/test/testServer.js +2 -2
- package/lib/test/testServer.js.map +1 -1
- package/lib/test/testUtils.d.ts +5 -5
- package/lib/test/testUtils.d.ts.map +1 -1
- package/lib/test/testUtils.js +3 -3
- package/lib/test/testUtils.js.map +1 -1
- package/lib/test/text.d.ts +1 -1
- package/lib/test/text.d.ts.map +1 -1
- package/lib/test/text.js.map +1 -1
- 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 +2 -2
- package/lib/test/wordUnitTests.spec.js.map +1 -1
- package/lib/textSegment.d.ts.map +1 -1
- package/lib/textSegment.js +1 -1
- package/lib/textSegment.js.map +1 -1
- package/lib/zamboni.d.ts +2 -2
- package/lib/zamboni.d.ts.map +1 -1
- package/lib/zamboni.js.map +1 -1
- package/package.json +37 -58
- package/src/MergeTreeTextHelper.ts +1 -1
- package/src/attributionCollection.ts +4 -3
- package/src/attributionPolicy.ts +7 -6
- package/src/client.ts +32 -45
- package/src/collections/list.ts +1 -1
- package/src/endOfTreeSegment.ts +5 -4
- package/src/index.ts +5 -1
- package/src/localReference.ts +4 -3
- package/src/mergeTree.ts +66 -84
- package/src/mergeTreeDeltaCallback.ts +3 -1
- package/src/mergeTreeNodeWalk.ts +6 -6
- package/src/mergeTreeNodes.ts +59 -61
- package/src/opBuilder.ts +3 -3
- package/src/ordinal.ts +1 -1
- package/src/partialLengths.ts +11 -10
- package/src/revertibles.ts +6 -5
- package/src/segmentPropertiesManager.ts +3 -2
- package/src/snapshotChunks.ts +3 -2
- package/src/snapshotLoader.ts +10 -12
- package/src/snapshotV1.ts +15 -12
- package/src/snapshotlegacy.ts +8 -6
- package/src/textSegment.ts +2 -1
- package/src/zamboni.ts +7 -7
- package/api-extractor-cjs.json +0 -8
- package/dist/merge-tree-alpha.d.ts +0 -1558
- package/dist/merge-tree-beta.d.ts +0 -230
- package/dist/merge-tree-public.d.ts +0 -230
- package/dist/merge-tree-untrimmed.d.ts +0 -1894
- package/lib/merge-tree-alpha.d.ts +0 -1558
- package/lib/merge-tree-beta.d.ts +0 -230
- package/lib/merge-tree-public.d.ts +0 -230
- package/lib/merge-tree-untrimmed.d.ts +0 -1894
- package/lib/test/types/validateMergeTreePrevious.generated.d.ts +0 -2
- package/lib/test/types/validateMergeTreePrevious.generated.d.ts.map +0 -1
- package/lib/test/types/validateMergeTreePrevious.generated.js +0 -228
- package/lib/test/types/validateMergeTreePrevious.generated.js.map +0 -1
- /package/{dist → lib}/tsdoc-metadata.json +0 -0
package/dist/mergeTree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTree.d.ts","sourceRoot":"","sources":["../src/mergeTree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAU,IAAI,EAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"mergeTree.d.ts","sourceRoot":"","sources":["../src/mergeTree.ts"],"names":[],"mappings":"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"}
|
package/dist/mergeTree.js
CHANGED
|
@@ -7,13 +7,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.MergeTree = exports.getSlideToSegoff = exports.findRootMergeBlock = void 0;
|
|
8
8
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
9
9
|
/* eslint-disable no-bitwise */
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const internal_1 = require("@fluidframework/core-utils/internal");
|
|
11
|
+
const internal_2 = require("@fluidframework/telemetry-utils/internal");
|
|
12
12
|
const index_js_1 = require("./collections/index.js");
|
|
13
13
|
const constants_js_1 = require("./constants.js");
|
|
14
|
+
const endOfTreeSegment_js_1 = require("./endOfTreeSegment.js");
|
|
14
15
|
const localReference_js_1 = require("./localReference.js");
|
|
15
|
-
const mergeTreeNodes_js_1 = require("./mergeTreeNodes.js");
|
|
16
16
|
const mergeTreeDeltaCallback_js_1 = require("./mergeTreeDeltaCallback.js");
|
|
17
|
+
const mergeTreeNodeWalk_js_1 = require("./mergeTreeNodeWalk.js");
|
|
18
|
+
const mergeTreeNodes_js_1 = require("./mergeTreeNodes.js");
|
|
17
19
|
const opBuilder_js_1 = require("./opBuilder.js");
|
|
18
20
|
const ops_js_1 = require("./ops.js");
|
|
19
21
|
const partialLengths_js_1 = require("./partialLengths.js");
|
|
@@ -21,9 +23,7 @@ const partialLengths_js_1 = require("./partialLengths.js");
|
|
|
21
23
|
const properties_js_1 = require("./properties.js");
|
|
22
24
|
const referencePositions_js_1 = require("./referencePositions.js");
|
|
23
25
|
const segmentPropertiesManager_js_1 = require("./segmentPropertiesManager.js");
|
|
24
|
-
const mergeTreeNodeWalk_js_1 = require("./mergeTreeNodeWalk.js");
|
|
25
26
|
const zamboni_js_1 = require("./zamboni.js");
|
|
26
|
-
const endOfTreeSegment_js_1 = require("./endOfTreeSegment.js");
|
|
27
27
|
function wasRemovedAfter(seg, seq) {
|
|
28
28
|
return (seg.removedSeq !== constants_js_1.UnassignedSequenceNumber &&
|
|
29
29
|
(seg.removedSeq === undefined || seg.removedSeq > seq));
|
|
@@ -84,18 +84,6 @@ function addTileIfNotPresent(tile, tiles) {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
class HierMergeBlock extends mergeTreeNodes_js_1.MergeBlock {
|
|
88
|
-
constructor(childCount) {
|
|
89
|
-
super(childCount);
|
|
90
|
-
// eslint-disable-next-line import/no-deprecated
|
|
91
|
-
this.rightmostTiles = (0, properties_js_1.createMap)();
|
|
92
|
-
// eslint-disable-next-line import/no-deprecated
|
|
93
|
-
this.leftmostTiles = (0, properties_js_1.createMap)();
|
|
94
|
-
}
|
|
95
|
-
hierBlock() {
|
|
96
|
-
return this;
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
87
|
function findRootMergeBlock(segmentOrNode) {
|
|
100
88
|
if (segmentOrNode === undefined) {
|
|
101
89
|
return undefined;
|
|
@@ -209,7 +197,7 @@ class MergeTree {
|
|
|
209
197
|
this.collabWindow = new mergeTreeNodes_js_1.CollaborationWindow();
|
|
210
198
|
// eslint-disable-next-line import/no-deprecated
|
|
211
199
|
this.pendingSegments = new index_js_1.DoublyLinkedList();
|
|
212
|
-
this.segmentsToScour = new
|
|
200
|
+
this.segmentsToScour = new internal_1.Heap(LRUSegmentComparer);
|
|
213
201
|
/**
|
|
214
202
|
* Whether or not all blocks in the mergeTree currently have information about local partial lengths computed.
|
|
215
203
|
* This information is only necessary on reconnect, and otherwise costly to bookkeep.
|
|
@@ -274,7 +262,7 @@ class MergeTree {
|
|
|
274
262
|
value.mergeTree = this;
|
|
275
263
|
}
|
|
276
264
|
makeBlock(childCount) {
|
|
277
|
-
const block = new HierMergeBlock(childCount);
|
|
265
|
+
const block = new mergeTreeNodes_js_1.HierMergeBlock(childCount);
|
|
278
266
|
block.ordinal = "";
|
|
279
267
|
return block;
|
|
280
268
|
}
|
|
@@ -303,8 +291,8 @@ class MergeTree {
|
|
|
303
291
|
return segment.cachedLength;
|
|
304
292
|
}
|
|
305
293
|
}
|
|
306
|
-
(0,
|
|
307
|
-
(0,
|
|
294
|
+
(0, internal_1.assert)(refSeq !== undefined, 0x398 /* localSeq provided for local length without refSeq */);
|
|
295
|
+
(0, internal_1.assert)(segment.seq !== undefined, 0x399 /* segment with no seq in mergeTree */);
|
|
308
296
|
const { seq, removedSeq, localRemovedSeq, movedSeq, localMovedSeq } = segment;
|
|
309
297
|
if (seq !== constants_js_1.UnassignedSequenceNumber) {
|
|
310
298
|
// inserted remotely
|
|
@@ -322,7 +310,7 @@ class MergeTree {
|
|
|
322
310
|
return segment.cachedLength;
|
|
323
311
|
}
|
|
324
312
|
else {
|
|
325
|
-
(0,
|
|
313
|
+
(0, internal_1.assert)(segment.localSeq !== undefined, 0x39a /* unacked segment with undefined localSeq */);
|
|
326
314
|
// inserted locally, still un-acked
|
|
327
315
|
if (segment.localSeq > localSeq ||
|
|
328
316
|
(localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
|
|
@@ -345,7 +333,7 @@ class MergeTree {
|
|
|
345
333
|
}
|
|
346
334
|
reloadFromSegments(segments) {
|
|
347
335
|
// This code assumes that a later call to `startCollaboration()` will initialize partial lengths.
|
|
348
|
-
(0,
|
|
336
|
+
(0, internal_1.assert)(!this.collabWindow.collaborating, 0x049 /* "Trying to reload from segments while collaborating!" */);
|
|
349
337
|
const maxChildren = mergeTreeNodes_js_1.MaxNodesInBlock - 1;
|
|
350
338
|
// Starting with the leaf segments, recursively builds the B-Tree layer by layer from the bottom up.
|
|
351
339
|
const buildMergeBlock = (nodes) => {
|
|
@@ -431,7 +419,7 @@ class MergeTree {
|
|
|
431
419
|
return totalOffset;
|
|
432
420
|
}
|
|
433
421
|
getContainingSegment(pos, refSeq, clientId, localSeq) {
|
|
434
|
-
(0,
|
|
422
|
+
(0, internal_1.assert)(localSeq === undefined || clientId === this.collabWindow.clientId, 0x39b /* localSeq provided for non-local client */);
|
|
435
423
|
let segment;
|
|
436
424
|
let offset;
|
|
437
425
|
const leaf = (leafSeg, segpos, _refSeq, _clientId, start) => {
|
|
@@ -534,7 +522,7 @@ class MergeTree {
|
|
|
534
522
|
const forwardSegmentCache = new Map();
|
|
535
523
|
const backwardSegmentCache = new Map();
|
|
536
524
|
for (const segment of segments) {
|
|
537
|
-
(0,
|
|
525
|
+
(0, internal_1.assert)(isRemovedAndAckedOrMovedAndAcked(segment), 0x2f1 /* slideReferences from a segment which has not been removed and acked */);
|
|
538
526
|
if (segment.localRefs === undefined || segment.localRefs.empty) {
|
|
539
527
|
continue;
|
|
540
528
|
}
|
|
@@ -630,9 +618,9 @@ class MergeTree {
|
|
|
630
618
|
}
|
|
631
619
|
}
|
|
632
620
|
setMinSeq(minSeq) {
|
|
633
|
-
(0,
|
|
621
|
+
(0, internal_1.assert)(minSeq <= this.collabWindow.currentSeq, 0x04e /* "Trying to set minSeq above currentSeq of collab window!" */);
|
|
634
622
|
// Only move forward
|
|
635
|
-
(0,
|
|
623
|
+
(0, internal_1.assert)(this.collabWindow.minSeq <= minSeq, 0x04f /* "minSeq of collab window > target minSeq!" */);
|
|
636
624
|
if (minSeq > this.collabWindow.minSeq) {
|
|
637
625
|
this.collabWindow.minSeq = minSeq;
|
|
638
626
|
const firstMoveSeqIdx = this.moveSeqs.findIndex((seq) => seq >= minSeq);
|
|
@@ -679,19 +667,19 @@ class MergeTree {
|
|
|
679
667
|
if (segWithParent?.parent === undefined) {
|
|
680
668
|
return undefined;
|
|
681
669
|
}
|
|
682
|
-
(0, mergeTreeNodeWalk_js_1.depthFirstNodeWalk)(segWithParent.parent, segWithParent, (
|
|
683
|
-
if (
|
|
684
|
-
if (mergeTreeNodes_js_1.Marker.is(
|
|
685
|
-
foundMarker =
|
|
670
|
+
(0, mergeTreeNodeWalk_js_1.depthFirstNodeWalk)(segWithParent.parent, segWithParent, (node) => {
|
|
671
|
+
if (node.isLeaf()) {
|
|
672
|
+
if (mergeTreeNodes_js_1.Marker.is(node) && (0, referencePositions_js_1.refHasTileLabel)(node, markerLabel)) {
|
|
673
|
+
foundMarker = node;
|
|
686
674
|
}
|
|
687
675
|
}
|
|
688
676
|
else {
|
|
689
|
-
|
|
677
|
+
(0, internal_1.assert)(node.hierBlock(), 0x90b /* must be hierBlock */);
|
|
690
678
|
const marker = forwards
|
|
691
|
-
?
|
|
692
|
-
:
|
|
679
|
+
? node.leftmostTiles[markerLabel]
|
|
680
|
+
: node.rightmostTiles[markerLabel];
|
|
693
681
|
if (marker !== undefined) {
|
|
694
|
-
(0,
|
|
682
|
+
(0, internal_1.assert)(marker.isLeaf() && mergeTreeNodes_js_1.Marker.is(marker), 0x751 /* Object returned is not a valid marker */);
|
|
695
683
|
foundMarker = marker;
|
|
696
684
|
}
|
|
697
685
|
}
|
|
@@ -953,7 +941,7 @@ class MergeTree {
|
|
|
953
941
|
});
|
|
954
942
|
if (newSegment.parent === undefined) {
|
|
955
943
|
// Indicates an attempt to insert past the end of the merge-tree's content.
|
|
956
|
-
const errorConstructor = localSeq !== undefined ?
|
|
944
|
+
const errorConstructor = localSeq !== undefined ? internal_2.UsageError : internal_2.DataProcessingError;
|
|
957
945
|
throw new errorConstructor("MergeTree insert failed", {
|
|
958
946
|
currentSeq: this.collabWindow.currentSeq,
|
|
959
947
|
minSeq: this.collabWindow.minSeq,
|
|
@@ -1004,7 +992,7 @@ class MergeTree {
|
|
|
1004
992
|
_movedSeq = movedSeq;
|
|
1005
993
|
const clientIdIdx = left.movedSeqs?.indexOf(movedSeq) ?? -1;
|
|
1006
994
|
const movedClientId = left.movedClientIds?.[clientIdIdx];
|
|
1007
|
-
(0,
|
|
995
|
+
(0, internal_1.assert)(movedClientId !== undefined, 0x869 /* expected client id to exist */);
|
|
1008
996
|
movedClientIds = [movedClientId];
|
|
1009
997
|
return false;
|
|
1010
998
|
}
|
|
@@ -1015,7 +1003,7 @@ class MergeTree {
|
|
|
1015
1003
|
_localMovedSeq = localMovedSeq;
|
|
1016
1004
|
const clientIdIdx = left.movedSeqs?.indexOf(constants_js_1.UnassignedSequenceNumber) ?? -1;
|
|
1017
1005
|
const movedClientId = left.movedClientIds?.[clientIdIdx];
|
|
1018
|
-
(0,
|
|
1006
|
+
(0, internal_1.assert)(movedClientId !== undefined, 0x86a /* expected client id to exist */);
|
|
1019
1007
|
movedClientIds = [movedClientId];
|
|
1020
1008
|
return false;
|
|
1021
1009
|
}
|
|
@@ -1034,7 +1022,7 @@ class MergeTree {
|
|
|
1034
1022
|
moveUpperBound = Number.POSITIVE_INFINITY;
|
|
1035
1023
|
(0, mergeTreeNodeWalk_js_1.forwardExcursion)(newSegment, findRightMovedSegment);
|
|
1036
1024
|
if (_localMovedSeq !== undefined || _movedSeq !== undefined) {
|
|
1037
|
-
(0,
|
|
1025
|
+
(0, internal_1.assert)(movedClientIds !== undefined, 0x86b /* movedClientIds should be set if local/moved seq is set */);
|
|
1038
1026
|
const moveInfo = {
|
|
1039
1027
|
movedClientIds,
|
|
1040
1028
|
movedSeq: _movedSeq ?? constants_js_1.UnassignedSequenceNumber,
|
|
@@ -1045,7 +1033,7 @@ class MergeTree {
|
|
|
1045
1033
|
markSegmentMoved(newSegment, moveInfo);
|
|
1046
1034
|
if (moveInfo.localMovedSeq !== undefined) {
|
|
1047
1035
|
const movedSegmentGroup = this.locallyMovedSegments.get(moveInfo.localMovedSeq);
|
|
1048
|
-
(0,
|
|
1036
|
+
(0, internal_1.assert)(movedSegmentGroup !== undefined, 0x86c /* expected segment group to exist */);
|
|
1049
1037
|
this.addToPendingList(newSegment, movedSegmentGroup, localSeq);
|
|
1050
1038
|
}
|
|
1051
1039
|
if (newSegment.parent) {
|
|
@@ -1104,7 +1092,7 @@ class MergeTree {
|
|
|
1104
1092
|
// will be removed, so should just be skipped for now
|
|
1105
1093
|
continue;
|
|
1106
1094
|
}
|
|
1107
|
-
(0,
|
|
1095
|
+
(0, internal_1.assert)(len >= 0, 0x4bc /* Length should not be negative */);
|
|
1108
1096
|
if (_pos < len || (_pos === len && this.breakTie(_pos, child, seq))) {
|
|
1109
1097
|
// Found entry containing pos
|
|
1110
1098
|
if (!child.isLeaf()) {
|
|
@@ -1228,7 +1216,7 @@ class MergeTree {
|
|
|
1228
1216
|
// eslint-disable-next-line import/no-deprecated
|
|
1229
1217
|
let segmentGroup;
|
|
1230
1218
|
const annotateSegment = (segment) => {
|
|
1231
|
-
(0,
|
|
1219
|
+
(0, internal_1.assert)(!mergeTreeNodes_js_1.Marker.is(segment) ||
|
|
1232
1220
|
!(mergeTreeNodes_js_1.reservedMarkerIdKey in props) ||
|
|
1233
1221
|
props.markerId === segment.properties?.markerId, 0x5ad /* Cannot change the markerId of an existing marker */);
|
|
1234
1222
|
const propertyDeltas = segment.addProperties(props, seq, this.collabWindow.collaborating, rollback);
|
|
@@ -1261,7 +1249,7 @@ class MergeTree {
|
|
|
1261
1249
|
}
|
|
1262
1250
|
obliterateRange(start, end, refSeq, clientId, seq, overwrite = false, opArgs) {
|
|
1263
1251
|
if (!this.options?.mergeTreeEnableObliterate) {
|
|
1264
|
-
throw new
|
|
1252
|
+
throw new internal_2.UsageError("Attempted to send obliterate op without enabling feature flag.");
|
|
1265
1253
|
}
|
|
1266
1254
|
this.ensureIntervalBoundary(start, refSeq, clientId);
|
|
1267
1255
|
this.ensureIntervalBoundary(end, refSeq, clientId);
|
|
@@ -1456,8 +1444,8 @@ class MergeTree {
|
|
|
1456
1444
|
}
|
|
1457
1445
|
pendingSegmentGroup.segments.forEach((segment) => {
|
|
1458
1446
|
const segmentSegmentGroup = segment.segmentGroups?.pop?.();
|
|
1459
|
-
(0,
|
|
1460
|
-
(0,
|
|
1447
|
+
(0, internal_1.assert)(segmentSegmentGroup === pendingSegmentGroup, 0x3ee /* Unexpected segmentGroup in segment */);
|
|
1448
|
+
(0, internal_1.assert)(segment.removedClientIds !== undefined &&
|
|
1461
1449
|
segment.removedClientIds[0] === this.collabWindow.clientId, 0x39d /* Rollback segment removedClientId does not match local client */);
|
|
1462
1450
|
segment.removedClientIds = undefined;
|
|
1463
1451
|
segment.removedSeq = undefined;
|
|
@@ -1484,7 +1472,7 @@ class MergeTree {
|
|
|
1484
1472
|
let i = 0;
|
|
1485
1473
|
for (const segment of pendingSegmentGroup.segments) {
|
|
1486
1474
|
const segmentSegmentGroup = segment.segmentGroups.pop?.();
|
|
1487
|
-
(0,
|
|
1475
|
+
(0, internal_1.assert)(segmentSegmentGroup === pendingSegmentGroup, 0x3ef /* Unexpected segmentGroup in segment */);
|
|
1488
1476
|
const start = this.findRollbackPosition(segment);
|
|
1489
1477
|
if (op.type === ops_js_1.MergeTreeDeltaType.INSERT) {
|
|
1490
1478
|
segment.seq = constants_js_1.UniversalSequenceNumber;
|
|
@@ -1539,7 +1527,7 @@ class MergeTree {
|
|
|
1539
1527
|
isRemovedAndAckedOrMovedAndAcked(_segment) &&
|
|
1540
1528
|
!(0, referencePositions_js_1.refTypeIncludesFlag)(refType, ops_js_1.ReferenceType.SlideOnRemove | ops_js_1.ReferenceType.Transient) &&
|
|
1541
1529
|
_segment.endpointType === undefined) {
|
|
1542
|
-
throw new
|
|
1530
|
+
throw new internal_2.UsageError("Can only create SlideOnRemove or Transient local reference position on a removed or obliterated segment");
|
|
1543
1531
|
}
|
|
1544
1532
|
let segment;
|
|
1545
1533
|
if (_segment === "start") {
|
|
@@ -1579,7 +1567,7 @@ class MergeTree {
|
|
|
1579
1567
|
affectedSegments.insertAfter(lastLocalSegment, segmentToSlide.data);
|
|
1580
1568
|
}
|
|
1581
1569
|
else if (isRemoved(segmentToSlide.data)) {
|
|
1582
|
-
(0,
|
|
1570
|
+
(0, internal_1.assert)(segmentToSlide.data.localRemovedSeq !== undefined, 0x54d /* Removed segment that hasnt had its removal acked should be locally removed */);
|
|
1583
1571
|
// Slide each locally removed item past all segments that have localSeq > lremoveItem.localSeq
|
|
1584
1572
|
// but not past remotely removed segments;
|
|
1585
1573
|
let cur = segmentToSlide;
|
|
@@ -1704,21 +1692,20 @@ class MergeTree {
|
|
|
1704
1692
|
}
|
|
1705
1693
|
}
|
|
1706
1694
|
else {
|
|
1707
|
-
|
|
1695
|
+
(0, internal_1.assert)(node.hierBlock(), 0x90c /* must be hier block */);
|
|
1708
1696
|
// eslint-disable-next-line import/no-deprecated
|
|
1709
|
-
(0, properties_js_1.extend)(rightmostTiles,
|
|
1697
|
+
(0, properties_js_1.extend)(rightmostTiles, node.rightmostTiles);
|
|
1710
1698
|
// eslint-disable-next-line import/no-deprecated
|
|
1711
|
-
(0, properties_js_1.extendIfUndefined)(leftmostTiles,
|
|
1699
|
+
(0, properties_js_1.extendIfUndefined)(leftmostTiles, node.leftmostTiles);
|
|
1712
1700
|
}
|
|
1713
1701
|
}
|
|
1714
1702
|
blockUpdate(block) {
|
|
1715
1703
|
let len;
|
|
1716
|
-
|
|
1717
|
-
if (hierBlock) {
|
|
1704
|
+
if (block.hierBlock()) {
|
|
1718
1705
|
// eslint-disable-next-line import/no-deprecated
|
|
1719
|
-
|
|
1706
|
+
block.rightmostTiles = (0, properties_js_1.createMap)();
|
|
1720
1707
|
// eslint-disable-next-line import/no-deprecated
|
|
1721
|
-
|
|
1708
|
+
block.leftmostTiles = (0, properties_js_1.createMap)();
|
|
1722
1709
|
}
|
|
1723
1710
|
for (let i = 0; i < block.childCount; i++) {
|
|
1724
1711
|
const child = block.children[i];
|
|
@@ -1727,8 +1714,8 @@ class MergeTree {
|
|
|
1727
1714
|
len ?? (len = 0);
|
|
1728
1715
|
len += nodeLength;
|
|
1729
1716
|
}
|
|
1730
|
-
if (hierBlock) {
|
|
1731
|
-
this.addNodeReferences(child,
|
|
1717
|
+
if (block.hierBlock()) {
|
|
1718
|
+
this.addNodeReferences(child, block.rightmostTiles, block.leftmostTiles);
|
|
1732
1719
|
}
|
|
1733
1720
|
}
|
|
1734
1721
|
block.cachedLength = len;
|