@fluidframework/merge-tree 2.102.0 → 2.110.0

package/package.json

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

package/src/client.ts

@@ -25,8 +25,8 @@ import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/
 import { toDeltaManagerInternal } from "@fluidframework/runtime-utils/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
 	LoggingError,
+	type TelemetryLoggerExt,
 	UsageError,
 } from "@fluidframework/telemetry-utils/internal";
 
@@ -193,7 +193,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
 	 */
 	constructor(
 		public readonly specToSegment: (spec: IJSONSegment) => ISegment,
-		public readonly logger: ITelemetryLoggerExt,
+		public readonly logger: TelemetryLoggerExt,
 		options?: IMergeTreeOptionsInternal & PropertySet,
 		private readonly getMinInFlightRefSeq: () => number | undefined = (): undefined =>
 			undefined,

package/src/snapshotChunks.ts

@@ -7,7 +7,7 @@
 
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
-import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 import type { SerializedAttributionCollection } from "./attributionCollection.js";
 import type { IJSONSegment } from "./ops.js";
@@ -85,7 +85,7 @@ export function hasMergeInfo(
 export function serializeAsMinSupportedVersion(
 	path: string,
 	chunk: VersionedMergeTreeChunk,
-	logger: ITelemetryLoggerExt,
+	logger: TelemetryLoggerExt,
 	options: PropertySet | undefined,
 	serializer: IFluidSerializer,
 	bind: IFluidHandle,
@@ -141,7 +141,7 @@ export function serializeAsMinSupportedVersion(
 export function serializeAsMaxSupportedVersion(
 	path: string,
 	chunk: VersionedMergeTreeChunk,
-	logger: ITelemetryLoggerExt,
+	logger: TelemetryLoggerExt,
 	options: PropertySet | undefined,
 	serializer: IFluidSerializer,
 	bind: IFluidHandle,
@@ -153,7 +153,7 @@ export function serializeAsMaxSupportedVersion(
 export function toLatestVersion(
 	path: string,
 	chunk: VersionedMergeTreeChunk,
-	logger: ITelemetryLoggerExt,
+	logger: TelemetryLoggerExt,
 	options: PropertySet | undefined,
 ): MergeTreeChunkV1 {
 	switch (chunk.version) {

package/src/snapshotLoader.ts

@@ -15,9 +15,9 @@ import type {
 import type { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
-	UsageError,
 	createChildLogger,
+	type TelemetryLoggerExt,
+	UsageError,
 } from "@fluidframework/telemetry-utils/internal";
 
 import type { Client } from "./client.js";
@@ -43,14 +43,14 @@ import type { RemoveOperationStamp } from "./stamps.js";
 import * as opstampUtils from "./stamps.js";
 
 export class SnapshotLoader {
-	private readonly logger: ITelemetryLoggerExt;
+	private readonly logger: TelemetryLoggerExt;
 
 	constructor(
 		private readonly runtime: IFluidDataStoreRuntime,
 
 		private readonly client: Client,
 		private readonly mergeTree: MergeTree,
-		logger: ITelemetryLoggerExt,
+		logger: TelemetryLoggerExt,
 		private readonly serializer: IFluidSerializer,
 	) {
 		this.logger = createChildLogger({ logger, namespace: "SnapshotLoader" });

package/src/snapshotV1.ts

@@ -14,8 +14,8 @@ import type {
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
 	createChildLogger,
+	type TelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils/internal";
 
 import type { IAttributionCollection } from "./attributionCollection.js";
@@ -52,12 +52,12 @@ export class SnapshotV1 {
 	private readonly segments: JsonSegmentSpecs[];
 	private readonly segmentLengths: number[];
 	private readonly attributionCollections: IAttributionCollection<AttributionKey>[];
-	private readonly logger: ITelemetryLoggerExt;
+	private readonly logger: TelemetryLoggerExt;
 	private readonly chunkSize: number;
 
 	constructor(
 		public mergeTree: MergeTree,
-		logger: ITelemetryLoggerExt,
+		logger: TelemetryLoggerExt,
 		private readonly getLongClientId: (id: number) => string,
 		public filename?: string,
 		public onCompletion?: () => void,
@@ -367,7 +367,7 @@ export class SnapshotV1 {
 	public static async loadChunk(
 		storage: IChannelStorageService,
 		path: string,
-		logger: ITelemetryLoggerExt,
+		logger: TelemetryLoggerExt,
 		options: PropertySet | undefined,
 		serializer?: IFluidSerializer,
 	): Promise<MergeTreeChunkV1> {
@@ -379,7 +379,7 @@ export class SnapshotV1 {
 	public static processChunk(
 		path: string,
 		chunk: string,
-		logger: ITelemetryLoggerExt,
+		logger: TelemetryLoggerExt,
 		options: PropertySet | undefined,
 		serializer?: IFluidSerializer,
 	): MergeTreeChunkV1 {

package/src/snapshotlegacy.ts

@@ -12,8 +12,8 @@ import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
 	createChildLogger,
+	type TelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils/internal";
 
 import { NonCollabClient } from "./constants.js";
@@ -57,12 +57,12 @@ export class SnapshotLegacy {
 	private header: SnapshotHeader | undefined;
 	private seq: number | undefined;
 	private segments: ISegmentPrivate[] | undefined;
-	private readonly logger: ITelemetryLoggerExt;
+	private readonly logger: TelemetryLoggerExt;
 	private readonly chunkSize: number;
 
 	constructor(
 		public mergeTree: MergeTree,
-		logger: ITelemetryLoggerExt,
+		logger: TelemetryLoggerExt,
 		public filename?: string,
 		public onCompletion?: () => void,
 	) {