@fluidframework/merge-tree 0.58.1001 → 0.58.2000-58133

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "0.58.1001",
+  "version": "0.58.2000-58133",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
-  "repository": "https://github.com/microsoft/FluidFramework",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/FluidFramework.git",
+    "directory": "packages/dds/merge-tree"
+  },
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
@@ -58,18 +62,18 @@
     "@fluidframework/common-utils": "^0.32.1",
     "@fluidframework/container-definitions": "^0.47.1000",
     "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/datastore-definitions": "^0.58.1001",
+    "@fluidframework/datastore-definitions": "0.58.2000-58133",
     "@fluidframework/protocol-definitions": "^0.1027.1000",
-    "@fluidframework/runtime-definitions": "^0.58.1001",
-    "@fluidframework/runtime-utils": "^0.58.1001",
-    "@fluidframework/shared-object-base": "^0.58.1001",
-    "@fluidframework/telemetry-utils": "^0.58.1001"
+    "@fluidframework/runtime-definitions": "0.58.2000-58133",
+    "@fluidframework/runtime-utils": "0.58.2000-58133",
+    "@fluidframework/shared-object-base": "0.58.2000-58133",
+    "@fluidframework/telemetry-utils": "0.58.2000-58133"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0",
-    "@fluidframework/mocha-test-setup": "^0.58.1001",
-    "@fluidframework/test-runtime-utils": "^0.58.1001",
+    "@fluidframework/eslint-config-fluid": "^0.27.0",
+    "@fluidframework/mocha-test-setup": "0.58.2000-58133",
+    "@fluidframework/test-runtime-utils": "0.58.2000-58133",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/diff": "^3.5.1",

package/src/base.ts

@@ -14,7 +14,7 @@ export interface QProperty<TKey, TData> {
 }
 
 export interface PropertyAction<TKey, TData> {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     <TAccum>(p: Property<TKey, TData>, accum?: TAccum): boolean;
 }
 
@@ -35,7 +35,7 @@ export interface SortedDictionary<TKey, TData> extends Dictionary<TKey, TData> {
 }
 
 export interface KeyComparer<TKey> {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     (a: TKey, b: TKey): number;
 }
 /**

package/src/mergeTree.ts

@@ -149,12 +149,12 @@ export interface ISegment extends IMergeNodeCommon, IRemovalInfo {
 }
 
 export interface IMarkerModifiedAction {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     (marker: Marker): void;
 }
 
 export interface ISegmentAction<TClientData> {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number,
         end: number, accum: TClientData): boolean;
 }
@@ -165,7 +165,7 @@ export interface ISegmentChanges {
 }
 
 export interface BlockAction<TClientData> {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     (
         block: IMergeBlock,
         pos: number,
@@ -178,7 +178,7 @@ export interface BlockAction<TClientData> {
 }
 
 export interface NodeAction<TClientData> {
-
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type
     (
         node: IMergeNode,
         pos: number,
@@ -258,7 +258,6 @@ export class MergeNode implements IMergeNodeCommon {
     }
 }
 
-
 function addTile(tile: ReferencePosition, tiles: object) {
     const tileLabels = tile.getTileLabels();
     if (tileLabels) {
@@ -268,7 +267,6 @@ function addTile(tile: ReferencePosition, tiles: object) {
     }
 }
 
-
 function addTileIfNotPresent(tile: ReferencePosition, tiles: object) {
     const tileLabels = tile.getTileLabels();
     if (tileLabels) {
@@ -281,7 +279,7 @@ function addTileIfNotPresent(tile: ReferencePosition, tiles: object) {
 }
 
 function applyStackDelta(currentStackMap: RangeStackMap, deltaStackMap: RangeStackMap) {
-    // 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()) {
@@ -459,7 +457,7 @@ class HierMergeBlock extends MergeBlock implements IMergeBlock {
 
     public hierToString(indentCount: number) {
         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);
@@ -557,7 +555,7 @@ export abstract class BaseSegment extends MergeNode implements ISegment {
                 return true;
 
             case MergeTreeDeltaType.REMOVE:
-
+                // eslint-disable-next-line @typescript-eslint/no-this-alias
                 const removalInfo: IRemovalInfo = this;
                 assert(!!removalInfo, 0x046 /* "On remove ack, missing removal info!" */);
                 assert(!!removalInfo.removedSeq, 0x047 /* "On remove ack, missing removed sequence number!" */);
