@fluidframework/merge-tree 2.115.0 → 2.116.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "2.115.0",
+  "version": "2.116.0",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -81,30 +81,30 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.115.0",
-    "@fluidframework/container-definitions": "~2.115.0",
-    "@fluidframework/core-interfaces": "~2.115.0",
-    "@fluidframework/core-utils": "~2.115.0",
-    "@fluidframework/datastore-definitions": "~2.115.0",
-    "@fluidframework/driver-definitions": "~2.115.0",
-    "@fluidframework/runtime-definitions": "~2.115.0",
-    "@fluidframework/runtime-utils": "~2.115.0",
-    "@fluidframework/shared-object-base": "~2.115.0",
-    "@fluidframework/telemetry-utils": "~2.115.0"
+    "@fluid-internal/client-utils": "~2.116.0",
+    "@fluidframework/container-definitions": "~2.116.0",
+    "@fluidframework/core-interfaces": "~2.116.0",
+    "@fluidframework/core-utils": "~2.116.0",
+    "@fluidframework/datastore-definitions": "~2.116.0",
+    "@fluidframework/driver-definitions": "~2.116.0",
+    "@fluidframework/runtime-definitions": "~2.116.0",
+    "@fluidframework/runtime-utils": "~2.116.0",
+    "@fluidframework/shared-object-base": "~2.116.0",
+    "@fluidframework/telemetry-utils": "~2.116.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.18.2",
+    "@arethetypeswrong/cli": "^0.18.5",
     "@biomejs/biome": "~2.4.5",
-    "@fluid-internal/mocha-test-setup": "~2.115.0",
-    "@fluid-private/stochastic-test-utils": "~2.115.0",
-    "@fluid-private/test-pairwise-generator": "~2.115.0",
+    "@fluid-internal/mocha-test-setup": "~2.116.0",
+    "@fluid-private/stochastic-test-utils": "~2.116.0",
+    "@fluid-private/test-pairwise-generator": "~2.116.0",
     "@fluid-tools/benchmark": "^0.59.0",
-    "@fluid-tools/build-cli": "^0.65.0",
+    "@fluid-tools/build-cli": "^0.67.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.65.0",
-    "@fluidframework/eslint-config-fluid": "^13.0.0",
-    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.112.0",
-    "@fluidframework/test-runtime-utils": "~2.115.0",
+    "@fluidframework/build-tools": "^0.67.0",
+    "@fluidframework/eslint-config-fluid": "^14.0.0",
+    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.114.0",
+    "@fluidframework/test-runtime-utils": "~2.116.0",
     "@microsoft/api-extractor": "7.58.1",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^10.0.10",

package/src/endOfTreeSegment.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils/internal";
+import { fail } from "@fluidframework/core-utils/internal";
 
 import { LocalClientId } from "./constants.js";
 import type { LocalReferenceCollection } from "./localReference.js";
@@ -93,7 +93,7 @@ abstract class BaseEndpointSegment
 }
 
 const notSupported = (): never => {
-	assert(false, 0x3ed /* operation not supported */);
+	fail(0x3ed /* operation not supported */);
 };
 
 /**

package/src/localReference.ts

@@ -590,12 +590,14 @@ export class LocalReferenceCollection {
 		const startList = startNode?.list;
 
 		if (startList !== undefined) {
+			// Discard the buckets (before/at/after) which precede the bucket containing `start`,
+			// so the walk begins at that bucket. `listWalker` then resumes mid-bucket at `startNode`.
 			if (forward) {
-				while (!offsetPositions.empty && offsetPositions.first !== startNode) {
+				while (!offsetPositions.empty && offsetPositions.first?.data !== startList) {
 					offsetPositions.shift();
 				}
 			} else {
-				while (!offsetPositions.empty && offsetPositions.last !== startNode) {
+				while (!offsetPositions.empty && offsetPositions.last?.data !== startList) {
 					offsetPositions.pop();
 				}
 			}

package/src/partialLengths.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils/internal";
+import { assert, fail } from "@fluidframework/core-utils/internal";
 
 import type { MergeTree } from "./mergeTree.js";
 import {
@@ -1179,7 +1179,7 @@ function verifyPartialLengthsInner(
 		} else {
 			// Len adjustment should not make length negative
 			if (partialSeqLengths["minLength"] + partialLength.len < 0) {
-				assert(false, 0x057 /* "Negative length after length adjustment!" */);
+				fail(0x057 /* "Negative length after length adjustment!" */);
 			}
 		}
 	}

package/src/sortedSegmentSet.ts

@@ -77,17 +77,21 @@ export class SortedSegmentSet<
 	protected onFindEquivalent(item: T, startIndex: number): { exists: boolean; index: number } {
 		// SortedSegmentSet may contain multiple items with the same key (e.g. a local ref at offset 0 and the segment it is on).
 		// Items should compare as reference-equal, so we do a linear walk to find the actual item in this case.
-		let index = startIndex;
-		if (item === this.sortedItems[index]) {
-			return { exists: true, index };
+		if (item === this.sortedItems[startIndex]) {
+			return { exists: true, index: startIndex };
 		}
-		for (let b = index - 1; b >= 0 && this.compare(item, this.sortedItems[b]) === 0; b--) {
+		for (
+			let b = startIndex - 1;
+			b >= 0 && this.compare(item, this.sortedItems[b]) === 0;
+			b--
+		) {
 			if (this.sortedItems[b] === item) {
 				return { exists: true, index: b };
 			}
 		}
+		let index = startIndex + 1;
 		for (
-			index + 1;
+			;
 			index < this.sortedItems.length && this.compare(item, this.sortedItems[index]) === 0;
 			index++
 		) {