@fluidframework/merge-tree 2.13.0 → 2.20.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 +42 -0
- package/api-report/merge-tree.legacy.alpha.api.md +0 -108
- package/dist/endOfTreeSegment.d.ts.map +1 -1
- package/dist/endOfTreeSegment.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/legacy.d.ts +0 -4
- package/dist/localReference.d.ts +5 -7
- package/dist/localReference.d.ts.map +1 -1
- package/dist/localReference.js +1 -3
- package/dist/localReference.js.map +1 -1
- package/dist/mergeTree.d.ts.map +1 -1
- package/dist/mergeTree.js +2 -17
- package/dist/mergeTree.js.map +1 -1
- package/dist/mergeTreeNodes.d.ts +15 -189
- package/dist/mergeTreeNodes.d.ts.map +1 -1
- package/dist/mergeTreeNodes.js +1 -23
- package/dist/mergeTreeNodes.js.map +1 -1
- package/dist/opBuilder.d.ts +0 -5
- package/dist/opBuilder.d.ts.map +1 -1
- package/dist/opBuilder.js +0 -5
- package/dist/opBuilder.js.map +1 -1
- package/dist/package.json +2 -1
- package/dist/partialLengths.d.ts.map +1 -1
- package/dist/partialLengths.js +1 -5
- package/dist/partialLengths.js.map +1 -1
- package/dist/perspective.d.ts.map +1 -1
- package/dist/perspective.js +2 -6
- package/dist/perspective.js.map +1 -1
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +0 -3
- package/dist/revertibles.js.map +1 -1
- package/dist/segmentInfos.d.ts +0 -6
- package/dist/segmentInfos.d.ts.map +1 -1
- package/dist/segmentInfos.js.map +1 -1
- package/dist/snapshotLoader.d.ts.map +1 -1
- package/dist/snapshotLoader.js +1 -3
- package/dist/snapshotLoader.js.map +1 -1
- package/dist/test/index.d.ts +1 -1
- package/dist/test/index.d.ts.map +1 -1
- package/dist/test/index.js.map +1 -1
- package/dist/test/testClient.d.ts.map +1 -1
- package/dist/test/testClient.js +0 -1
- package/dist/test/testClient.js.map +1 -1
- package/lib/endOfTreeSegment.d.ts.map +1 -1
- package/lib/endOfTreeSegment.js.map +1 -1
- package/lib/index.d.ts +1 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/legacy.d.ts +0 -4
- package/lib/localReference.d.ts +5 -7
- package/lib/localReference.d.ts.map +1 -1
- package/lib/localReference.js +1 -3
- package/lib/localReference.js.map +1 -1
- package/lib/mergeTree.d.ts.map +1 -1
- package/lib/mergeTree.js +3 -20
- package/lib/mergeTree.js.map +1 -1
- package/lib/mergeTreeNodes.d.ts +15 -189
- package/lib/mergeTreeNodes.d.ts.map +1 -1
- package/lib/mergeTreeNodes.js +3 -25
- package/lib/mergeTreeNodes.js.map +1 -1
- package/lib/opBuilder.d.ts +0 -5
- package/lib/opBuilder.d.ts.map +1 -1
- package/lib/opBuilder.js +0 -5
- package/lib/opBuilder.js.map +1 -1
- package/lib/partialLengths.d.ts.map +1 -1
- package/lib/partialLengths.js +1 -5
- package/lib/partialLengths.js.map +1 -1
- package/lib/perspective.d.ts.map +1 -1
- package/lib/perspective.js +2 -6
- package/lib/perspective.js.map +1 -1
- package/lib/revertibles.d.ts.map +1 -1
- package/lib/revertibles.js +0 -3
- package/lib/revertibles.js.map +1 -1
- package/lib/segmentInfos.d.ts +0 -6
- package/lib/segmentInfos.d.ts.map +1 -1
- package/lib/segmentInfos.js.map +1 -1
- package/lib/snapshotLoader.d.ts.map +1 -1
- package/lib/snapshotLoader.js +1 -3
- package/lib/snapshotLoader.js.map +1 -1
- package/lib/test/index.d.ts +1 -1
- package/lib/test/index.d.ts.map +1 -1
- package/lib/test/index.js.map +1 -1
- package/lib/test/testClient.d.ts.map +1 -1
- package/lib/test/testClient.js +0 -1
- package/lib/test/testClient.js.map +1 -1
- package/package.json +76 -18
- package/src/endOfTreeSegment.ts +0 -2
- package/src/index.ts +0 -5
- package/src/localReference.ts +6 -8
- package/src/mergeTree.ts +1 -21
- package/src/mergeTreeNodes.ts +25 -223
- package/src/opBuilder.ts +0 -5
- package/src/partialLengths.ts +0 -4
- package/src/perspective.ts +0 -4
- package/src/revertibles.ts +0 -3
- package/src/segmentInfos.ts +0 -6
- package/src/snapshotLoader.ts +1 -5
package/dist/mergeTree.js
CHANGED
|
@@ -32,7 +32,6 @@ function isRemovedAndAcked(segment) {
|
|
|
32
32
|
const removalInfo = (0, segmentInfos_js_1.toRemovalInfo)(segment);
|
|
33
33
|
return removalInfo !== undefined && removalInfo.removedSeq !== constants_js_1.UnassignedSequenceNumber;
|
|
34
34
|
}
|
|
35
|
-
// eslint-disable-next-line import/no-deprecated
|
|
36
35
|
function isMovedAndAcked(segment) {
|
|
37
36
|
const moveInfo = (0, segmentInfos_js_1.toMoveInfo)(segment);
|
|
38
37
|
return moveInfo !== undefined && moveInfo.movedSeq !== constants_js_1.UnassignedSequenceNumber;
|
|
@@ -518,9 +517,7 @@ class MergeTree {
|
|
|
518
517
|
*/
|
|
519
518
|
slideAckedRemovedSegmentReferences(segments) {
|
|
520
519
|
// References are slid in groups to preserve their order.
|
|
521
|
-
// eslint-disable-next-line import/no-deprecated
|
|
522
520
|
let currentForwardSlideGroup = [];
|
|
523
|
-
// eslint-disable-next-line import/no-deprecated
|
|
524
521
|
let currentBackwardSlideGroup = [];
|
|
525
522
|
let currentForwardMaybeEndpoint;
|
|
526
523
|
let currentForwardSlideDestination;
|
|
@@ -528,9 +525,7 @@ class MergeTree {
|
|
|
528
525
|
let currentBackwardMaybeEndpoint;
|
|
529
526
|
let currentBackwardSlideDestination;
|
|
530
527
|
let currentBackwardSlideIsForward;
|
|
531
|
-
const slideGroup = (currentSlideDestination, currentSlideIsForward,
|
|
532
|
-
// eslint-disable-next-line import/no-deprecated
|
|
533
|
-
currentSlideGroup, pred, maybeEndpoint) => {
|
|
528
|
+
const slideGroup = (currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, maybeEndpoint) => {
|
|
534
529
|
if (currentSlideIsForward === undefined) {
|
|
535
530
|
return;
|
|
536
531
|
}
|
|
@@ -538,7 +533,6 @@ class MergeTree {
|
|
|
538
533
|
const endpointRefsToAdd = currentSlideGroup.map((collection) => (0, localReference_js_1.filterLocalReferencePositions)(collection, (ref) => pred(ref) && !!ref.canSlideToEndpoint));
|
|
539
534
|
if (maybeEndpoint) {
|
|
540
535
|
const endpoint = maybeEndpoint === "start" ? this.startOfTree : this.endOfTree;
|
|
541
|
-
// eslint-disable-next-line import/no-deprecated
|
|
542
536
|
const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(endpoint);
|
|
543
537
|
if (currentSlideIsForward) {
|
|
544
538
|
localRefs.addBeforeTombstones(...endpointRefsToAdd);
|
|
@@ -559,7 +553,6 @@ class MergeTree {
|
|
|
559
553
|
}
|
|
560
554
|
}
|
|
561
555
|
else {
|
|
562
|
-
// eslint-disable-next-line import/no-deprecated
|
|
563
556
|
const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(currentSlideDestination);
|
|
564
557
|
if (currentSlideIsForward) {
|
|
565
558
|
localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
|
|
@@ -569,9 +562,7 @@ class MergeTree {
|
|
|
569
562
|
}
|
|
570
563
|
}
|
|
571
564
|
};
|
|
572
|
-
const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward,
|
|
573
|
-
// eslint-disable-next-line import/no-deprecated
|
|
574
|
-
currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
|
|
565
|
+
const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
|
|
575
566
|
// avoid sliding logic if this segment doesn't have any references
|
|
576
567
|
// with the given sliding preference
|
|
577
568
|
if (!segment.localRefs || !(0, localReference_js_1.anyLocalReferencePosition)(segment.localRefs, pred)) {
|
|
@@ -1062,7 +1053,6 @@ class MergeTree {
|
|
|
1062
1053
|
}
|
|
1063
1054
|
}
|
|
1064
1055
|
if (oldest && newest?.clientId !== clientId) {
|
|
1065
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1066
1056
|
const moveInfo = {
|
|
1067
1057
|
movedClientIds,
|
|
1068
1058
|
movedSeq: oldest.seq,
|
|
@@ -1295,7 +1285,6 @@ class MergeTree {
|
|
|
1295
1285
|
this.ensureIntervalBoundary(endPos, refSeq, clientId);
|
|
1296
1286
|
let _overwrite = false;
|
|
1297
1287
|
const localOverlapWithRefs = [];
|
|
1298
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1299
1288
|
const movedSegments = [];
|
|
1300
1289
|
const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
|
|
1301
1290
|
const obliterate = {
|
|
@@ -1352,7 +1341,6 @@ class MergeTree {
|
|
|
1352
1341
|
seq !== constants_js_1.UnassignedSequenceNumber &&
|
|
1353
1342
|
(refSeq < segment.seq || segment.seq === constants_js_1.UnassignedSequenceNumber);
|
|
1354
1343
|
if (existingMoveInfo === undefined) {
|
|
1355
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1356
1344
|
const movedSeg = (0, segmentInfos_js_1.overwriteInfo)(segment, {
|
|
1357
1345
|
movedClientIds: [clientId],
|
|
1358
1346
|
movedSeq: seq,
|
|
@@ -1448,14 +1436,12 @@ class MergeTree {
|
|
|
1448
1436
|
this.ensureIntervalBoundary(start, refSeq, clientId);
|
|
1449
1437
|
this.ensureIntervalBoundary(end, refSeq, clientId);
|
|
1450
1438
|
let segmentGroup;
|
|
1451
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1452
1439
|
const removedSegments = [];
|
|
1453
1440
|
const localOverlapWithRefs = [];
|
|
1454
1441
|
const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
|
|
1455
1442
|
const markRemoved = (segment, pos, _start, _end) => {
|
|
1456
1443
|
const existingRemovalInfo = (0, segmentInfos_js_1.toRemovalInfo)(segment);
|
|
1457
1444
|
if (existingRemovalInfo === undefined) {
|
|
1458
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1459
1445
|
const removed = (0, segmentInfos_js_1.overwriteInfo)(segment, {
|
|
1460
1446
|
removedClientIds: [clientId],
|
|
1461
1447
|
removedSeq: seq,
|
|
@@ -1637,7 +1623,6 @@ class MergeTree {
|
|
|
1637
1623
|
(0, mergeTreeNodes_js_1.assertSegmentLeaf)(_segment);
|
|
1638
1624
|
segment = _segment;
|
|
1639
1625
|
}
|
|
1640
|
-
// eslint-disable-next-line import/no-deprecated
|
|
1641
1626
|
const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(segment);
|
|
1642
1627
|
const segRef = localRefs.createLocalRef(offset, refType, properties, slidingPreference, canSlideToEndpoint);
|
|
1643
1628
|
return segRef;
|