@fluidframework/tree 2.90.0 → 2.92.0

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

@@ -34,13 +34,13 @@ import {
 } from "./compressedEncode.js";
 import type { FieldBatch } from "./fieldBatch.js";
 import {
-	type EncodedFieldBatch,
 	type EncodedFieldBatchV1,
+	type EncodedFieldBatchV1OrV2,
 	type EncodedFieldBatchV2,
 	type EncodedValueShape,
 	FieldBatchFormatVersion,
 	SpecialField,
-} from "./format.js";
+} from "./format/index.js";
 import { defaultIncrementalEncodingPolicy } from "./incrementalEncodingPolicy.js";
 import { NodeShapeBasedEncoder } from "./nodeEncoder.js";
 
@@ -55,7 +55,7 @@ export function schemaCompressedEncodeV1(
 	fieldBatch: FieldBatch,
 	idCompressor: IIdCompressor,
 ): EncodedFieldBatchV1 {
-	return schemaCompressedEncode(
+	const encoded: EncodedFieldBatchV1OrV2 = schemaCompressedEncode(
 		schema,
 		policy,
 		fieldBatch,
@@ -63,6 +63,8 @@ export function schemaCompressedEncodeV1(
 		undefined /* incrementalEncoder */,
 		brand(FieldBatchFormatVersion.v1),
 	);
+	// Since incrementalEncoder was not provided, no V2 features should be used, and this cast should be safe.
+	return encoded as EncodedFieldBatchV1;
 }
 
 /**
@@ -104,7 +106,7 @@ function schemaCompressedEncode(
 	idCompressor: IIdCompressor,
 	incrementalEncoder: IncrementalEncoder | undefined,
 	version: FieldBatchFormatVersion,
-): EncodedFieldBatch {
+): EncodedFieldBatchV1OrV2 {
 	return compressedEncode(
 		fieldBatch,
 		buildContext(schema, policy, idCompressor, incrementalEncoder, version),

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

@@ -12,15 +12,15 @@ import { brand } from "../../../util/index.js";
 import type { FluidSerializableReadOnly } from "../../valueUtilities.js";
 
 import type { FieldBatch } from "./fieldBatch.js";
-import {
-	FieldBatchFormatVersion,
-	type EncodedFieldBatch,
-	type EncodedFieldBatchV1,
-	type EncodedFieldBatchV2,
-	type EncodedNestedArrayShape,
-	type EncodedNodeShape,
-} from "./format.js";
-import type { ShapeIndex } from "./formatGeneric.js";
+import type {
+	EncodedFieldBatchV1,
+	EncodedFieldBatchV1AndV2,
+	EncodedFieldBatchV2,
+	EncodedNestedArrayShape,
+	EncodedNodeShape,
+	ShapeIndex,
+} from "./format/index.js";
+import { FieldBatchFormatVersion } from "./format/index.js";
 
 /**
  * Encode data from `cursor` in the simplest way supported by `EncodedChunk` using {@link FieldBatchFormatVersion.v1}.
@@ -49,7 +49,7 @@ export function uncompressedEncodeV2(batch: FieldBatch): EncodedFieldBatchV2 {
 function uncompressedEncode(
 	batch: FieldBatch,
 	version: FieldBatchFormatVersion,
-): EncodedFieldBatch {
+): EncodedFieldBatchV1AndV2 {
 	const rootFields = batch.map(encodeSequence);
 	return {
 		version,

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

@@ -16,7 +16,6 @@ export {
 } from "./chunkTree.js";
 export { buildChunkedForest } from "./chunkedForest.js";
 export {
-	type EncodedFieldBatch,
 	FieldBatchFormatVersion,
 	type FieldBatch,
 	type FieldBatchCodec,
@@ -26,5 +25,7 @@ export {
 	type ChunkReferenceId,
 	type IncrementalEncodingPolicy,
 	defaultIncrementalEncodingPolicy,
+	type EncodedFieldBatchV1OrV2,
+	type EncodedFieldBatchV2,
 } from "./codec/index.js";
 export { emptyChunk } from "./emptyChunk.js";

package/src/feature-libraries/cursorComparator.ts

@@ -0,0 +1,77 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import {
+	mapCursorField,
+	mapCursorFields,
+	inCursorField,
+	type ITreeCursorSynchronous,
+	type Value,
+} from "../core/index.js";
+/**
+ * Tests whether a cursor's current node matches a previously captured subtree.
+ * Built by {@link buildNodeComparator}
+ */
+export type NodeComparator = (cursor: ITreeCursorSynchronous) => boolean;
+
+type FieldComparator = (cursor: ITreeCursorSynchronous) => boolean;
+
+/**
+ * creates a FieldComparator that checks a field has the expected number of
+ *
+ * @remarks
+ * The returned comparator checks that the field has the expected number of children
+ * and that each child node matches the corresponding comparator.
+ */
+function buildFieldComparator(nodeComparators: NodeComparator[]): FieldComparator {
+	const expectedLength = nodeComparators.length;
+	return (cursor: ITreeCursorSynchronous): boolean => {
+		if (cursor.getFieldLength() !== expectedLength) {
+			return false;
+		}
+		for (let inNodes = cursor.firstNode(); inNodes; inNodes = cursor.nextNode()) {
+			const comparator = nodeComparators[cursor.fieldIndex];
+			if (comparator?.(cursor) !== true) {
+				cursor.exitNode();
+				return false;
+			}
+		}
+		return true;
+	};
+}
+/**
+ * Walks the cursor at its current node position and builds a comparator that can test whether another
+ * cursor position has the same structure and values.
+ *
+ * @remarks
+ * Fields are compared by key (not iteration order), so this is safe regardless of cursor field ordering.
+ * Missing fields in the compared node will cause a mismatch.
+ *
+ * The cursor must be in Nodes mode. After this call, the cursor is restored to its original position.
+ *
+ */
+export function buildNodeComparator(cursor: ITreeCursorSynchronous): NodeComparator {
+	const expectedValue: Value = cursor.value;
+	if (expectedValue !== undefined) {
+		return (other: ITreeCursorSynchronous): boolean => Object.is(other.value, expectedValue);
+	}
+	const fieldComparators = mapCursorFields(cursor, (fieldCursor) => ({
+		key: fieldCursor.getFieldKey(),
+		compare: buildFieldComparator(mapCursorField(fieldCursor, buildNodeComparator)),
+	}));
+
+	return (other: ITreeCursorSynchronous): boolean => {
+		if (!Object.is(other.value, expectedValue)) {
+			return false;
+		}
+		for (const { key, compare } of fieldComparators) {
+			if (!inCursorField(other, key, () => compare(other))) {
+				return false;
+			}
+		}
+
+		return true;
+	};
+}

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

@@ -23,7 +23,7 @@ import {
 } from "../../util/index.js";
 import type {
 	ChunkReferenceId,
-	EncodedFieldBatch,
+	EncodedFieldBatchV2,
 	IncrementalEncoderDecoder,
 	IncrementalEncodingPolicy,
 	TreeChunk,
@@ -48,7 +48,7 @@ interface ChunkLoadProperties {
 	/**
 	 * The encoded contents of the chunk.
 	 */
-	readonly encodedContents: EncodedFieldBatch;
+	readonly encodedContents: EncodedFieldBatchV2;
 	/**
 	 * The path for this chunk's contents in the summary tree relative to the forest's summary tree.
 	 * This path is used to generate a summary handle for the chunk if it doesn't change between summaries.
@@ -263,7 +263,7 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 				}
 				const chunkContents = (await args.readAndParseChunk(
 					chunkContentsPath,
-				)) as EncodedFieldBatch; // TODO: this should use a codec to validate the data instead of just type casting.
+				)) as EncodedFieldBatchV2; // TODO: this should use a codec to validate the data instead of just type casting.
 				this.loadedChunksMap.set(chunkReferenceId, {
 					encodedContents: chunkContents,
 					summaryPath: chunkSubTreePath,
@@ -336,7 +336,7 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 	 */
 	public encodeIncrementalField(
 		cursor: ITreeCursorSynchronous,
-		chunkEncoder: (chunk: TreeChunk) => EncodedFieldBatch,
+		chunkEncoder: (chunk: TreeChunk) => EncodedFieldBatchV2,
 	): ChunkReferenceId[] {
 		// Validate that a summary is currently being tracked and that the tracked summary properties are defined.
 		const trackedSummaryProperties = this.requireTrackingSummary();
@@ -478,7 +478,7 @@ export class ForestIncrementalSummaryBuilder implements IncrementalEncoderDecode
 	 */
 	public decodeIncrementalChunk(
 		referenceId: ChunkReferenceId,
-		chunkDecoder: (encoded: EncodedFieldBatch) => TreeChunk,
+		chunkDecoder: (encoded: EncodedFieldBatchV2) => TreeChunk,
 	): TreeChunk {
 		const ChunkLoadProperties = this.loadedChunksMap.get(`${referenceId}`);
 		assert(ChunkLoadProperties !== undefined, 0xc86 /* Encoded incremental chunk not found */);

package/src/feature-libraries/index.ts

@@ -29,7 +29,6 @@ export {
 export { buildForest } from "./object-forest/index.js";
 export {
 	SchemaSummarizer,
-	makeSchemaCodec,
 	schemaCodecBuilder,
 } from "./schema-index/index.js";
 export {
@@ -47,6 +46,10 @@ export {
 	jsonableTreeFromFieldCursor,
 	jsonableTreeFromForest,
 } from "./treeTextCursor.js";
+export {
+	buildNodeComparator,
+	type NodeComparator,
+} from "./cursorComparator.js";
 
 import * as SequenceField from "./sequence-field/index.js";
 // eslint-disable-next-line unicorn/prefer-export-from -- fixing requires `export * as` (breaks API-Extractor) or named exports (changes public API)
@@ -191,9 +194,8 @@ export { DetachedFieldIndexSummarizer } from "./detachedFieldIndexSummarizer.js"
 
 export {
 	type SchemaChange,
-	makeSchemaChangeCodecs,
+	makeSchemaChangeCodec,
 	EncodedSchemaChange,
-	getCodecTreeForSchemaChangeFormat,
 } from "./schema-edits/index.js";
 
 export { makeMitigatedChangeFamily } from "./mitigatedChangeFamily.js";

package/src/feature-libraries/indexing/anchorTreeIndex.ts

@@ -60,6 +60,8 @@ export class AnchorTreeIndex<TKey, TValue> implements TreeIndex<TKey, TValue> {
 	private readonly keyFinders = new Map<TreeNodeSchemaIdentifier, KeyFinder<TKey> | null>();
 	/**
 	 * The actual index from keys to anchor nodes.
+	 * @remarks
+	 * Should not store empty values (and thus values should be a valid {@link TreeIndexNodes}).
 	 */
 	private readonly keyToNodes = new Map<TKey, AnchorNode[]>();
 	/**
@@ -271,7 +273,11 @@ export class AnchorTreeIndex<TKey, TValue> implements TreeIndex<TKey, TValue> {
 	public *allEntries(): IterableIterator<[TKey, TValue]> {
 		this.checkNotDisposed();
 		for (const [key, nodes] of this.keyToNodes.entries()) {
-			const value = this.getValue(nodes as unknown as TreeIndexNodes<AnchorNode>);
+			assert(
+				hasElement(nodes),
+				0xce9 /* expected at least one node for each key in the index */,
+			);
+			const value = this.getValue(nodes);
 			if (value !== undefined) {
 				yield [key, value];
 			}
@@ -420,13 +426,15 @@ export class AnchorTreeIndex<TKey, TValue> implements TreeIndex<TKey, TValue> {
 			indexedNodes !== undefined,
 			0xa90 /* destroyed anchor node should be tracked by index */,
 		);
-		const index = indexedNodes.indexOf(anchorNode);
-		assert(index !== -1, 0xa91 /* destroyed anchor node should be tracked by index */);
 		const newNodes = filterNodes(indexedNodes, (n) => n !== anchorNode);
-		if (newNodes !== undefined && newNodes.length > 0) {
-			this.keyToNodes.set(key, newNodes);
-		} else {
+		if (newNodes === undefined) {
 			this.keyToNodes.delete(key);
+		} else {
+			assert(
+				newNodes.length < indexedNodes.length,
+				0xa91 /* destroyed anchor node should be tracked by index */,
+			);
+			this.keyToNodes.set(key, newNodes);
 		}
 		this.nodeToKey.delete(anchorNode);
 		assert(
@@ -444,7 +452,7 @@ export class AnchorTreeIndex<TKey, TValue> implements TreeIndex<TKey, TValue> {
 			return nodeStatus === TreeStatus.InDocument;
 		});
 
-		if (attachedNodes !== undefined && hasElement(attachedNodes)) {
+		if (attachedNodes !== undefined) {
 			return this.getValue(attachedNodes);
 		}
 	}
@@ -456,11 +464,13 @@ export class AnchorTreeIndex<TKey, TValue> implements TreeIndex<TKey, TValue> {
 function filterNodes(
 	anchorNodes: readonly AnchorNode[] | undefined,
 	filter: (node: AnchorNode) => boolean,
-): AnchorNode[] | undefined {
+): (AnchorNode[] & TreeIndexNodes<AnchorNode>) | undefined {
 	if (anchorNodes !== undefined) {
-		return anchorNodes.filter(filter);
+		const filtered = anchorNodes.filter(filter);
+		if (hasElement(filtered)) {
+			return filtered;
+		}
 	}
-
 	return undefined;
 }
 

package/src/feature-libraries/mitigatedChangeFamily.ts

@@ -73,8 +73,11 @@ export function makeMitigatedRebaser<TChange>(
 			change: TaggedChange<TChange>,
 			over: TaggedChange<TChange>,
 			revisionMetadata: RevisionMetadataSource,
+			ignoreNoChangeViolation?: boolean,
 		): TChange => {
-			return withFallback(() => unmitigatedRebaser.rebase(change, over, revisionMetadata));
+			return withFallback(() =>
+				unmitigatedRebaser.rebase(change, over, revisionMetadata, ignoreNoChangeViolation),
+			);
 		},
 		getRevisions: (change: TChange): Set<RevisionTag | undefined> => {
 			try {

package/src/feature-libraries/modular-schema/crossFieldQueries.ts

@@ -3,12 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import type {
-	ChangeAtomId,
-	ChangeAtomIdRangeMap,
-	ChangesetLocalId,
-	RevisionTag,
-} from "../../core/index.js";
+import type { ChangeAtomIdRangeMap, ChangesetLocalId, RevisionTag } from "../../core/index.js";
 import type { RangeQueryResult } from "../../util/index.js";
 
 import type { NodeId } from "./modularChangeTypes.js";
@@ -40,7 +35,7 @@ export function getFirstFromCrossFieldMap<T>(
 	revision: RevisionTag | undefined,
 	id: ChangesetLocalId,
 	count: number,
-): RangeQueryResult<ChangeAtomId, T> {
+): RangeQueryResult<T | undefined> {
 	return map.getFirst({ revision, localId: id }, count);
 }
 
@@ -64,7 +59,7 @@ export interface CrossFieldManager<T = unknown> {
 		id: ChangesetLocalId,
 		count: number,
 		addDependency: boolean,
-	): RangeQueryResult<ChangeAtomId, T>;
+	): RangeQueryResult<T | undefined>;
 
 	/**
 	 * Sets the range of keys to `newValue`.

package/src/feature-libraries/modular-schema/defaultRevisionReplacer.ts

@@ -60,14 +60,13 @@ export class DefaultRevisionReplacer implements RevisionReplacer {
 				const prior = this.updatedLocalIds.getFirst(remainderStart, remainderCount);
 				if (prior.value === undefined) {
 					const defaultOutputId = continuingOutputId ?? remainderStart.localId;
-					const newLocalId =
-						this.localIds.getAll(defaultOutputId, prior.length).length > 0
-							? // Some of the IDs in this range have already been used in the scope of the updated revision.
-								// We need to allocate new local IDs.
-								brand<ChangesetLocalId>(this.maxSeen + 1)
-							: // This change atom ID uses a local ID that has not yet been used in the scope of the updated revision.
-								// We reuse it as is to minimize the number of IDs that need to be updated.
-								defaultOutputId;
+					const newLocalId = this.areAllUnallocated(defaultOutputId, prior.length)
+						? // This change atom ID uses a local ID that has not yet been used in the scope of the updated revision.
+							// We reuse it as is to minimize the number of IDs that need to be updated.
+							defaultOutputId
+						: // Some of the IDs in this range have already been used in the scope of the updated revision.
+							// We need to allocate new local IDs.
+							brand<ChangesetLocalId>(this.maxSeen + 1);
 
 					this.maxSeen = brand(Math.max(this.maxSeen, newLocalId + prior.length - 1));
 					this.localIds.set(newLocalId, prior.length, true);
@@ -93,4 +92,13 @@ export class DefaultRevisionReplacer implements RevisionReplacer {
 		}
 		return id;
 	}
+
+	private areAllUnallocated(id: ChangesetLocalId, count: number): boolean {
+		for (const entry of this.localIds.getAll(id, count)) {
+			if (entry.value !== undefined) {
+				return false;
+			}
+		}
+		return true;
+	}
 }

package/src/feature-libraries/modular-schema/fieldChangeHandler.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import type { ICodecFamily, IJsonCodec } from "../../codec/index.js";
+import type { ICodecFamily, JsonCodecPart } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
 	DeltaDetachedNodeChanges,
@@ -11,10 +11,10 @@ import type {
 	DeltaDetachedNodeRename,
 	DeltaFieldChanges,
 	DeltaFieldMap,
-	EncodedRevisionTag,
 	RevisionMetadataSource,
 	RevisionReplacer,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import type { IdAllocator, Invariant } from "../../util/index.js";
 
@@ -57,10 +57,9 @@ export interface FieldChangeHandler<
 	_typeCheck?: Invariant<TChangeset>;
 	readonly rebaser: FieldChangeRebaser<TChangeset>;
 	readonly codecsFactory: (
-		revisionTagCodec: IJsonCodec<
+		revisionTagCodec: JsonCodecPart<
 			RevisionTag,
-			EncodedRevisionTag,
-			EncodedRevisionTag,
+			typeof RevisionTagSchema,
 			ChangeEncodingContext
 		>,
 	) => ICodecFamily<TChangeset, FieldChangeEncodingContext>;

package/src/feature-libraries/modular-schema/genericFieldKind.ts

@@ -97,7 +97,6 @@ function rebaseGenericChange(
 	const rebased: GenericChangeset = new BTree();
 	let nextIndex = 0;
 
-	// eslint-disable-next-line no-constant-condition
 	while (true) {
 		const newEntry = change.getPairOrNextHigher(nextIndex);
 		const baseEntry = over.getPairOrNextHigher(nextIndex);

package/src/feature-libraries/modular-schema/modularChangeCodecV1.ts

@@ -9,6 +9,7 @@ import type { TAnySchema } from "@sinclair/typebox";
 import {
 	type ICodecOptions,
 	type IJsonCodec,
+	type JsonCodecPart,
 	type SchemaValidationFunction,
 	extractJsonValidator,
 	withSchemaValidation,
@@ -22,6 +23,7 @@ import type {
 	ITreeCursorSynchronous,
 	RevisionInfo,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import {
 	type IdAllocator,
@@ -279,10 +281,9 @@ export function decodeNodeChangesetFromJson(
 export function encodeDetachedNodes(
 	detachedNodes: ChangeAtomIdBTree<TreeChunk> | undefined,
 	context: ChangeEncodingContext,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,
@@ -336,10 +337,9 @@ export function encodeDetachedNodes(
 export function decodeDetachedNodes(
 	encoded: EncodedBuilds | undefined,
 	context: ChangeEncodingContext,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,
@@ -385,18 +385,16 @@ export function decodeDetachedNodes(
 export function encodeRevisionInfos(
 	revisions: readonly RevisionInfo[],
 	context: ChangeEncodingContext,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): EncodedRevisionInfo[] | undefined {
 	if (context.revision !== undefined) {
 		assert(
-			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- Using optional chaining here would change behavior: `revisions[0]?.rollbackOf === undefined` is true when revisions[0] is undefined, but this check requires revisions[0] to be defined. As currently written, such a change would be safe because context.revision is included in the check and from a couple lines above is confirmed not undefined. But this more verbose form is clearer.
 			revisions.length === 1 &&
-				// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+				// eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- Using optional chaining here would change behavior: `revisions[0]?.rollbackOf === undefined` is true when revisions[0] is undefined, but this check requires revisions[0] to be defined. As currently written, such a change would be safe because context.revision is included in the check and from a couple lines above is confirmed not undefined. But this more verbose form is clearer.
 				revisions[0] !== undefined &&
 				revisions[0].revision === context.revision &&
 				revisions[0].rollbackOf === undefined,
@@ -425,10 +423,9 @@ export function encodeRevisionInfos(
 export function decodeRevisionInfos(
 	revisions: readonly EncodedRevisionInfo[] | undefined,
 	context: ChangeEncodingContext,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): RevisionInfo[] | undefined {
@@ -462,10 +459,9 @@ export function encodeChange(
 			codec: FieldCodec;
 		}
 	>,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,
@@ -514,10 +510,9 @@ export function decodeChange(
 			codec: FieldCodec;
 		}
 	>,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,
@@ -580,10 +575,9 @@ export function decodeChange(
 
 export function getFieldChangesetCodecs(
 	fieldKinds: FieldKindConfiguration,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	codecOptions: ICodecOptions,
@@ -629,10 +623,9 @@ export function getFieldChangesetCodecs(
 
 export function makeModularChangeCodecV1(
 	fieldKinds: FieldKindConfiguration,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,

package/src/feature-libraries/modular-schema/modularChangeCodecV2.ts

@@ -6,12 +6,13 @@
 import {
 	type ICodecOptions,
 	type IJsonCodec,
+	type JsonCodecPart,
 	withSchemaValidation,
 } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import type { FieldBatchCodec } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
@@ -34,10 +35,9 @@ type ModularChangeCodec = IJsonCodec<
 
 export function makeModularChangeCodecV2(
 	fieldKinds: FieldKindConfiguration,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,

package/src/feature-libraries/modular-schema/modularChangeCodecs.ts

@@ -8,13 +8,13 @@ import { fail } from "@fluidframework/core-utils/internal";
 import {
 	type ICodecFamily,
 	type ICodecOptions,
-	type IJsonCodec,
+	type JsonCodecPart,
 	makeCodecFamily,
 } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import { strictEnum, type Values } from "../../util/index.js";
 import type { FieldBatchCodec } from "../chunked-forest/index.js";
@@ -27,10 +27,9 @@ import type { ModularChangeset } from "./modularChangeTypes.js";
 
 export function makeModularChangeCodecFamily(
 	fieldKindConfigurations: ReadonlyMap<ModularChangeFormatVersion, FieldKindConfiguration>,
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 	fieldsCodec: FieldBatchCodec,