@fluidframework/merge-tree 3.0.1 → 3.1.0

package/package.json

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

package/src/client.ts

@@ -31,7 +31,6 @@ import {
 } from "@fluidframework/telemetry-utils/internal";
 
 import { MergeTreeTextHelper, type IMergeTreeTextHelper } from "./MergeTreeTextHelper.js";
-import { RedBlackTree } from "./collections/index.js";
 import { NonCollabClient, SquashClient, UniversalSequenceNumber } from "./constants.js";
 import { type LocalReferencePosition, SlidingPreference } from "./localReference.js";
 import {
@@ -54,7 +53,6 @@ import {
 	type ISegmentPrivate,
 	type Marker,
 	type SegmentGroup,
-	compareStrings,
 	isSegmentLeaf,
 	type ISegmentInternal,
 	type ISegmentLeaf,
@@ -173,7 +171,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 
 	private readonly _mergeTree: MergeTree;
 
-	private readonly clientNameToIds = new RedBlackTree<string, number>(compareStrings);
+	private readonly clientNameToIds = new Map<string, number>();
 	private readonly shortClientIdMap: string[] = [];
 
 	/**
@@ -829,14 +827,14 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 	}
 
 	getOrAddShortClientId(longClientId: string): number {
-		if (!this.clientNameToIds.get(longClientId)) {
+		if (!this.clientNameToIds.has(longClientId)) {
 			this.addLongClientId(longClientId);
 		}
 		return this.getShortClientId(longClientId);
 	}
 
 	protected getShortClientId(longClientId: string): number {
-		return this.clientNameToIds.get(longClientId)!.data;
+		return this.clientNameToIds.get(longClientId)!;
 	}
 
 	getLongClientId(shortClientId: number): string {
@@ -844,7 +842,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 	}
 
 	addLongClientId(longClientId: string): void {
-		this.clientNameToIds.put(longClientId, this.shortClientIdMap.length);
+		this.clientNameToIds.set(longClientId, this.shortClientIdMap.length);
 		this.shortClientIdMap.push(longClientId);
 	}
 
@@ -1718,9 +1716,9 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 				);
 			} else {
 				const oldClientId = this.longClientId;
-				const oldData = this.clientNameToIds.get(oldClientId)!.data;
+				const oldData = this.clientNameToIds.get(oldClientId)!;
 				this.longClientId = longClientId;
-				this.clientNameToIds.put(longClientId, oldData);
+				this.clientNameToIds.set(longClientId, oldData);
 				this.shortClientIdMap[oldData] = longClientId;
 			}
 		}

package/src/mergeTreeNodes.ts

@@ -694,13 +694,3 @@ export class CollaborationWindow {
 		};
 	}
 }
-
-/**
- * Compares two numbers.
- */
-export const compareNumbers = (a: number, b: number): number => a - b;
-
-/**
- * Compares two strings.
- */
-export const compareStrings = (a: string, b: string): number => a.localeCompare(b);