@fluidframework/tree 2.113.1 → 2.115.0

package/src/core/tree/detachedFieldIndex.ts

@@ -4,17 +4,8 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-
-import {
-	type CodecWriteOptions,
-	FluidClientVersion,
-	FormatValidatorNoOp,
-	type IJsonCodec,
-} from "../../codec/index.js";
 import {
 	type IdAllocator,
-	type JsonCompatibleReadOnly,
 	type NestedMap,
 	brand,
 	deleteFromNestedMap,
@@ -24,11 +15,10 @@ import {
 	setInNestedMap,
 	tryGetFromNestedMap,
 } from "../../util/index.js";
-import type { RevisionTag, RevisionTagCodec } from "../rebase/index.js";
+import type { RevisionTag } from "../rebase/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
 
 import type * as Delta from "./delta.js";
-import { detachedFieldIndexCodecBuilder } from "./detachedFieldIndexCodecs.js";
 import type {
 	DetachedField,
 	DetachedFieldSummaryData,
@@ -92,9 +82,6 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 		Delta.DetachedNodeId
 	> = new Map();
 
-	private readonly codec: IJsonCodec<DetachedFieldSummaryData>;
-	private readonly options: CodecWriteOptions;
-
 	/**
 	 * The process for loading `DetachedFieldIndex` data from a summary is split into two steps:
 	 * 1. Call {@link loadData}
@@ -112,28 +99,12 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 	public constructor(
 		private readonly name: string,
 		private rootIdAllocator: IdAllocator<ForestRootId>,
-		private readonly revisionTagCodec: RevisionTagCodec,
-		private readonly idCompressor: IIdCompressor,
-		options?: CodecWriteOptions,
-	) {
-		this.options = options ?? {
-			jsonValidator: FormatValidatorNoOp,
-			minVersionForCollab: FluidClientVersion.v2_0,
-		};
-		this.codec = detachedFieldIndexCodecBuilder.build({
-			...this.options,
-			revisionTagCodec,
-			idCompressor,
-		});
-	}
+	) {}
 
 	public clone(): DetachedFieldIndex {
 		const clone = new DetachedFieldIndex(
 			this.name,
 			idAllocatorFromMaxId(this.rootIdAllocator.getMaxId()) as IdAllocator<ForestRootId>,
-			this.revisionTagCodec,
-			this.idCompressor,
-			this.options,
 		);
 		populateNestedMap(this.detachedNodeToField, clone.detachedNodeToField, true);
 		populateNestedMap(
@@ -307,19 +278,17 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 		});
 	}
 
-	public encode(): JsonCompatibleReadOnly {
-		return this.codec.encode({
+	public getSummaryData(): DetachedFieldSummaryData {
+		return {
 			data: this.detachedNodeToField,
 			maxId: this.rootIdAllocator.getMaxId(),
-		});
+		};
 	}
 
 	/**
-	 * Loads the tree index from the given string, this overrides any existing data.
+	 * Loads the tree index from summary data, this overrides any existing data.
 	 */
-	public loadData(data: JsonCompatibleReadOnly): void {
-		const detachedFieldIndex: DetachedFieldSummaryData = this.codec.decode(data);
-
+	public loadData(detachedFieldIndex: DetachedFieldSummaryData): void {
 		this.rootIdAllocator = idAllocatorFromMaxId(
 			detachedFieldIndex.maxId,
 		) as IdAllocator<ForestRootId>;

package/src/core/tree/index.ts

@@ -127,6 +127,8 @@ export {
 	type ReadOnlyDetachedFieldIndex,
 } from "./detachedFieldIndex.js";
 
+export { type DetachedFieldSummaryData } from "./detachedFieldIndexTypes.js";
+
 export { detachedFieldIndexCodecBuilder } from "./detachedFieldIndexCodecs.js";
 export { DetachedFieldIndexFormatVersion } from "./detachedFieldIndexFormatCommon.js";
 export { type FormatV1 } from "./detachedFieldIndexFormatV1.js";

package/src/core/tree/visitorUtils.ts

@@ -3,11 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-
-import type { CodecWriteOptions } from "../../codec/index.js";
 import { type IdAllocator, idAllocatorFromMaxId } from "../../util/index.js";
-import type { RevisionTag, RevisionTagCodec } from "../rebase/index.js";
+import type { RevisionTag } from "../rebase/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
 
 import type { ITreeCursorSynchronous } from "./cursor.js";
@@ -17,19 +14,8 @@ import type { ForestRootId } from "./detachedFieldIndexTypes.js";
 import type { PlaceIndex, Range } from "./pathTree.js";
 import { type DeltaVisitor, visitDelta } from "./visitDelta.js";
 
-export function makeDetachedFieldIndex(
-	prefix: string = "Temp",
-	revisionTagCodec: RevisionTagCodec,
-	idCompressor: IIdCompressor,
-	options?: CodecWriteOptions,
-): DetachedFieldIndex {
-	return new DetachedFieldIndex(
-		prefix,
-		idAllocatorFromMaxId() as IdAllocator<ForestRootId>,
-		revisionTagCodec,
-		idCompressor,
-		options,
-	);
+export function makeDetachedFieldIndex(prefix: string = "Temp"): DetachedFieldIndex {
+	return new DetachedFieldIndex(prefix, idAllocatorFromMaxId() as IdAllocator<ForestRootId>);
 }
 
 export function applyDelta(

package/src/entrypoints/alpha.ts

@@ -178,6 +178,7 @@ export {
 	ChangeMetadata, 
 	CodecName, 
 	CodecWriteOptions, 
+	CommitOutcome, 
 	Component, 
 	CreateIndependentTreeAlphaOptions, 
 	DirtyTreeMap, 
@@ -197,6 +198,7 @@ export {
 	FormatValidatorBasic, 
 	FormatValidatorNoOp, 
 	FormatVersion, 
+	FormattedText, 
 	HandleConverter, 
 	ICodecOptions, 
 	ITreeAlpha, 
@@ -229,6 +231,7 @@ export {
 	JsonTreeSchema, 
 	LabelTree, 
 	LocalChangeMetadata, 
+	LocalCommitEvents, 
 	MapNodeCustomizableSchema, 
 	MapNodeCustomizableSchemaUnsafe, 
 	MapNodePojoEmulationSchema, 
@@ -244,6 +247,7 @@ export {
 	ObjectNodeSchemaWorkaround, 
 	ObjectSchemaOptionsAlpha, 
 	ObservationResults, 
+	PlainText, 
 	ReadSchema, 
 	ReadableField, 
 	RecordNodeCustomizableSchema, 
@@ -256,6 +260,7 @@ export {
 	SchemaFactoryAlpha, 
 	SchemaStaticsAlpha, 
 	SchemaType, 
+	SharedTreeAlpha, 
 	SharedTreeFormatOptions, 
 	SharedTreeOptions, 
 	SimpleAllowedTypeAttributes, 
@@ -271,7 +276,7 @@ export {
 	SimpleTreeSchema, 
 	StagedSchemaUpgradePolicy, 
 	StagedSchemaUpgradePolicyFactory, 
-	TextAsTree, 
+	StringSchema, 
 	TransactionCallbackStatusAlpha, 
 	TransactionConstraintAlpha, 
 	TransactionLabels, 
@@ -283,6 +288,7 @@ export {
 	TreeChangeEventsAlpha, 
 	TreeCompressionStrategy, 
 	TreeContextAlpha, 
+	TreeDataStoreOptions, 
 	TreeIdentifierUtils, 
 	TreeMapNodeAlpha, 
 	TreeParsingOptions, 
@@ -307,6 +313,7 @@ export {
 	createArrayInsertionAnchor, 
 	createIndependentTreeAlpha, 
 	decodeSchemaCompatibilitySnapshot, 
+	defineTreeDataStore, 
 	encodeSchemaCompatibilitySnapshot, 
 	eraseSchemaDetails, 
 	eraseSchemaDetailsSubclassable, 
@@ -321,6 +328,7 @@ export {
 	incrementalSummaryHint, 
 	independentInitializedView, 
 	independentView, 
+	instantiateTreeFirstTime, 
 	minimize, 
 	normalizeAllowedTypes, 
 	persistedToSimpleSchema, 

package/src/feature-libraries/chunked-forest/codec/codecs.ts

@@ -133,10 +133,10 @@ export interface FieldBatchEncodingContext {
 /**
  * Decode-side context for {@link FieldBatchCodec}.
  *
- * Carries the per-call `resolveEncodedId` function that encapsulates the
- * originator-session lookup and (for the forest-summarizer's legacy heal path)
- * the deterministic UUIDv5 synthesis. Heal and originator-session flags live
- * inside that function, not on this context.
+ * Composes an {@link IdDecodingContext} (which carries the per-call `resolveEncodedId`
+ * function encapsulating the originator-session lookup and, for the forest-summarizer's
+ * legacy heal path, the deterministic UUIDv5 synthesis) together with the optional
+ * incremental decoder for this batch.
  *
  * Constructed via one of the two named static factories — {@link forOp} or
  * {@link forSummary} — depending on the call site's semantics. The constructor
@@ -144,18 +144,19 @@ export interface FieldBatchEncodingContext {
  * op-style and summary-style decoding is load-bearing (different invariants
  * apply, and bugs in this area are typically the result of conflating them).
  */
-export class FieldBatchDecodingContext extends IdDecodingContext {
+export class FieldBatchDecodingContext {
 	private constructor(
-		private readonly options: IdDecoderOptionsOriginatorless | IdDecoderOptionsWithOriginator,
+		/**
+		 * Resolves the encoded identifiers contained in this batch.
+		 */
+		public readonly idDecodingContext: IdDecodingContext,
 		/**
 		 * Decoder for incremental fields. Defined when the encoded batch contains
 		 * incremental chunks. Only populated on summary-style contexts; op-style
 		 * contexts always have this undefined.
 		 */
 		public readonly incrementalDecoder?: IncrementalDecoder,
-	) {
-		super(options);
-	}
+	) {}
 
 	/**
 	 * Construct a decode context for an op.
@@ -167,7 +168,7 @@ export class FieldBatchDecodingContext extends IdDecodingContext {
 	 * a UUID. Incremental decoding is not used for ops.
 	 */
 	public static forOp(options: IdDecoderOptionsWithOriginator): FieldBatchDecodingContext {
-		return new FieldBatchDecodingContext(options);
+		return new FieldBatchDecodingContext(new IdDecodingContext(options));
 	}
 
 	/**
@@ -189,7 +190,7 @@ export class FieldBatchDecodingContext extends IdDecodingContext {
 	public static forSummary(
 		options: IdDecoderOptionsOriginatorless | IdDecoderOptionsWithOriginator,
 	): FieldBatchDecodingContext {
-		return new FieldBatchDecodingContext(options);
+		return new FieldBatchDecodingContext(new IdDecodingContext(options));
 	}
 
 	/**
@@ -206,10 +207,10 @@ export class FieldBatchDecodingContext extends IdDecodingContext {
 		// This mitigates the risk of using incorrect originator session ID identifiers in incremental chunks.
 		// See also private remarks on forSummary.
 		assert(
-			!this.hasOriginatorSessionId,
+			!this.idDecodingContext.hasOriginatorSessionId,
 			0xd0c /* withIncrementalDecoder can only be called on contexts without an originator session ID */,
 		);
-		return new FieldBatchDecodingContext(this.options, incrementalDecoder);
+		return new FieldBatchDecodingContext(this.idDecodingContext, incrementalDecoder);
 	}
 }
 
@@ -298,7 +299,9 @@ function makeFieldBatchCodecForVersion(
 			context: FieldBatchDecodingContext,
 		): FieldBatch => {
 			// TODO: consider checking data is in schema.
-			return decode(data, context, context.incrementalDecoder).map((chunk) => chunk.cursor());
+			return decode(data, context.idDecodingContext, context.incrementalDecoder).map((chunk) =>
+				chunk.cursor(),
+			);
 		},
 		schema: encodedFieldBatchType,
 	};

package/src/feature-libraries/chunked-forest/uniformChunk.ts

@@ -191,6 +191,17 @@ export class TreeShape {
 	}
 
 	public equals(other: TreeShape): boolean {
+		// Shapes are commonly shared (e.g. all chunks from one chunker reference the same instance), so
+		// short-circuit on reference identity to avoid the full structural walk in the common case.
+		if (this === other) {
+			return true;
+		}
+
+		// A given type usually only has one shape, so check it next to speed up the false case.
+		if (this.type !== other.type) {
+			return false;
+		}
+
 		// TODO: either dedupe instances and/or store a collision resistant hash for fast compare.
 
 		if (
@@ -203,7 +214,6 @@ export class TreeShape {
 			return false;
 		}
 		return (
-			this.type === other.type &&
 			this.hasValue === other.hasValue &&
 			this.mayContainCompressedIds === other.mayContainCompressedIds
 		);

package/src/feature-libraries/comparison-forest/comparisonForest.ts

@@ -0,0 +1,140 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { Listenable } from "@fluidframework/core-interfaces";
+
+import {
+	type Anchor,
+	type AnchorSet,
+	type AnnouncedVisitor,
+	type DeltaVisitor,
+	type FieldAnchor,
+	type ForestEvents,
+	type IEditableForest,
+	type ITreeCursorSynchronous,
+	type ITreeSubscriptionCursor,
+	type TreeChunk,
+	type TreeNavigationResult,
+	type TreeStoredSchemaSubscription,
+	type UpPath,
+	combineVisitors,
+	createAnnouncedVisitor,
+} from "../../core/index.js";
+import type { Breakable } from "../../util/index.js";
+
+import { assertForestsEqual } from "../treeTextCursor.js";
+
+/**
+ * An {@link IEditableForest} which wraps two other forests: a `main` forest and a `reference` forest.
+ *
+ * @remarks
+ * All read operations are delegated to `main`, so from the outside a `ComparisonForest` behaves exactly like its `main` forest.
+ *
+ * When a delta is applied (via {@link IEditableForest.acquireVisitor}), the delta is applied to both `main` and `reference`.
+ * Once the visitor is freed, the full contents of both forests (including all detached/removed fields) are compared,
+ * and an error is thrown if they differ.
+ *
+ * This is a testing/debugging aid: it allows validating that a forest implementation (for example the optimized `ChunkedForest`)
+ * produces the same results as a simpler reference implementation (for example the `ObjectForest`) for every delta that is applied.
+ *
+ * @privateRemarks
+ * This forest is intentionally expensive: it maintains two full copies of the data and re-reads and
+ * structurally compares all of their contents after every delta.
+ */
+export class ComparisonForest implements IEditableForest {
+	/**
+	 * @param main - The forest whose behavior is under test.
+	 * All reads are delegated to this forest, and it is the source of truth for anchors and events.
+	 * @param reference - The forest to compare against.
+	 * This forest receives all the same deltas as `main`, and its contents are asserted to match `main` after each delta.
+	 */
+	public constructor(
+		public readonly main: IEditableForest,
+		public readonly reference: IEditableForest,
+	) {
+		this.assertValid();
+	}
+
+	private assertValid(): void {
+		assertForestsEqual(this.main, this.reference);
+	}
+
+	public get events(): Listenable<ForestEvents> {
+		return this.main.events;
+	}
+
+	public get anchors(): AnchorSet {
+		return this.main.anchors;
+	}
+
+	public get isEmpty(): boolean {
+		return this.main.isEmpty;
+	}
+
+	public clone(schema: TreeStoredSchemaSubscription, breaker?: Breakable): ComparisonForest {
+		this.assertValid();
+		return new ComparisonForest(
+			this.main.clone(schema, breaker),
+			this.reference.clone(schema, breaker),
+		);
+	}
+
+	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk[] {
+		return this.main.chunkField(cursor);
+	}
+
+	public allocateCursor(source?: string): ITreeSubscriptionCursor {
+		// Currently we just use the cursor from "main", but we could use "reference" or a custom cursor ensuring both match in behavior.
+		// TODO: Add a custom combined cursor type which validates two cursors match, and use it here.
+		return this.main.allocateCursor(source);
+	}
+
+	public forgetAnchor(anchor: Anchor): void {
+		this.main.forgetAnchor(anchor);
+	}
+
+	public tryMoveCursorToNode(
+		destination: Anchor,
+		cursorToMove: ITreeSubscriptionCursor,
+	): TreeNavigationResult {
+		return this.main.tryMoveCursorToNode(destination, cursorToMove);
+	}
+
+	public tryMoveCursorToField(
+		destination: FieldAnchor,
+		cursorToMove: ITreeSubscriptionCursor,
+	): TreeNavigationResult {
+		return this.main.tryMoveCursorToField(destination, cursorToMove);
+	}
+
+	public moveCursorToPath(destination: UpPath, cursorToMove: ITreeSubscriptionCursor): void {
+		this.main.moveCursorToPath(destination, cursorToMove);
+	}
+
+	public getCursorAboveDetachedFields(): ITreeCursorSynchronous {
+		return this.main.getCursorAboveDetachedFields();
+	}
+
+	public registerAnnouncedVisitor(visitor: () => AnnouncedVisitor): void {
+		this.main.registerAnnouncedVisitor(visitor);
+	}
+
+	public deregisterAnnouncedVisitor(visitor: () => AnnouncedVisitor): void {
+		this.main.deregisterAnnouncedVisitor(visitor);
+	}
+
+	public acquireVisitor(): DeltaVisitor {
+		this.assertValid();
+		const main = this.main;
+		const reference = this.reference;
+		const mainVisitor = main.acquireVisitor();
+		const referenceVisitor = reference.acquireVisitor();
+		// A visitor which does nothing except assert the two forests match once the delta has been fully applied to both.
+		const comparisonVisitor = createAnnouncedVisitor({
+			free: () => this.assertValid(),
+		});
+		return combineVisitors([mainVisitor, referenceVisitor, comparisonVisitor]);
+	}
+}

package/src/feature-libraries/comparison-forest/index.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export { ComparisonForest } from "./comparisonForest.js";

package/src/feature-libraries/default-schema/defaultEditBuilder.ts

@@ -10,6 +10,7 @@ import type { CodecWriteOptions, ICodecFamily } from "../../codec/index.js";
 import {
 	type ChangeAtomId,
 	type ChangeEncodingContext,
+	type ChangeDecodingContext,
 	type ChangeFamily,
 	type ChangeFamilyEditor,
 	type ChangeRebaser,
@@ -24,6 +25,7 @@ import {
 	type UpPath,
 	compareFieldUpPaths,
 	topDownPath,
+	type ProcessChangeFn,
 } from "../../core/index.js";
 import { brand } from "../../util/index.js";
 import {
@@ -43,18 +45,20 @@ import { fieldKinds } from "./defaultFieldKinds.js";
 
 export type DefaultChangeset = ModularChangeset;
 
+export type DefaultChangeProcessingContext = ModularChangeFamily;
+
 /**
  * Implementation of {@link ChangeFamily} based on the default set of supported field kinds.
  *
  * @sealed
  */
 export class DefaultChangeFamily
-	implements ChangeFamily<DefaultEditBuilder, DefaultChangeset>
+	implements ChangeFamily<DefaultEditBuilder, DefaultChangeset, DefaultChangeProcessingContext>
 {
 	private readonly modularFamily: ModularChangeFamily;
 
 	public constructor(
-		codecs: ICodecFamily<ModularChangeset, ChangeEncodingContext>,
+		codecs: ICodecFamily<ModularChangeset, ChangeEncodingContext, ChangeDecodingContext>,
 		codecOptions: CodecWriteOptions,
 	) {
 		this.modularFamily = new ModularChangeFamily(fieldKinds, codecs, codecOptions);
@@ -64,7 +68,11 @@ export class DefaultChangeFamily
 		return this.modularFamily.rebaser;
 	}
 
-	public get codecs(): ICodecFamily<DefaultChangeset, ChangeEncodingContext> {
+	public get codecs(): ICodecFamily<
+		DefaultChangeset,
+		ChangeEncodingContext,
+		ChangeDecodingContext
+	> {
 		return this.modularFamily.codecs;
 	}
 
@@ -73,12 +81,18 @@ export class DefaultChangeFamily
 		changeReceiver: (change: TaggedChange<DefaultChangeset>) => void,
 	): DefaultEditBuilder {
 		return new DefaultEditBuilder(
-			this,
+			this.modularFamily.rebaser,
 			mintRevisionTag,
 			changeReceiver,
 			this.modularFamily.codecOptions,
 		);
 	}
+
+	public buildProcessor(
+		processFn: ProcessChangeFn<DefaultChangeset, DefaultChangeProcessingContext>,
+	): (change: DefaultChangeset) => DefaultChangeset {
+		return this.modularFamily.buildProcessor(processFn);
+	}
 }
 
 /**
@@ -194,13 +208,13 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 	private readonly modularBuilder: ModularEditBuilder;
 
 	public constructor(
-		family: ChangeFamily<ChangeFamilyEditor, DefaultChangeset>,
+		rebaser: ChangeRebaser<DefaultChangeset>,
 		private readonly mintRevisionTag: () => RevisionTag,
 		changeReceiver: (change: TaggedChange<DefaultChangeset>) => void,
 		codecOptions: CodecWriteOptions,
 	) {
 		this.modularBuilder = new ModularEditBuilder(
-			family,
+			rebaser,
 			fieldKinds,
 			changeReceiver,
 			codecOptions,

package/src/feature-libraries/default-schema/index.ts

@@ -12,6 +12,7 @@ export {
 } from "./defaultFieldKinds.js";
 
 export {
+	type DefaultChangeProcessingContext,
 	type DefaultChangeset,
 	DefaultChangeFamily,
 	DefaultEditBuilder,

package/src/feature-libraries/default-schema/noChangeCodecs.ts

@@ -4,7 +4,15 @@
  */
 
 import { type ICodecFamily, makeCodecFamily, unitCodec } from "../../codec/index.js";
-import type { FieldChangeEncodingContext } from "../modular-schema/index.js";
+import type {
+	FieldChangeEncodingContext,
+	FieldChangeDecodingContext,
+} from "../modular-schema/index.js";
 
-export const noChangeCodecFamily: ICodecFamily<0, FieldChangeEncodingContext> =
-	makeCodecFamily<0, FieldChangeEncodingContext>([[1, unitCodec]]);
+export const noChangeCodecFamily: ICodecFamily<
+	0,
+	FieldChangeEncodingContext,
+	FieldChangeDecodingContext
+> = makeCodecFamily<0, FieldChangeEncodingContext, FieldChangeDecodingContext>([
+	[1, unitCodec],
+]);

package/src/feature-libraries/detachedFieldIndexSummarizer.ts

@@ -5,6 +5,7 @@
 
 import { bufferToString } from "@fluid-internal/client-utils";
 import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type {
 	IExperimentalIncrementalSummaryContext,
 	ITelemetryContext,
@@ -12,7 +13,18 @@ import type {
 } from "@fluidframework/runtime-definitions/internal";
 import type { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 
-import type { DetachedFieldIndex } from "../core/index.js";
+import {
+	type CodecWriteOptions,
+	FluidClientVersion,
+	FormatValidatorNoOp,
+	type IJsonCodec,
+} from "../codec/index.js";
+import {
+	type DetachedFieldIndex,
+	type DetachedFieldSummaryData,
+	type RevisionTagCodec,
+	detachedFieldIndexCodecBuilder,
+} from "../core/index.js";
 import {
 	type Summarizable,
 	type SummaryElementParser,
@@ -66,16 +78,31 @@ export class DetachedFieldIndexSummarizer
 	extends VersionedSummarizer<DetachedFieldIndexSummaryFormatVersion>
 	implements Summarizable
 {
+	private readonly codec: IJsonCodec<DetachedFieldSummaryData>;
+
 	public constructor(
 		private readonly detachedFieldIndex: DetachedFieldIndex,
-		minVersionForCollab: MinimumVersionForCollab,
+		revisionTagCodec: RevisionTagCodec,
+		idCompressor: IIdCompressor,
+		options?: CodecWriteOptions,
 	) {
+		const normalizedOptions = options ?? {
+			jsonValidator: FormatValidatorNoOp,
+			minVersionForCollab: FluidClientVersion.v2_0,
+		};
 		super(
 			"DetachedFieldIndex",
-			minVersionToDetachedFieldIndexSummaryFormatVersion(minVersionForCollab),
+			minVersionToDetachedFieldIndexSummaryFormatVersion(
+				normalizedOptions.minVersionForCollab,
+			),
 			supportedVersions,
 			true,
 		);
+		this.codec = detachedFieldIndexCodecBuilder.build({
+			...normalizedOptions,
+			revisionTagCodec,
+			idCompressor,
+		});
 	}
 
 	protected summarizeInternal(props: {
@@ -87,7 +114,7 @@ export class DetachedFieldIndexSummarizer
 		builder: SummaryTreeBuilder;
 	}): void {
 		const { stringify, builder } = props;
-		const data = this.detachedFieldIndex.encode();
+		const data = this.codec.encode(this.detachedFieldIndex.getSummaryData());
 		builder.addBlob(detachedFieldIndexBlobKey, stringify(data));
 	}
 
@@ -99,7 +126,8 @@ export class DetachedFieldIndexSummarizer
 			const detachedFieldIndexBuffer = await services.readBlob(detachedFieldIndexBlobKey);
 			const treeBufferString = bufferToString(detachedFieldIndexBuffer, "utf8");
 			const parsed = parse(treeBufferString) as JsonCompatibleReadOnly;
-			this.detachedFieldIndex.loadData(parsed);
+			const decoded = this.codec.decode(parsed);
+			this.detachedFieldIndex.loadData(decoded);
 		}
 	}
 }

package/src/feature-libraries/forest-summary/forestSummarizer.ts

@@ -20,7 +20,6 @@ import {
 	type IEditableForest,
 	type ITreeCursorSynchronous,
 	type ITreeSubscriptionCursor,
-	type RevisionTagCodec,
 	TreeNavigationResult,
 	applyDelta,
 	forEachField,
@@ -79,7 +78,6 @@ export class ForestSummarizer
 	 */
 	public constructor(
 		private readonly forest: IEditableForest,
-		private readonly revisionTagCodec: RevisionTagCodec,
 		private readonly encoderContext: FieldBatchEncodingContext,
 		private readonly decoderContext: FieldBatchDecodingContext,
 		options: CodecWriteOptions,
@@ -240,7 +238,7 @@ export class ForestSummarizer
 			{ build, fields: new Map(fieldChanges) },
 			undefined,
 			this.forest,
-			makeDetachedFieldIndex("init", this.revisionTagCodec, this.idCompressor),
+			makeDetachedFieldIndex("init"),
 		);
 	}
 }