@@ -812,6 +810,7 @@ export class Marker extends BaseSegment implements ReferencePosition {
                 // (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;
@@ -1155,6 +1154,7 @@ export class MergeTree {
                 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.
@@ -1344,9 +1344,7 @@ export class MergeTree {
                     }
 
                     if (this.underflow(block) && block.parent) {
-
                         this.packParent(block.parent);
-
                     } else {
                         this.nodeUpdateOrdinals(block);
                         this.blockUpdatePathLengths(block, UnassignedSequenceNumber, -1, true);
@@ -1383,8 +1381,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 {
                     stats.leafCount++;
@@ -1438,7 +1436,7 @@ export class MergeTree {
         let segment: T | undefined;
         let offset: number | undefined;
 
-        const leaf = (leafSeg: ISegment, segpos: number, refSeq: number, clientId: number, start: number) => {
+        const leaf = (leafSeg: ISegment, segpos: number, _refSeq: number, _clientId: number, start: number) => {
             segment = leafSeg as T;
             offset = start;
             return false;
@@ -1954,8 +1952,7 @@ export class MergeTree {
         remoteClientPosition: number,
         remoteClientRefSeq: number,
         remoteClientId: number): number | undefined {
-
-        if(remoteClientRefSeq < this.collabWindow.minSeq){
+        if(remoteClientRefSeq < this.collabWindow.minSeq) {
             return undefined;
         }
 
@@ -1998,7 +1995,7 @@ export class MergeTree {
         newSegments: T[],
     ) {
         let segIsLocal = false;
-        const checkSegmentIsLocal = (segment: ISegment, pos: number, refSeq: number, clientId: number) => {
+        const checkSegmentIsLocal = (segment: ISegment, _pos: number, _refSeq: number, _clientId: number) => {
             if (segment.seq === UnassignedSequenceNumber) {
                 segIsLocal = true;
             }
@@ -2029,7 +2026,7 @@ export class MergeTree {
                 }
             }
         };
-        const onLeaf = (segment: ISegment | undefined, pos: number, context: InsertContext) => {
+        const onLeaf = (segment: ISegment | undefined, _pos: number, context: InsertContext) => {
             const segmentChanges: ISegmentChanges = {};
             if (segment) {
                 // Insert before segment
@@ -2124,23 +2121,23 @@ export class MergeTree {
         while (parent) {
             const children = parent.children;
             let childIndex: number;
-            let node: IMergeNode;
+            let _node: IMergeNode;
             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;
@@ -2157,23 +2154,23 @@ export class MergeTree {
         while (parent) {
             const children = parent.children;
             let childIndex: number;
-            let node: IMergeNode;
+            let _node: IMergeNode;
             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;
@@ -2384,7 +2381,7 @@ export class MergeTree {
         const removedSegments: IMergeTreeSegmentDelta[] = [];
         const savedLocalRefs: LocalReferenceCollection[] = [];
         const localSeq = seq === UnassignedSequenceNumber ? ++this.collabWindow.localSeq : undefined;
-        const markRemoved = (segment: ISegment, pos: number, start: number, end: number) => {
+        const markRemoved = (segment: ISegment, pos: number, _start: number, _end: number) => {
             const removalInfo: IRemovalInfo = segment;
             if (removalInfo.removedSeq !== undefined) {
                 _overwrite = true;
@@ -2412,8 +2409,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: IRemovalInfo = segment;
-                if (removalInfo.removedSeq === UnassignedSequenceNumber && clientId === this.collabWindow.clientId) {
+                const _removalInfo: IRemovalInfo = segment;
+                if (_removalInfo.removedSeq === UnassignedSequenceNumber && clientId === this.collabWindow.clientId) {
                     segmentGroup = this.addToPendingList(segment, segmentGroup, localSeq);
                 } else {
                     if (MergeTree.options.zamboniSegments) {
@@ -2423,7 +2420,7 @@ export class MergeTree {
             }
             return true;
         };
-        const afterMarkRemoved = (node: IMergeBlock, pos: number, start: number, end: number) => {
+        const afterMarkRemoved = (node: IMergeBlock, pos: number, _start: number, _end: number) => {
             if (_overwrite) {
                 this.nodeUpdateLengthNewStructure(node);
             } else {

package/src/mergeTreeDeltaCallback.ts

@@ -75,6 +75,7 @@ export interface IMergeTreeClientSequenceArgs {
 export type MergeTreeDeltaCallback =
     (opArgs: IMergeTreeDeltaOpArgs, deltaArgs: IMergeTreeDeltaCallbackArgs) => void;
 
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IMergeTreeMaintenanceCallbackArgs extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> { }
 
 export type MergeTreeMaintenanceCallback =

package/src/partialLengths.ts

@@ -186,7 +186,6 @@ export class PartialSequenceLengths {
                     }
                 }
                 if (outerIndexOfEarliest >= 0) {
-
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     addNext(earliestPartialLength!);
                     indices[outerIndexOfEarliest]++;
@@ -367,7 +366,6 @@ export class PartialSequenceLengths {
             }
         }
         if (seqPartialLen === undefined) {
-
             seqPartialLen = {
                 clientId,
                 seglen: seqSeglen,
@@ -488,7 +486,7 @@ export class PartialSequenceLengths {
             buf += `(${partial.seq},${partial.len}) `;
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array
+        // eslint-disable-next-line @typescript-eslint/no-for-in-array, no-restricted-syntax
         for (const clientId in this.clientSeqNumbers) {
             if (this.clientSeqNumbers[clientId].length > 0) {
                 buf += `Client `;
@@ -530,7 +528,7 @@ export class PartialSequenceLengths {
             return minLength;
         }
         this.minLength += copyDown(this.partialLengths);
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array, guard-for-in
+        // eslint-disable-next-line @typescript-eslint/no-for-in-array, guard-for-in, no-restricted-syntax
         for (const clientId in this.clientSeqNumbers) {
             const cliPartials = this.clientSeqNumbers[clientId];
             if (cliPartials) {

package/src/properties.ts

@@ -55,8 +55,11 @@ export function combine(combiningInfo: ICombiningOp, currentValue: any, newValue
                 }
             }
             break;
+        default:
+            break;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return _currentValue;
 }
 
@@ -67,6 +70,7 @@ export function matchProperties(a: PropertySet | undefined, b: PropertySet | und
         } else {
             // For now, straightforward; later use hashing
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const key in a) {
                 if (b[key] === undefined) {
                     return false;
@@ -79,6 +83,7 @@ export function matchProperties(a: PropertySet | undefined, b: PropertySet | und
                 }
             }
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const key in b) {
                 if (a[key] === undefined) {
                     return false;
@@ -100,10 +105,11 @@ export function extend<T>(
     seq?: number,
 ) {
     if (extension !== undefined) {
-        // eslint-disable-next-line guard-for-in
+        // eslint-disable-next-line guard-for-in, no-restricted-syntax
         for (const key in extension) {
             const v = extension[key];
             if (v === null) {
+                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete base[key];
             } else {
                 if (combiningOp && (combiningOp.name !== "rewrite")) {
@@ -122,7 +128,7 @@ export function clone<T>(extension: MapLike<T> | undefined) {
         return undefined;
     }
     const cloneMap = createMap<T>();
-    // eslint-disable-next-line guard-for-in
+    // eslint-disable-next-line guard-for-in, no-restricted-syntax
     for (const key in extension) {
         const v = extension[key];
         if (v !== null) {
@@ -148,7 +154,7 @@ export function addProperties(
 
 export function extendIfUndefined<T>(base: MapLike<T>, extension: MapLike<T> | undefined) {
     if (extension !== undefined) {
-
+        // eslint-disable-next-line no-restricted-syntax
         for (const key in extension) {
             if (base[key] === undefined) {
                 base[key] = extension[key];

package/src/segmentPropertiesManager.ts

@@ -33,7 +33,7 @@ export class PropertiesManager {
                     0x05c /* "Trying to update more annotate props than do exist!" */);
                 this.pendingKeyUpdateCount[key]--;
                 if (this.pendingKeyUpdateCount?.[key] === 0) {
-
+                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                     delete this.pendingKeyUpdateCount[key];
                 }
             }
@@ -78,6 +78,7 @@ export class PropertiesManager {
                 if (!newProps[key] && shouldModifyKey(key)) {
                     deltas[key] = oldProps[key];
 
+                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                     delete oldProps[key];
                 }
             }
@@ -105,7 +106,7 @@ export class PropertiesManager {
                 newValue = newProps[key];
             }
             if (newValue === null) {
-
+                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete oldProps[key];
             } else {
                 oldProps[key] = newValue;
@@ -122,7 +123,7 @@ export class PropertiesManager {
     ): PropertySet | undefined {
         if (oldProps) {
             if (!newProps) {
-
+                // eslint-disable-next-line no-param-reassign
                 newProps = createMap<any>();
             }
             if (!newManager) {

package/src/textSegment.ts

@@ -197,7 +197,6 @@ export class MergeTreeTextHelper {
         end: number, accumText: ITextAccumulatorType) => {
         let _start = start;
         if (TextSegment.is(segment)) {
-
             let beginTags = "";
             let endTags = "";
             if (isTextAndMarkerAccumulator(accumText)) {