@fluidframework/merge-tree 2.1.0-276985 → 2.1.0

package/dist/mergeTree.js

@@ -20,7 +20,6 @@ const opBuilder_js_1 = require("./opBuilder.js");
 const ops_js_1 = require("./ops.js");
 const partialLengths_js_1 = require("./partialLengths.js");
 const perspective_js_1 = require("./perspective.js");
-// eslint-disable-next-line import/no-deprecated
 const properties_js_1 = require("./properties.js");
 const referencePositions_js_1 = require("./referencePositions.js");
 const segmentPropertiesManager_js_1 = require("./segmentPropertiesManager.js");
@@ -31,7 +30,7 @@ function wasRemovedAfter(seg, seq) {
 }
 function markSegmentMoved(seg, moveInfo) {
     seg.moveDst = moveInfo.moveDst;
-    seg.movedClientIds = moveInfo.movedClientIds.slice();
+    seg.movedClientIds = [...moveInfo.movedClientIds];
     seg.movedSeqs = [moveInfo.movedSeq];
     seg.movedSeq = moveInfo.movedSeq;
     seg.localMovedSeq = moveInfo.localMovedSeq;
@@ -77,18 +76,19 @@ function findRootMergeBlock(segmentOrNode) {
     while (maybeRoot?.parent !== undefined) {
         maybeRoot = maybeRoot.parent;
     }
-    return maybeRoot?.mergeTree !== undefined ? maybeRoot : undefined;
+    return maybeRoot?.mergeTree === undefined ? undefined : maybeRoot;
 }
 exports.findRootMergeBlock = findRootMergeBlock;
 /**
+ * Find the segment to which a reference will slide if it needs to slide, or undefined if there
+ * is no valid segment (i.e. the tree is empty).
+ *
  * @param segment - The segment to slide from.
  * @param cache - Optional cache mapping segments to their sliding destinations.
  * Excursions will be avoided for segments in the cache, and the cache will be populated with
  * entries for all segments visited during excursion.
  * This can reduce the number of times the tree needs to be scanned if a range containing many
  * SlideOnRemove references is removed.
- * @returns The segment a SlideOnRemove reference should slide to, or undefined if there is no
- * valid segment (i.e. the tree is empty).
  * @internal
  */
 function getSlideToSegment(segment, slidingPreference = localReference_js_1.SlidingPreference.FORWARD, cache, useNewSlidingBehavior = false) {
@@ -170,6 +170,8 @@ function getSlideToSegoff(segoff, slidingPreference = localReference_js_1.Slidin
     };
 }
 exports.getSlideToSegoff = getSlideToSegoff;
+const forwardPred = (ref) => ref.slidingPreference !== localReference_js_1.SlidingPreference.BACKWARD;
+const backwardPred = (ref) => ref.slidingPreference === localReference_js_1.SlidingPreference.BACKWARD;
 /**
  * @internal
  */
@@ -277,7 +279,18 @@ class MergeTree {
         (0, internal_1.assert)(refSeq !== undefined, 0x398 /* localSeq provided for local length without refSeq */);
         (0, internal_1.assert)(segment.seq !== undefined, 0x399 /* segment with no seq in mergeTree */);
         const { seq, removedSeq, localRemovedSeq, movedSeq, localMovedSeq } = segment;
-        if (seq !== constants_js_1.UnassignedSequenceNumber) {
+        if (seq === constants_js_1.UnassignedSequenceNumber) {
+            (0, internal_1.assert)(segment.localSeq !== undefined, 0x39a /* unacked segment with undefined localSeq */);
+            // inserted locally, still un-acked
+            if (segment.localSeq > localSeq ||
+                (localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
+                (localMovedSeq !== undefined && localMovedSeq <= localSeq)) {
+                return 0;
+            }
+            const { cachedLength } = segment;
+            return cachedLength;
+        }
+        else {
             // inserted remotely
             if (seq > refSeq ||
                 (removedSeq !== undefined &&
@@ -292,16 +305,6 @@ class MergeTree {
             }
             return segment.cachedLength;
         }
-        else {
-            (0, internal_1.assert)(segment.localSeq !== undefined, 0x39a /* unacked segment with undefined localSeq */);
-            // inserted locally, still un-acked
-            if (segment.localSeq > localSeq ||
-                (localRemovedSeq !== undefined && localRemovedSeq <= localSeq) ||
-                (localMovedSeq !== undefined && localMovedSeq <= localSeq)) {
-                return 0;
-            }
-            return segment.cachedLength;
-        }
     }
     unlinkMarker(marker) {
         const id = marker.getId();
@@ -321,7 +324,7 @@ class MergeTree {
         // Starting with the leaf segments, recursively builds the B-Tree layer by layer from the bottom up.
         const buildMergeBlock = (nodes) => {
             const blockCount = Math.ceil(nodes.length / maxChildren); // Compute # blocks require for this level of B-Tree
-            const blocks = new Array(blockCount); // Pre-alloc array to collect nodes
+            const blocks = Array.from({ length: blockCount }); // Pre-alloc array to collect nodes
             // For each block in this level of the B-Tree...
             for (let nodeIndex = 0, blockIndex = 0; // Start with the first block and first node
              blockIndex < blockCount; // If we have more blocks, we also have more nodes to insert
@@ -334,6 +337,7 @@ class MergeTree {
                  childIndex++, nodeIndex++ // Advance to next child & node
                 ) {
                     // Insert the next node into the current block
+                    // TODO Non null asserting, why is this not null?
                     this.addNode(block, nodes[nodeIndex]);
                 }
                 // Calculate this block's info.  Previously this was inlined into the above loop as a micro-optimization,
@@ -342,7 +346,8 @@ class MergeTree {
                 this.blockUpdate(block);
             }
             return blocks.length === 1 // If there is only one block at this layer...
-                ? blocks[0] // ...then we're done.  Return the root.
+                ? // Non null asserting here because of the length check above
+                    blocks[0] // ...then we're done.  Return the root.
                 : buildMergeBlock(blocks); // ...otherwise recursively build the next layer above blocks.
         };
         if (segments.length > 0) {
@@ -390,6 +395,7 @@ class MergeTree {
         while (parent) {
             const children = parent.children;
             for (let childIndex = 0; childIndex < parent.childCount; childIndex++) {
+                // TODO Non null asserting, why is this not null?
                 const child = children[childIndex];
                 if ((!!prevParent && child === prevParent) || child === node) {
                     break;
@@ -440,11 +446,9 @@ class MergeTree {
         let currentForwardMaybeEndpoint;
         let currentForwardSlideDestination;
         let currentForwardSlideIsForward;
-        const forwardPred = (ref) => ref.slidingPreference !== localReference_js_1.SlidingPreference.BACKWARD;
         let currentBackwardMaybeEndpoint;
         let currentBackwardSlideDestination;
         let currentBackwardSlideIsForward;
-        const backwardPred = (ref) => ref.slidingPreference === localReference_js_1.SlidingPreference.BACKWARD;
         const slideGroup = (currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, maybeEndpoint) => {
             if (currentSlideIsForward === undefined) {
                 return;
@@ -461,16 +465,7 @@ class MergeTree {
                     localRefs.addAfterTombstones(...endpointRefsToAdd);
                 }
             }
-            if (currentSlideDestination !== undefined) {
-                const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(currentSlideDestination);
-                if (currentSlideIsForward) {
-                    localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
-                }
-                else {
-                    localRefs.addAfterTombstones(...nonEndpointRefsToAdd);
-                }
-            }
-            else {
+            if (currentSlideDestination === undefined) {
                 for (const collection of currentSlideGroup) {
                     for (const ref of collection) {
                         if (pred(ref) && !(0, referencePositions_js_1.refTypeIncludesFlag)(ref, ops_js_1.ReferenceType.StayOnRemove)) {
@@ -481,6 +476,15 @@ class MergeTree {
                     }
                 }
             }
+            else {
+                const localRefs = localReference_js_1.LocalReferenceCollection.setOrGet(currentSlideDestination);
+                if (currentSlideIsForward) {
+                    localRefs.addBeforeTombstones(...nonEndpointRefsToAdd);
+                }
+                else {
+                    localRefs.addAfterTombstones(...nonEndpointRefsToAdd);
+                }
+            }
         };
         const trySlideSegment = (segment, currentSlideDestination, currentSlideIsForward, currentSlideGroup, pred, slidingPreference, currentMaybeEndpoint, reassign) => {
             // avoid sliding logic if this segment doesn't have any references
@@ -567,12 +571,7 @@ class MergeTree {
         }
         else {
             // Sequence number within window
-            if (!node.isLeaf()) {
-                const partialLen = node.partialLengths.getPartialLength(refSeq, clientId);
-                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
-                return partialLen;
-            }
-            else {
+            if (node.isLeaf()) {
                 const segment = node;
                 const removalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
                 const moveInfo = (0, mergeTreeNodes_js_1.toMoveInfo)(segment);
@@ -598,6 +597,11 @@ class MergeTree {
                     ? segment.cachedLength
                     : 0;
             }
+            else {
+                const partialLen = node.partialLengths.getPartialLength(refSeq, clientId);
+                partialLengths_js_1.PartialSequenceLengths.options.verifyExpected?.(this, node, refSeq, clientId);
+                return partialLen;
+            }
         }
     }
     setMinSeq(minSeq) {
@@ -621,7 +625,6 @@ class MergeTree {
      * Defaults to including all edits which have been applied.
      * @param clientId - The ID of the client from whose perspective to resolve this reference. Defaults to the current client.
      * @param localSeq - The local sequence number to consider. Defaults to including all local edits.
-     * @returns the count of elements before the given reference position in the given perspective.
      */
     referencePositionToLocalPosition(refPos, refSeq = Number.MAX_SAFE_INTEGER, clientId = this.collabWindow.clientId, localSeq = this.collabWindow.localSeq) {
         const seg = refPos.getSegment();
@@ -689,7 +692,7 @@ class MergeTree {
                     foundMarker = marker;
                 }
             }
-            return foundMarker !== undefined ? mergeTreeNodeWalk_js_1.NodeAction.Exit : mergeTreeNodeWalk_js_1.NodeAction.Skip;
+            return foundMarker === undefined ? mergeTreeNodeWalk_js_1.NodeAction.Skip : mergeTreeNodeWalk_js_1.NodeAction.Exit;
         }, undefined, undefined, forwards);
         return foundMarker;
     }
@@ -721,6 +724,8 @@ class MergeTree {
                 if (opArgs.op.type === ops_js_1.MergeTreeDeltaType.OBLITERATE && localMovedSeq !== undefined) {
                     const locallyMovedSegments = this.locallyMovedSegments.get(localMovedSeq);
                     if (locallyMovedSegments) {
+                        // Disabling because a for of loop causes the type of segment to be ISegment, which does not have parent information stored
+                        // eslint-disable-next-line unicorn/no-array-for-each
                         locallyMovedSegments.segments.forEach((segment) => {
                             segment.localMovedSeq = undefined;
                             if (!nodesToUpdate.includes(segment.parent)) {
@@ -821,15 +826,15 @@ class MergeTree {
         }
         if (marker) {
             pos = this.getPosition(marker, refseq, clientId);
-            if (!relativePos.before) {
-                pos += marker.cachedLength;
+            if (relativePos.before) {
                 if (relativePos.offset !== undefined) {
-                    pos += relativePos.offset;
+                    pos -= relativePos.offset;
                 }
             }
             else {
+                pos += marker.cachedLength;
                 if (relativePos.offset !== undefined) {
-                    pos -= relativePos.offset;
+                    pos += relativePos.offset;
                 }
             }
         }
@@ -888,6 +893,8 @@ class MergeTree {
         }
     }
     blockInsert(pos, refSeq, clientId, seq, localSeq, newSegments) {
+        // Keeping this function within the scope of blockInsert for readability.
+        // eslint-disable-next-line unicorn/consistent-function-scoping
         const continueFrom = (node) => {
             let siblingExists = false;
             (0, mergeTreeNodeWalk_js_1.forwardExcursion)(node, () => {
@@ -946,7 +953,7 @@ class MergeTree {
                 });
                 if (newSegment.parent === undefined) {
                     // Indicates an attempt to insert past the end of the merge-tree's content.
-                    const errorConstructor = localSeq !== undefined ? internal_2.UsageError : internal_2.DataProcessingError;
+                    const errorConstructor = localSeq === undefined ? internal_2.DataProcessingError : internal_2.UsageError;
                     throw new errorConstructor("MergeTree insert failed", {
                         currentSeq: this.collabWindow.currentSeq,
                         minSeq: this.collabWindow.minSeq,
@@ -1088,6 +1095,7 @@ class MergeTree {
         let newNode;
         let fromSplit;
         for (childIndex = 0; childIndex < block.childCount; childIndex++) {
+            // TODO Non null asserting, why is this not null?
             child = children[childIndex];
             // ensure we walk down the far edge of the tree, even if all sub-tree is eligible for zamboni
             const isLastNonLeafBlock = isLastChildBlock && !child.isLeaf() && childIndex === block.childCount - 1;
@@ -1100,7 +1108,23 @@ class MergeTree {
             (0, internal_1.assert)(len >= 0, 0x4bc /* Length should not be negative */);
             if (_pos < len || (_pos === len && this.breakTie(_pos, child, seq))) {
                 // Found entry containing pos
-                if (!child.isLeaf()) {
+                if (child.isLeaf()) {
+                    const segment = child;
+                    const segmentChanges = context.leaf(segment, _pos, context);
+                    if (segmentChanges.replaceCurrent) {
+                        block.assignChild(segmentChanges.replaceCurrent, childIndex, false);
+                        segmentChanges.replaceCurrent.ordinal = child.ordinal;
+                    }
+                    if (segmentChanges.next) {
+                        newNode = segmentChanges.next;
+                        childIndex++; // Insert after
+                    }
+                    else {
+                        // No change
+                        return undefined;
+                    }
+                }
+                else {
                     const childBlock = child;
                     // Internal node
                     const splitNode = this.insertingWalk(childBlock, _pos, refSeq, clientId, seq, context, isLastNonLeafBlock);
@@ -1118,43 +1142,27 @@ class MergeTree {
                         childIndex++; // Insert after
                     }
                 }
-                else {
-                    const segment = child;
-                    const segmentChanges = context.leaf(segment, _pos, context);
-                    if (segmentChanges.replaceCurrent) {
-                        block.assignChild(segmentChanges.replaceCurrent, childIndex, false);
-                        segmentChanges.replaceCurrent.ordinal = child.ordinal;
-                    }
-                    if (segmentChanges.next) {
-                        newNode = segmentChanges.next;
-                        childIndex++; // Insert after
-                    }
-                    else {
-                        // No change
-                        return undefined;
-                    }
-                }
                 break;
             }
             else {
                 _pos -= len;
             }
         }
-        if (!newNode) {
-            if (_pos === 0) {
-                if (context.continuePredicate?.(block)) {
-                    return MergeTree.theUnfinishedNode;
-                }
-                else {
-                    const segmentChanges = context.leaf(undefined, _pos, context);
-                    newNode = segmentChanges.next;
-                    // Assert segmentChanges.replaceCurrent === undefined
-                }
+        if (!newNode && _pos === 0) {
+            if (context.continuePredicate?.(block)) {
+                return MergeTree.theUnfinishedNode;
+            }
+            else {
+                const segmentChanges = context.leaf(undefined, _pos, context);
+                newNode = segmentChanges.next;
+                // Assert segmentChanges.replaceCurrent === undefined
             }
         }
         if (newNode) {
             for (let i = block.childCount; i > childIndex; i--) {
+                // TODO Non null asserting, why is this not null?
                 block.children[i] = block.children[i - 1];
+                // TODO Non null asserting, why is this not null?
                 block.children[i].index = i;
             }
             block.assignChild(newNode, childIndex, false);
@@ -1186,6 +1194,7 @@ class MergeTree {
         // Update ordinals to reflect lowered child count
         this.nodeUpdateOrdinals(node);
         for (let i = 0; i < halfCount; i++) {
+            // TODO Non null asserting, why is this not null?
             newNode.assignChild(node.children[halfCount + i], i, false);
             node.children[halfCount + i] = undefined;
         }
@@ -1195,6 +1204,7 @@ class MergeTree {
     }
     nodeUpdateOrdinals(block) {
         for (let i = 0; i < block.childCount; i++) {
+            // TODO Non null asserting, why is this not null?
             const child = block.children[i];
             block.setOrdinal(child, i);
             if (!child.isLeaf()) {
@@ -1248,10 +1258,10 @@ class MergeTree {
                 deltaSegments,
             });
         }
-        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
-            if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_js_1.zamboniSegments)(this);
-            }
+        if (this.collabWindow.collaborating &&
+            seq !== constants_js_1.UnassignedSequenceNumber &&
+            MergeTree.options.zamboniSegments) {
+            (0, zamboni_js_1.zamboniSegments)(this);
         }
     }
     obliterateRange(start, end, refSeq, clientId, seq, overwrite = false, opArgs) {
@@ -1280,7 +1290,16 @@ class MergeTree {
                 (refSeq < segment.seq || segment.seq === constants_js_1.UnassignedSequenceNumber)) {
                 segment.wasMovedOnInsert = true;
             }
-            if (existingMoveInfo !== undefined) {
+            if (existingMoveInfo === undefined) {
+                segment.movedClientIds = [clientId];
+                segment.movedSeq = seq;
+                segment.localMovedSeq = localSeq;
+                segment.movedSeqs = [seq];
+                if (!(0, mergeTreeNodes_js_1.toRemovalInfo)(segment)) {
+                    movedSegments.push({ segment });
+                }
+            }
+            else {
                 _overwrite = true;
                 if (existingMoveInfo.movedSeq === constants_js_1.UnassignedSequenceNumber) {
                     // we moved this locally, but someone else moved it first
@@ -1300,15 +1319,6 @@ class MergeTree {
                     existingMoveInfo.movedSeqs.push(seq);
                 }
             }
-            else {
-                segment.movedClientIds = [clientId];
-                segment.movedSeq = seq;
-                segment.localMovedSeq = localSeq;
-                segment.movedSeqs = [seq];
-                if (!(0, mergeTreeNodes_js_1.toRemovalInfo)(segment)) {
-                    movedSegments.push({ segment });
-                }
-            }
             // Save segment so can assign moved sequence number when acked by server
             if (this.collabWindow.collaborating) {
                 if (segment.movedSeq === constants_js_1.UnassignedSequenceNumber &&
@@ -1332,7 +1342,7 @@ class MergeTree {
             }
             return true;
         };
-        this.nodeMap(refSeq, clientId, markMoved, undefined, afterMarkMoved, start, end, undefined, seq !== constants_js_1.UnassignedSequenceNumber ? seq : undefined);
+        this.nodeMap(refSeq, clientId, markMoved, undefined, afterMarkMoved, start, end, undefined, seq === constants_js_1.UnassignedSequenceNumber ? undefined : seq);
         this.slideAckedRemovedSegmentReferences(localOverlapWithRefs);
         // opArgs == undefined => test code
         if (movedSegments.length > 0) {
@@ -1350,10 +1360,10 @@ class MergeTree {
         if (!this.collabWindow.collaborating || clientId !== this.collabWindow.clientId) {
             this.slideAckedRemovedSegmentReferences(movedSegments.map(({ segment }) => segment));
         }
-        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
-            if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_js_1.zamboniSegments)(this);
-            }
+        if (this.collabWindow.collaborating &&
+            seq !== constants_js_1.UnassignedSequenceNumber &&
+            MergeTree.options.zamboniSegments) {
+            (0, zamboni_js_1.zamboniSegments)(this);
         }
     }
     markRangeRemoved(start, end, refSeq, clientId, seq, overwrite = false, opArgs) {
@@ -1367,7 +1377,15 @@ class MergeTree {
         const localSeq = seq === constants_js_1.UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
         const markRemoved = (segment, pos, _start, _end) => {
             const existingRemovalInfo = (0, mergeTreeNodes_js_1.toRemovalInfo)(segment);
-            if (existingRemovalInfo !== undefined) {
+            if (existingRemovalInfo === undefined) {
+                segment.removedClientIds = [clientId];
+                segment.removedSeq = seq;
+                segment.localRemovedSeq = localSeq;
+                if (!(0, mergeTreeNodes_js_1.toMoveInfo)(segment)) {
+                    removedSegments.push({ segment });
+                }
+            }
+            else {
                 _overwrite = true;
                 if (existingRemovalInfo.removedSeq === constants_js_1.UnassignedSequenceNumber) {
                     // we removed this locally, but someone else removed it first
@@ -1385,14 +1403,6 @@ class MergeTree {
                     existingRemovalInfo.removedClientIds.push(clientId);
                 }
             }
-            else {
-                segment.removedClientIds = [clientId];
-                segment.removedSeq = seq;
-                segment.localRemovedSeq = localSeq;
-                if (!(0, mergeTreeNodes_js_1.toMoveInfo)(segment)) {
-                    removedSegments.push({ segment });
-                }
-            }
             // Save segment so we can assign removed sequence number when acked by server
             if (this.collabWindow.collaborating) {
                 if (segment.removedSeq === constants_js_1.UnassignedSequenceNumber &&
@@ -1433,10 +1443,10 @@ class MergeTree {
         if (!this.collabWindow.collaborating || clientId !== this.collabWindow.clientId) {
             this.slideAckedRemovedSegmentReferences(removedSegments.map(({ segment }) => segment));
         }
-        if (this.collabWindow.collaborating && seq !== constants_js_1.UnassignedSequenceNumber) {
-            if (MergeTree.options.zamboniSegments) {
-                (0, zamboni_js_1.zamboniSegments)(this);
-            }
+        if (this.collabWindow.collaborating &&
+            seq !== constants_js_1.UnassignedSequenceNumber &&
+            MergeTree.options.zamboniSegments) {
+            (0, zamboni_js_1.zamboniSegments)(this);
         }
     }
     /**
@@ -1449,6 +1459,8 @@ class MergeTree {
             if (pendingSegmentGroup === undefined || pendingSegmentGroup !== localOpMetadata) {
                 throw new Error("Rollback op doesn't match last edit");
             }
+            // Disabling because a for of loop causes the type of segment to be ISegment, which does not have parent information stored
+            // eslint-disable-next-line unicorn/no-array-for-each
             pendingSegmentGroup.segments.forEach((segment) => {
                 const segmentSegmentGroup = segment.segmentGroups?.pop?.();
                 (0, internal_1.assert)(segmentSegmentGroup === pendingSegmentGroup, 0x3ee /* Unexpected segmentGroup in segment */);
@@ -1488,6 +1500,7 @@ class MergeTree {
                     this.markRangeRemoved(start, start + segment.cachedLength, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber, false, { op: removeOp });
                 } /* op.type === MergeTreeDeltaType.ANNOTATE */
                 else {
+                    // TODO Non null asserting, why is this not null?
                     const props = pendingSegmentGroup.previousProps[i];
                     const annotateOp = (0, opBuilder_js_1.createAnnotateRangeOp)(start, start + segment.cachedLength, props);
                     this.annotateRange(start, start + segment.cachedLength, props, constants_js_1.UniversalSequenceNumber, this.collabWindow.clientId, constants_js_1.UniversalSequenceNumber, { op: annotateOp }, segmentPropertiesManager_js_1.PropertiesRollback.Rollback);
@@ -1592,18 +1605,20 @@ class MergeTree {
                 }
             }
         }
-        const newOrder = Array.from(affectedSegments.map(({ data }) => data));
-        newOrder.forEach((seg) => seg.localRefs?.walkReferences((lref) => lref.callbacks?.beforeSlide?.(lref)));
+        const newOrder = Array.from(affectedSegments, ({ data }) => data);
+        for (const seg of newOrder)
+            seg.localRefs?.walkReferences((lref) => lref.callbacks?.beforeSlide?.(lref));
         const perSegmentTrackingGroups = new Map();
         for (const segment of newOrder) {
             const { trackingCollection } = segment;
-            const trackingGroups = Array.from(trackingCollection.trackingGroups);
+            const trackingGroups = [...trackingCollection.trackingGroups];
             perSegmentTrackingGroups.set(segment, trackingGroups);
             for (const group of trackingCollection.trackingGroups) {
                 trackingCollection.unlink(group);
             }
         }
         for (let i = 0; i < newOrder.length; i++) {
+            // TODO Non null asserting, why is this not null?
             const seg = newOrder[i];
             const { parent, index, ordinal } = currentOrder[i];
             parent?.assignChild(seg, index, false);
@@ -1623,13 +1638,16 @@ class MergeTree {
             }
             return depths.get(block);
         };
-        newOrder.forEach(computeDepth);
-        for (const [node] of Array.from(depths.entries()).sort((a, b) => b[1] - a[1])) {
+        for (const element of newOrder) {
+            computeDepth(element);
+        }
+        for (const [node] of [...depths.entries()].sort((a, b) => b[1] - a[1])) {
             if (!node.isLeaf()) {
                 this.nodeUpdateLengthNewStructure(node);
             }
         }
-        newOrder.forEach((seg) => seg.localRefs?.walkReferences((lref) => lref.callbacks?.afterSlide?.(lref)));
+        for (const seg of newOrder)
+            seg.localRefs?.walkReferences((lref) => lref.callbacks?.afterSlide?.(lref));
     }
     /**
      * Normalizes the segments nearby `segmentGroup` to be ordered as they would if the op submitting `segmentGroup`
@@ -1684,11 +1702,10 @@ class MergeTree {
     }
     blockUpdate(block) {
         let len;
-        // eslint-disable-next-line import/no-deprecated
         const rightmostTiles = (0, properties_js_1.createMap)();
-        // eslint-disable-next-line import/no-deprecated
         const leftmostTiles = (0, properties_js_1.createMap)();
         for (let i = 0; i < block.childCount; i++) {
+            // TODO Non null asserting, why is this not null?
             const node = block.children[i];
             const nodeLength = nodeTotalLength(this, node);
             if (nodeLength !== undefined) {
@@ -1719,9 +1736,7 @@ class MergeTree {
                 }
             }
             else {
-                // eslint-disable-next-line import/no-deprecated
                 (0, properties_js_1.extend)(rightmostTiles, node.rightmostTiles);
-                // eslint-disable-next-line import/no-deprecated
                 (0, properties_js_1.extendIfUndefined)(leftmostTiles, node.leftmostTiles);
             }
         }