@fluidframework/merge-tree 0.58.1000 → 0.58.2000

package/lib/mergeTree.js

@@ -45,7 +45,7 @@ function addTileIfNotPresent(tile, tiles) {
     }
 }
 function applyStackDelta(currentStackMap, deltaStackMap) {
-    // eslint-disable-next-line guard-for-in
+    // eslint-disable-next-line guard-for-in, no-restricted-syntax
     for (const label in deltaStackMap) {
         const deltaStack = deltaStackMap[label];
         if (!deltaStack.empty()) {
@@ -206,7 +206,7 @@ class HierMergeBlock extends MergeBlock {
     }
     hierToString(indentCount) {
         let strbuf = "";
-        // eslint-disable-next-line guard-for-in
+        // eslint-disable-next-line guard-for-in, no-restricted-syntax
         for (const key in this.rangeStacks) {
             const stack = this.rangeStacks[key];
             strbuf += internedSpaces(indentCount);
@@ -279,6 +279,7 @@ export class BaseSegment extends MergeNode {
                 this.localSeq = undefined;
                 return true;
             case 1 /* REMOVE */:
+                // eslint-disable-next-line @typescript-eslint/no-this-alias
                 const removalInfo = this;
                 assert(!!removalInfo, 0x046 /* "On remove ack, missing removal info!" */);
                 assert(!!removalInfo.removedSeq, 0x047 /* "On remove ack, missing removed sequence number!" */);
@@ -486,6 +487,7 @@ export class Marker extends BaseSegment {
                 // Avoid circular reference when stringifying makers containing handles.
                 // (Substitute a debug string instead.)
                 const handle = !!value && value.IFluidHandle;
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return handle
                     ? `#Handle(${handle.routeContext.path}/${handle.path})`
                     : value;
@@ -745,6 +747,7 @@ export class MergeTree {
                 // snapshot header.  The bulk of the segments in long documents are inserted via `insertSegments()`.
                 this.blockUpdate(block);
             }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return blocks.length === 1 // If there is only one block at this layer...
                 ? blocks[0] // ...then we're done.  Return the root.
                 : buildMergeBlock(blocks); // ...otherwise recursively build the next layer above blocks.
@@ -965,8 +968,8 @@ export class MergeTree {
                     stats.leafCount += childStats.leafCount;
                     stats.removedLeafCount += childStats.removedLeafCount;
                     stats.liveCount += childStats.liveCount;
-                    for (let i = 0; i < MaxNodesInBlock; i++) {
-                        stats.histo[i] += childStats.histo[i];
+                    for (let j = 0; j < MaxNodesInBlock; j++) {
+                        stats.histo[j] += childStats.histo[j];
                     }
                 }
                 else {
@@ -1017,7 +1020,7 @@ export class MergeTree {
     getContainingSegment(pos, refSeq, clientId) {
         let segment;
         let offset;
-        const leaf = (leafSeg, segpos, refSeq, clientId, start) => {
+        const leaf = (leafSeg, segpos, _refSeq, _clientId, start) => {
             segment = leafSeg;
             offset = start;
             return false;
@@ -1493,7 +1496,7 @@ export class MergeTree {
     }
     blockInsert(pos, refSeq, clientId, seq, localSeq, newSegments) {
         let segIsLocal = false;
-        const checkSegmentIsLocal = (segment, pos, refSeq, clientId) => {
+        const checkSegmentIsLocal = (segment, _pos, _refSeq, _clientId) => {
             if (segment.seq === UnassignedSequenceNumber) {
                 segIsLocal = true;
             }
@@ -1522,7 +1525,7 @@ export class MergeTree {
                 }
             }
         };
-        const onLeaf = (segment, pos, context) => {
+        const onLeaf = (segment, _pos, context) => {
             const segmentChanges = {};
             if (segment) {
                 // Insert before segment
@@ -1594,24 +1597,24 @@ export class MergeTree {
         while (parent) {
             const children = parent.children;
             let childIndex;
-            let node;
+            let _node;
             let matchedStart = false;
             for (childIndex = parent.childCount - 1; childIndex >= 0; childIndex--) {
-                node = children[childIndex];
+                _node = children[childIndex];
                 if (matchedStart) {
-                    if (!node.isLeaf()) {
-                        const childBlock = node;
+                    if (!_node.isLeaf()) {
+                        const childBlock = _node;
                         go = this.nodeMapReverse(childBlock, leafAction, 0, UniversalSequenceNumber, this.collabWindow.clientId);
                     }
                     else {
-                        go = leafAction(node, 0, UniversalSequenceNumber, this.collabWindow.clientId, 0, 0, undefined);
+                        go = leafAction(_node, 0, UniversalSequenceNumber, this.collabWindow.clientId, 0, 0, undefined);
                     }
                     if (!go) {
                         return;
                     }
                 }
                 else {
-                    matchedStart = (startNode === node);
+                    matchedStart = (startNode === _node);
                 }
             }
             startNode = parent;
@@ -1627,24 +1630,24 @@ export class MergeTree {
         while (parent) {
             const children = parent.children;
             let childIndex;
-            let node;
+            let _node;
             let matchedStart = false;
             for (childIndex = 0; childIndex < parent.childCount; childIndex++) {
-                node = children[childIndex];
+                _node = children[childIndex];
                 if (matchedStart) {
-                    if (!node.isLeaf()) {
-                        const childBlock = node;
+                    if (!_node.isLeaf()) {
+                        const childBlock = _node;
                         go = this.nodeMap(childBlock, actions, 0, UniversalSequenceNumber, this.collabWindow.clientId, undefined);
                     }
                     else {
-                        go = leafAction(node, 0, UniversalSequenceNumber, this.collabWindow.clientId, 0, 0, undefined);
+                        go = leafAction(_node, 0, UniversalSequenceNumber, this.collabWindow.clientId, 0, 0, undefined);
                     }
                     if (!go) {
                         return;
                     }
                 }
                 else {
-                    matchedStart = (startNode === node);
+                    matchedStart = (startNode === _node);
                 }
             }
             startNode = parent;
@@ -1841,7 +1844,7 @@ export class MergeTree {
         const removedSegments = [];
         const savedLocalRefs = [];
         const localSeq = seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
-        const markRemoved = (segment, pos, start, end) => {
+        const markRemoved = (segment, pos, _start, _end) => {
             const removalInfo = segment;
             if (removalInfo.removedSeq !== undefined) {
                 _overwrite = true;
@@ -1869,8 +1872,8 @@ export class MergeTree {
             // Save segment so can assign removed sequence number when acked by server
             if (this.collabWindow.collaborating) {
                 // Use removal information
-                const removalInfo = segment;
-                if (removalInfo.removedSeq === UnassignedSequenceNumber && clientId === this.collabWindow.clientId) {
+                const _removalInfo = segment;
+                if (_removalInfo.removedSeq === UnassignedSequenceNumber && clientId === this.collabWindow.clientId) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq);
                 }
                 else {
@@ -1881,7 +1884,7 @@ export class MergeTree {
             }
             return true;
         };
-        const afterMarkRemoved = (node, pos, start, end) => {
+        const afterMarkRemoved = (node, pos, _start, _end) => {
             if (_overwrite) {
                 this.nodeUpdateLengthNewStructure(node);
             }