@fluidframework/merge-tree 2.13.0 → 2.20.0

package/lib/mergeTree.js

@@ -9,9 +9,7 @@ import { DataProcessingError, UsageError } from "@fluidframework/telemetry-utils
 import { DoublyLinkedList } from "./collections/index.js";
 import { NonCollabClient, TreeMaintenanceSequenceNumber, UnassignedSequenceNumber, UniversalSequenceNumber, } from "./constants.js";
 import { EndOfTreeSegment, StartOfTreeSegment } from "./endOfTreeSegment.js";
-import { 
-// eslint-disable-next-line import/no-deprecated
-LocalReferenceCollection, SlidingPreference, anyLocalReferencePosition, createDetachedLocalReferencePosition, filterLocalReferencePositions, } from "./localReference.js";
+import { LocalReferenceCollection, SlidingPreference, anyLocalReferencePosition, createDetachedLocalReferencePosition, filterLocalReferencePositions, } from "./localReference.js";
 import { MergeTreeMaintenanceType, } from "./mergeTreeDeltaCallback.js";
 import { NodeAction, backwardExcursion, depthFirstNodeWalk, forwardExcursion, walkAllChildSegments, } from "./mergeTreeNodeWalk.js";
 import { CollaborationWindow, Marker, MaxNodesInBlock, MergeBlock, assertSegmentLeaf, assignChild, isSegmentLeaf, reservedMarkerIdKey, seqLTE, } from "./mergeTreeNodes.js";
@@ -31,7 +29,6 @@ function isRemovedAndAcked(segment) {
     const removalInfo = toRemovalInfo(segment);
     return removalInfo !== undefined && removalInfo.removedSeq !== UnassignedSequenceNumber;
 }
-// eslint-disable-next-line import/no-deprecated
 function isMovedAndAcked(segment) {
     const moveInfo = toMoveInfo(segment);
     return moveInfo !== undefined && moveInfo.movedSeq !== UnassignedSequenceNumber;
@@ -514,9 +511,7 @@ export class MergeTree {
      */
     slideAckedRemovedSegmentReferences(segments) {
         // References are slid in groups to preserve their order.
-        // eslint-disable-next-line import/no-deprecated
         let currentForwardSlideGroup = [];
-        // eslint-disable-next-line import/no-deprecated
         let currentBackwardSlideGroup = [];
         let currentForwardMaybeEndpoint;
         let currentForwardSlideDestination;
@@ -524,9 +519,7 @@ export class MergeTree {
         let currentBackwardMaybeEndpoint;
         let currentBackwardSlideDestination;
         let currentBackwardSlideIsForward;
-        const slideGroup = (currentSlideDestination, currentSlideIsForward, 
-        // eslint-disable-next-line import/no-deprecated
-        currentSlideGroup, pred, maybeEndpoint) => {
+        const slideGroup = (currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, maybeEndpoint) => {
             if (currentSlideIsForward === undefined) {
                 return;
             }
@@ -534,7 +527,6 @@ export class MergeTree {
             const endpointRefsToAdd = currentSlideGroup.map((collection) => filterLocalReferencePositions(collection, (ref) => pred(ref) && !!ref.canSlideToEndpoint));
             if (maybeEndpoint) {
                 const endpoint = maybeEndpoint === "start" ? this.startOfTree : this.endOfTree;
-                // eslint-disable-next-line import/no-deprecated
                 const localRefs = LocalReferenceCollection.setOrGet(endpoint);
                 if (currentSlideIsForward) {
                     localRefs.addBeforeTombstones(...endpointRefsToAdd);
@@ -555,7 +547,6 @@ export class MergeTree {
                 }
             }
             else {
-                // eslint-disable-next-line import/no-deprecated
                 const localRefs = LocalReferenceCollection.setOrGet(currentSlideDestination);
                 if (currentSlideIsForward) {
                     localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
@@ -565,9 +556,7 @@ export class MergeTree {
                 }
             }
         };
-        const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward, 
-        // eslint-disable-next-line import/no-deprecated
-        currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
+        const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
             // avoid sliding logic if this segment doesn't have any references
             // with the given sliding preference
             if (!segment.localRefs || !anyLocalReferencePosition(segment.localRefs, pred)) {
@@ -1058,7 +1047,6 @@ export class MergeTree {
                 }
             }
             if (oldest && newest?.clientId !== clientId) {
-                // eslint-disable-next-line import/no-deprecated
                 const moveInfo = {
                     movedClientIds,
                     movedSeq: oldest.seq,
@@ -1291,7 +1279,6 @@ export class MergeTree {
         this.ensureIntervalBoundary(endPos, refSeq, clientId);
         let _overwrite = false;
         const localOverlapWithRefs = [];
-        // eslint-disable-next-line import/no-deprecated
         const movedSegments = [];
         const localSeq = seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         const obliterate = {
@@ -1348,7 +1335,6 @@ export class MergeTree {
                 seq !== UnassignedSequenceNumber &&
                 (refSeq < segment.seq || segment.seq === UnassignedSequenceNumber);
             if (existingMoveInfo === undefined) {
-                // eslint-disable-next-line import/no-deprecated
                 const movedSeg = overwriteInfo(segment, {
                     movedClientIds: [clientId],
                     movedSeq: seq,
@@ -1444,14 +1430,12 @@ export class MergeTree {
         this.ensureIntervalBoundary(start, refSeq, clientId);
         this.ensureIntervalBoundary(end, refSeq, clientId);
         let segmentGroup;
-        // eslint-disable-next-line import/no-deprecated
         const removedSegments = [];
         const localOverlapWithRefs = [];
         const localSeq = seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         const markRemoved = (segment, pos, _start, _end) => {
             const existingRemovalInfo = toRemovalInfo(segment);
             if (existingRemovalInfo === undefined) {
-                // eslint-disable-next-line import/no-deprecated
                 const removed = overwriteInfo(segment, {
                     removedClientIds: [clientId],
                     removedSeq: seq,
@@ -1633,7 +1617,6 @@ export class MergeTree {
             assertSegmentLeaf(_segment);
             segment = _segment;
         }
-        // eslint-disable-next-line import/no-deprecated
         const localRefs = LocalReferenceCollection.setOrGet(segment);
         const segRef = localRefs.createLocalRef(offset, refType, properties, slidingPreference, canSlideToEndpoint);
         return segRef;