@fluidframework/merge-tree 2.101.1 → 2.103.0

package/src/snapshotLoader.ts

@@ -15,7 +15,7 @@ import type {
 import type { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
+	type TelemetryLoggerExt,
 	UsageError,
 	createChildLogger,
 } from "@fluidframework/telemetry-utils/internal";
@@ -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" });
@@ -135,16 +135,13 @@ export class SnapshotLoader {
 				// out ok since none of these values end up being used. (specifically, the 'firstRemovedSeq' is fake
 				// for all values other than the actual first remove).
 				// This issue only affects V1 summaries, as the strategy in snapshotlegacy avoids storing merge info directly.
-				removes.push(
-					...spec.removedClientIds.map(
-						(id) =>
-							({
-								type: "setRemove",
-								seq: firstRemovedSeq,
-								clientId: this.client.getOrAddShortClientId(id),
-							}) as const,
-					),
-				);
+				for (const id of spec.removedClientIds) {
+					removes.push({
+						type: "setRemove",
+						seq: firstRemovedSeq,
+						clientId: this.client.getOrAddShortClientId(id),
+					} as const);
+				}
 			}
 			if (spec.movedSeq !== undefined) {
 				assert(
@@ -156,16 +153,15 @@ export class SnapshotLoader {
 					0xb5f /* Expected same length for client ids and seqs */,
 				);
 
-				removes.push(
-					...spec.movedClientIds.map(
-						(id, i) =>
-							({
-								type: "sliceRemove",
-								seq: spec.movedSeqs![i],
-								clientId: this.client.getOrAddShortClientId(id),
-							}) as const,
-					),
-				);
+				// Avoid spreading into push: a large array could exceed the engine's
+				// argument-count limit and throw RangeError.
+				for (let i = 0; i < spec.movedClientIds.length; i++) {
+					removes.push({
+						type: "sliceRemove",
+						seq: spec.movedSeqs[i],
+						clientId: this.client.getOrAddShortClientId(spec.movedClientIds[i]),
+					} as const);
+				}
 			}
 
 			if (removes.length > 0) {
@@ -258,7 +254,11 @@ export class SnapshotLoader {
 			const newSegs = chunk.segments.map((element) => this.specToSegment(element));
 			this.extractAttribution(newSegs, chunk);
 			chunksWithAttribution += chunk.attribution === undefined ? 0 : 1;
-			segs.push(...newSegs);
+			// Avoid `push(...newSegs)`: spreading a large array into a variadic call
+			// can exceed the engine's argument-count limit and throw RangeError.
+			for (const seg of newSegs) {
+				segs.push(seg);
+			}
 		}
 
 		assert(

package/src/snapshotV1.ts

@@ -14,7 +14,7 @@ import type {
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
 import {
-	type ITelemetryLoggerExt,
+	type TelemetryLoggerExt,
 	createChildLogger,
 } from "@fluidframework/telemetry-utils/internal";
 
@@ -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,7 +12,7 @@ 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,
+	type TelemetryLoggerExt,
 	createChildLogger,
 } from "@fluidframework/telemetry-utils/internal";
 
@@ -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,
 	) {