@fluidframework/tree 2.62.0-356644 → 2.62.0

package/src/feature-libraries/flex-tree/lazyNode.ts

@@ -33,6 +33,7 @@ import {
 } from "./flexTreeTypes.js";
 import { LazyEntity } from "./lazyEntity.js";
 import { makeField } from "./lazyField.js";
+import { currentObserver } from "./observer.js";
 
 /**
  * Get or create a {@link HydratedFlexTreeNode} for the given context at node indicated by the cursor.
@@ -118,18 +119,23 @@ export class LazyTreeNode extends LazyEntity<Anchor> implements HydratedFlexTree
 	public readonly fields: Pick<Map<FieldKey, FlexTreeField>, typeof Symbol.iterator | "get"> =
 		{
 			get: (key: FieldKey): FlexTreeField | undefined => this.tryGetField(key),
-			[Symbol.iterator]: (): IterableIterator<[FieldKey, FlexTreeField]> =>
-				mapCursorFields(this.cursor, (cursor) => {
+			[Symbol.iterator]: (): IterableIterator<[FieldKey, FlexTreeField]> => {
+				currentObserver?.observeNodeFields(this);
+
+				return mapCursorFields(this.cursor, (cursor) => {
 					const key: FieldKey = cursor.getFieldKey();
 					const pair: [FieldKey, FlexTreeField] = [
 						key,
 						makeField(this.context, this.storedSchema.getFieldSchema(key).kind, cursor),
 					];
 					return pair;
-				}).values(),
+				}).values();
+			},
 		};
 
 	public tryGetField(fieldKey: FieldKey): FlexTreeField | undefined {
+		currentObserver?.observeNodeField(this, fieldKey);
+
 		const schema = this.storedSchema.getFieldSchema(fieldKey);
 		return inCursorField(this.cursor, fieldKey, (cursor) => {
 			if (cursor.getFieldLength() === 0) {
@@ -140,6 +146,8 @@ export class LazyTreeNode extends LazyEntity<Anchor> implements HydratedFlexTree
 	}
 
 	public getBoxed(key: FieldKey): FlexTreeField {
+		currentObserver?.observeNodeField(this, key);
+
 		const fieldSchema = this.storedSchema.getFieldSchema(key);
 		return inCursorField(this.cursor, key, (cursor) => {
 			return makeField(this.context, fieldSchema.kind, cursor);
@@ -157,6 +165,8 @@ export class LazyTreeNode extends LazyEntity<Anchor> implements HydratedFlexTree
 	}
 
 	public get parentField(): { readonly parent: FlexTreeField; readonly index: number } {
+		currentObserver?.observeParentOf(this);
+
 		const cursor = this.cursor;
 		const index = this.anchorNode.parentIndex;
 		assert(cursor.fieldIndex === index, 0x786 /* mismatched indexes */);

package/src/feature-libraries/flex-tree/observer.ts

@@ -0,0 +1,64 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { debugAssert } from "@fluidframework/core-utils/internal";
+import type { FlexTreeNode } from "./flexTreeTypes.js";
+import type { FieldKey } from "../../core/index.js";
+
+/*
+ * This file sets up a static observation tracking system.
+ *
+ * This library used to contain a more general variant of this which was deleted in https://github.com/microsoft/FluidFramework/pull/18659.
+ * This pattern somewhat resembles the approach in https://github.com/tc39/proposal-signals.
+ */
+
+/**
+ * An object informed about observation made to trees.
+ * @remarks
+ * See {@link withObservation} and {@link currentObserver}.
+ */
+export interface Observer {
+	observeNodeFields(node: FlexTreeNode): void;
+	observeNodeField(node: FlexTreeNode, key: FieldKey): void;
+	observeParentOf(node: FlexTreeNode): void;
+}
+
+/**
+ * The current observer, if any.
+ * @remarks
+ * Set via {@link setObserver} as used by {@link withObservation}.
+ * It should not be assigned in any other way.
+ * @privateRemarks
+ * This is exported directly as a property instead of via a getter for reduced overhead (less code, faster access) as this is used on some hot paths and its performance matters.
+ * The case where this is undefined (no observation) is particularly important for performance as we do not want to regress code which is not using this feature very much.
+ * Since it is not exported outside the package, this seems like a fine tradeoff, but could be reevaluated with some benchmarking if needed.
+ */
+export let currentObserver: Observer | undefined;
+
+const observerStack: (Observer | undefined)[] = [];
+
+function setObserver(newObserver: Observer | undefined): void {
+	observerStack.push(newObserver);
+	currentObserver = newObserver;
+}
+
+function clearObserver(): void {
+	debugAssert(() => observerStack.length > 0 || "Empty Observer stack on clear");
+	const popped = observerStack.pop();
+	debugAssert(() => popped === currentObserver || "Mismatched observer stack");
+	currentObserver = observerStack[observerStack.length - 1];
+}
+
+/**
+ * For the duration of `f`, pushes `newObserver` onto the observer stack, making it the {@link currentObserver}.
+ */
+export function withObservation<T>(newObserver: Observer | undefined, f: () => T): T {
+	setObserver(newObserver);
+	try {
+		return f();
+	} finally {
+		clearObserver();
+	}
+}

package/src/feature-libraries/index.ts

@@ -171,6 +171,9 @@ export {
 	type FlexTreeHydratedContextMinimal,
 	type HydratedFlexTreeNode,
 	getOrCreateHydratedFlexTreeNode,
+	currentObserver,
+	withObservation,
+	type Observer,
 } from "./flex-tree/index.js";
 
 export {

package/src/index.ts

@@ -57,6 +57,7 @@ export {
 export {
 	type ITreeInternal,
 	type SharedTreeOptions,
+	type SharedTreeOptionsBeta,
 	type ForestType,
 	type SharedTreeFormatOptions,
 	SharedTreeFormatVersion,
@@ -69,6 +70,7 @@ export {
 	independentInitializedView,
 	type ViewContent,
 	TreeAlpha,
+	type ObservationResults,
 	type TreeIdentifierUtils,
 	independentView,
 	ForestTypeOptimized,
@@ -275,6 +277,8 @@ export {
 export {
 	SharedTree,
 	configuredSharedTree,
+	configuredSharedTreeBeta,
+	configuredSharedTreeBetaLegacy,
 } from "./treeFactory.js";
 export { SharedTreeAttributes, SharedTreeFactoryType } from "./sharedTreeAttributes.js";
 export { persistedToSimpleSchema } from "./shared-tree/index.js";
@@ -282,14 +286,11 @@ export { persistedToSimpleSchema } from "./shared-tree/index.js";
 export {
 	type ICodecOptions,
 	type CodecWriteOptions,
-	type JsonValidator,
-	type SchemaValidationFunction,
 	FluidClientVersion,
 	type FormatValidator,
 	FormatValidatorNoOp,
 } from "./codec/index.js";
-export { noopValidator } from "./codec/index.js";
-export { typeboxValidator, FormatValidatorBasic } from "./external-utilities/index.js";
+export { FormatValidatorBasic } from "./external-utilities/index.js";
 
 export type {
 	// Type Testing
@@ -332,3 +333,4 @@ export type { MapNodeInsertableData } from "./simple-tree/index.js";
 export { JsonAsTree } from "./jsonDomainSchema.js";
 export { FluidSerializableAsTree } from "./serializableDomainSchema.js";
 export { TableSchema, type System_TableSchema } from "./tableSchema.js";
+export { asAlpha } from "./api.js";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/tree";
-export const pkgVersion = "2.62.0-356644";
+export const pkgVersion = "2.62.0";

package/src/shared-tree/index.ts

@@ -7,6 +7,7 @@ export {
 	type ITreePrivate,
 	type SharedTreeOptionsInternal,
 	type SharedTreeOptions,
+	type SharedTreeOptionsBeta,
 	SharedTreeKernel,
 	getBranch,
 	type ForestType,
@@ -49,6 +50,7 @@ export type { RunTransaction } from "./tree.js";
 export {
 	TreeAlpha,
 	type TreeIdentifierUtils,
+	type ObservationResults,
 } from "./treeAlpha.js";
 
 export {

package/src/shared-tree/sharedTree.ts

@@ -20,8 +20,8 @@ import {
 import {
 	type CodecWriteOptions,
 	FluidClientVersion,
+	FormatValidatorNoOp,
 	type ICodecOptions,
-	noopValidator,
 } from "../codec/index.js";
 import {
 	type FieldKey,
@@ -350,6 +350,7 @@ export class SharedTreeKernel
 			viewWith: this.viewWith.bind(this),
 			viewSharedBranchWith: this.viewBranchWith.bind(this),
 			createSharedBranch: this.createSharedBranch.bind(this),
+			getSharedBranchIds: this.getSharedBranchIds.bind(this),
 			kernel: this,
 		};
 	}
@@ -634,13 +635,19 @@ export const SharedTreeFormatVersion = {
  */
 export type SharedTreeFormatVersion = typeof SharedTreeFormatVersion;
 
+/**
+ * Configuration options for SharedTree.
+ * @beta @input
+ */
+export type SharedTreeOptionsBeta = ForestOptions;
+
 /**
  * Configuration options for SharedTree.
  * @alpha @input
  */
 export type SharedTreeOptions = Partial<CodecWriteOptions> &
 	Partial<SharedTreeFormatOptions> &
-	ForestOptions;
+	SharedTreeOptionsBeta;
 
 export interface SharedTreeOptionsInternal
 	extends Omit<SharedTreeOptions, "treeEncodeType">,
@@ -718,7 +725,7 @@ export interface ForestType extends ErasedType<"ForestType"> {}
  * A simple implementation with minimal complexity and moderate debuggability, validation and performance.
  * @privateRemarks
  * The "ObjectForest" forest type.
- * @alpha
+ * @beta
  */
 export const ForestTypeReference = toForestType(
 	(breaker: Breakable, schema: TreeStoredSchemaSubscription, idCompressor: IIdCompressor) =>
@@ -732,7 +739,7 @@ export const ForestTypeReference = toForestType(
  * Uses an internal representation optimized for size designed to scale to larger datasets with reduced overhead.
  * @privateRemarks
  * The "ChunkedForest" forest type.
- * @alpha
+ * @beta
  */
 export const ForestTypeOptimized = toForestType(
 	(breaker: Breakable, schema: TreeStoredSchemaSubscription, idCompressor: IIdCompressor) =>
@@ -746,7 +753,7 @@ export const ForestTypeOptimized = toForestType(
  * May be asymptotically slower than {@link ForestTypeReference}, and may perform very badly with larger data sizes.
  * @privateRemarks
  * The "ObjectForest" forest type with expensive asserts for debugging.
- * @alpha
+ * @beta
  */
 export const ForestTypeExpensiveDebug = toForestType(
 	(breaker: Breakable, schema: TreeStoredSchemaSubscription) =>
@@ -776,7 +783,7 @@ export function buildConfiguredForest(
 }
 
 export const defaultSharedTreeOptions: Required<SharedTreeOptionsInternal> = {
-	jsonValidator: noopValidator,
+	jsonValidator: FormatValidatorNoOp,
 	oldestCompatibleClient: FluidClientVersion.v2_0,
 	forest: ForestTypeReference,
 	treeEncodeType: TreeCompressionStrategy.Compressed,

package/src/shared-tree/treeAlpha.ts

@@ -17,7 +17,7 @@ import type { IIdCompressor } from "@fluidframework/id-compressor";
 import {
 	asIndex,
 	getKernel,
-	type TreeNode,
+	TreeNode,
 	type Unhydrated,
 	TreeBeta,
 	tryGetSchema,
@@ -55,15 +55,16 @@ import {
 	convertField,
 	toUnhydratedSchema,
 	type TreeParsingOptions,
+	type NodeChangedData,
 } from "../simple-tree/index.js";
 import { brand, extractFromOpaque, type JsonCompatible } from "../util/index.js";
 import {
 	FluidClientVersion,
-	noopValidator,
 	type ICodecOptions,
 	type CodecWriteOptions,
+	FormatValidatorNoOp,
 } from "../codec/index.js";
-import { EmptyKey, type ITreeCursorSynchronous } from "../core/index.js";
+import { EmptyKey, type FieldKey, type ITreeCursorSynchronous } from "../core/index.js";
 import {
 	cursorForMapTreeField,
 	defaultSchemaPolicy,
@@ -76,6 +77,9 @@ import {
 	fluidVersionToFieldBatchCodecWriteVersion,
 	type LocalNodeIdentifier,
 	type FlexTreeSequenceField,
+	type FlexTreeNode,
+	type Observer,
+	withObservation,
 } from "../feature-libraries/index.js";
 import { independentInitializedView, type ViewContent } from "./independentView.js";
 import { SchematizingSimpleTreeView, ViewSlot } from "./schematizingTreeView.js";
@@ -419,6 +423,283 @@ export interface TreeAlpha {
 	children(
 		node: TreeNode,
 	): Iterable<[propertyKey: string | number, child: TreeNode | TreeLeafValue]>;
+
+	/**
+	 * Track observations of any TreeNode content.
+	 * @remarks
+	 * This subscribes to changes to any nodes content observed during `trackDuring`.
+	 *
+	 * Currently this does not support tracking parentage (see {@link (TreeAlpha:interface).trackObservationsOnce} for a version which does):
+	 * if accessing parentage during `trackDuring`, this will throw a usage error.
+	 *
+	 * This also does not track node status changes (e.g. whether a node is attached to a view or not).
+	 * The current behavior of checking status is unspecified: future versions may track it, error, or ignore it.
+	 *
+	 * These subscriptions remain active until `unsubscribe` is called: `onInvalidation` may be called multiple times.
+	 * See {@link (TreeAlpha:interface).trackObservationsOnce} for a version which automatically unsubscribes on the first invalidation.
+	 * @privateRemarks
+	 * This version, while more general than {@link (TreeAlpha:interface).trackObservationsOnce}, might be unnecessary.
+	 * Maybe this should be removed and only `trackObservationsOnce` kept.
+	 * Reevaluate this before stabilizing.
+	 */
+	trackObservations<TResult>(
+		onInvalidation: () => void,
+		trackDuring: () => TResult,
+	): ObservationResults<TResult>;
+
+	/**
+	 * {@link (TreeAlpha:interface).trackObservations} except automatically unsubscribes when the first invalidation occurs.
+	 * @remarks
+	 * This also supports tracking parentage, unlike {@link (TreeAlpha:interface).trackObservations}, as long as the parent is not undefined.
+	 *
+	 * @example Simple cached value invalidation
+	 * ```typescript
+	 * // Compute and cache this "foo" value, and clear the cache when the fields read in the callback to compute it change.
+	 * cachedFoo ??= TreeAlpha.trackObservationsOnce(
+	 * 	() => {
+	 * 		cachedFoo = undefined;
+	 * 	},
+	 * 	() => nodeA.someChild.bar + nodeB.someChild.baz,
+	 * ).result;
+	 * ```
+	 *
+	 * That is equivalent to doing the following:
+	 * ```typescript
+	 * if (cachedFoo === undefined) {
+	 * 	cachedFoo = nodeA.someChild.bar + nodeB.someChild.baz;
+	 * 	const invalidate = (): void => {
+	 * 		cachedFoo = undefined;
+	 * 		for (const u of unsubscribe) {
+	 * 			u();
+	 * 		}
+	 * 	};
+	 * 	const unsubscribe: (() => void)[] = [
+	 * 		TreeBeta.on(nodeA, "nodeChanged", (data) => {
+	 * 			if (data.changedProperties.has("someChild")) {
+	 * 				invalidate();
+	 * 			}
+	 * 		}),
+	 * 		TreeBeta.on(nodeB, "nodeChanged", (data) => {
+	 * 			if (data.changedProperties.has("someChild")) {
+	 * 				invalidate();
+	 * 			}
+	 * 		}),
+	 * 		TreeBeta.on(nodeA.someChild, "nodeChanged", (data) => {
+	 * 			if (data.changedProperties.has("bar")) {
+	 * 				invalidate();
+	 * 			}
+	 * 		}),
+	 * 		TreeBeta.on(nodeB.someChild, "nodeChanged", (data) => {
+	 * 			if (data.changedProperties.has("baz")) {
+	 * 				invalidate();
+	 * 			}
+	 * 		}),
+	 * 	];
+	 * }
+	 * ```
+	 * @example Cached derived schema property
+	 * ```typescript
+	 * const factory = new SchemaFactory("com.example");
+	 * class Vector extends factory.object("Vector", {
+	 * 	x: SchemaFactory.number,
+	 * 	y: SchemaFactory.number,
+	 * }) {
+	 * 	#length: number | undefined = undefined;
+	 * 	public length(): number {
+	 * 		if (this.#length === undefined) {
+	 * 			const result = TreeAlpha.trackObservationsOnce(
+	 * 				() => {
+	 * 					this.#length = undefined;
+	 * 				},
+	 * 				() => Math.hypot(this.x, this.y),
+	 * 			);
+	 * 			this.#length = result.result;
+	 * 		}
+	 * 		return this.#length;
+	 * 	}
+	 * }
+	 * const vec = new Vector({ x: 3, y: 4 });
+	 * assert.equal(vec.length(), 5);
+	 * vec.x = 0;
+	 * assert.equal(vec.length(), 4);
+	 * ```
+	 */
+	trackObservationsOnce<TResult>(
+		onInvalidation: () => void,
+		trackDuring: () => TResult,
+	): ObservationResults<TResult>;
+}
+
+/**
+ * Results from an operation with tracked observations.
+ * @remarks
+ * Results from {@link (TreeAlpha:interface).trackObservations} or {@link (TreeAlpha:interface).trackObservationsOnce}.
+ * @sealed @alpha
+ */
+export interface ObservationResults<TResult> {
+	/**
+	 * The result of the operation which had its observations tracked.
+	 */
+	readonly result: TResult;
+
+	/**
+	 * Call to unsubscribe from further invalidations.
+	 */
+	readonly unsubscribe: () => void;
+}
+
+/**
+ * Subscription to changes on a single node.
+ * @remarks
+ * Either tracks some set of fields, or all fields and can be updated to track more fields.
+ */
+class NodeSubscription {
+	/**
+	 * If undefined, subscribes to all keys.
+	 * Otherwise only subscribes to the keys in the set.
+	 */
+	private keys: Set<FieldKey> | undefined;
+	private readonly unsubscribe: () => void;
+	private constructor(
+		private readonly onInvalidation: () => void,
+		flexNode: FlexTreeNode,
+	) {
+		// TODO:Performance: It is possible to optimize this to not use the public TreeNode API.
+		const node = getOrCreateNodeFromInnerNode(flexNode);
+		assert(node instanceof TreeNode, 0xc54 /* Unexpected leaf value */);
+
+		const handler = (data: NodeChangedData): void => {
+			if (this.keys === undefined || data.changedProperties === undefined) {
+				this.onInvalidation();
+			} else {
+				let keyMap: ReadonlyMap<FieldKey, string> | undefined;
+				const schema = treeNodeApi.schema(node);
+				if (isObjectNodeSchema(schema)) {
+					keyMap = schema.storedKeyToPropertyKey;
+				}
+				// TODO:Performance: Ideally this would use Set.prototype.isDisjointFrom when available.
+				for (const flexKey of this.keys) {
+					// TODO:Performance: doing everything at the flex tree layer could avoid this translation
+					const key = keyMap?.get(flexKey) ?? flexKey;
+
+					if (data.changedProperties.has(key)) {
+						this.onInvalidation();
+						return;
+					}
+				}
+			}
+		};
+		this.unsubscribe = TreeBeta.on(node, "nodeChanged", handler);
+	}
+
+	/**
+	 * Create an {@link Observer} which subscribes to what was observed in {@link NodeSubscription}s.
+	 */
+	public static createObserver(
+		invalidate: () => void,
+		onlyOnce = false,
+	): { observer: Observer; unsubscribe: () => void } {
+		const subscriptions = new Map<FlexTreeNode, NodeSubscription>();
+		const observer: Observer = {
+			observeNodeFields(flexNode: FlexTreeNode): void {
+				if (flexNode.value !== undefined) {
+					// Leaf value, nothing to observe.
+					return;
+				}
+				const subscription = subscriptions.get(flexNode);
+				if (subscription !== undefined) {
+					// Already subscribed to this node.
+					subscription.keys = undefined; // Now subscribed to all keys.
+				} else {
+					const newSubscription = new NodeSubscription(invalidate, flexNode);
+					subscriptions.set(flexNode, newSubscription);
+				}
+			},
+			observeNodeField(flexNode: FlexTreeNode, key: FieldKey): void {
+				if (flexNode.value !== undefined) {
+					// Leaf value, nothing to observe.
+					return;
+				}
+				const subscription = subscriptions.get(flexNode);
+				if (subscription !== undefined) {
+					// Already subscribed to this node: if not subscribed to all keys, subscribe to this one.
+					// TODO:Performance: due to how JavaScript set ordering works,
+					// it might be faster to check `has` and only add if not present in case the same field is viewed many times.
+					subscription.keys?.add(key);
+				} else {
+					const newSubscription = new NodeSubscription(invalidate, flexNode);
+					newSubscription.keys = new Set([key]);
+					subscriptions.set(flexNode, newSubscription);
+				}
+			},
+			observeParentOf(node: FlexTreeNode): void {
+				// Supporting parent tracking is more difficult that it might seem at first.
+				// There are two main complicating factors:
+				// 1. The parent may be undefined (the node is a root).
+				// 2. If tracking this by subscribing to the parent's changes, then which events are subscribed to needs to be updated after the parent changes.
+				//
+				// If not supporting the first case (undefined parents), the second case gets problematic: edits which un-parent a node could error due to being unable to update the event subscription.
+				// For now this is mitigated by only supporting one of tracking (non-undefined) parents or maintaining event subscriptions across edits.
+
+				if (!onlyOnce) {
+					// TODO: better APIS should be provided which make handling this case practical.
+					throw new UsageError("Observation tracking for parents is currently not supported.");
+				}
+
+				const parent = withObservation(undefined, () => node.parentField.parent);
+
+				if (parent.parent === undefined) {
+					// TODO: better APIS should be provided which make handling this case practical.
+					throw new UsageError(
+						"Observation tracking for parents is currently not supported when parent is undefined.",
+					);
+				}
+				observer.observeNodeField(parent.parent, parent.key);
+			},
+		};
+
+		let subscribed = true;
+
+		return {
+			observer,
+			unsubscribe: () => {
+				if (!subscribed) {
+					throw new UsageError("Already unsubscribed");
+				}
+				subscribed = false;
+				for (const subscription of subscriptions.values()) {
+					subscription.unsubscribe();
+				}
+			},
+		};
+	}
+}
+
+/**
+ * Handles both {@link (TreeAlpha:interface).trackObservations} and {@link (TreeAlpha:interface).trackObservationsOnce}.
+ */
+function trackObservations<TResult>(
+	onInvalidation: () => void,
+	trackDuring: () => TResult,
+	onlyOnce = false,
+): ObservationResults<TResult> {
+	let observing = true;
+
+	const invalidate = (): void => {
+		if (observing) {
+			throw new UsageError("Cannot invalidate while tracking observations");
+		}
+		onInvalidation();
+	};
+
+	const { observer, unsubscribe } = NodeSubscription.createObserver(invalidate, onlyOnce);
+	const result = withObservation(observer, trackDuring);
+	observing = false;
+
+	return {
+		result,
+		unsubscribe,
+	};
 }
 
 /**
@@ -427,6 +708,30 @@ export interface TreeAlpha {
  * @alpha
  */
 export const TreeAlpha: TreeAlpha = {
+	trackObservations<TResult>(
+		onInvalidation: () => void,
+		trackDuring: () => TResult,
+	): ObservationResults<TResult> {
+		return trackObservations(onInvalidation, trackDuring);
+	},
+
+	trackObservationsOnce<TResult>(
+		onInvalidation: () => void,
+		trackDuring: () => TResult,
+	): ObservationResults<TResult> {
+		const result = trackObservations(
+			() => {
+				// trackObservations ensures no invalidation occurs while its running,
+				// so this callback can only run after trackObservations has returns and thus result is defined.
+				result.unsubscribe();
+				onInvalidation();
+			},
+			trackDuring,
+			true,
+		);
+		return result;
+	},
+
 	branch(node: TreeNode): TreeBranch | undefined {
 		const kernel = getKernel(node);
 		if (!kernel.isHydrated()) {
@@ -523,7 +828,7 @@ export const TreeAlpha: TreeAlpha = {
 	): JsonCompatible<IFluidHandle> {
 		const schema = tryGetSchema(node) ?? fail(0xacf /* invalid input */);
 		const format = fluidVersionToFieldBatchCodecWriteVersion(options.oldestCompatibleClient);
-		const codec = makeFieldBatchCodec({ jsonValidator: noopValidator }, format);
+		const codec = makeFieldBatchCodec({ jsonValidator: FormatValidatorNoOp }, format);
 		const cursor = borrowFieldCursorFromTreeNodeOrValue(node);
 		const batch: FieldBatch = [cursor];
 		// If none provided, create a compressor which will not compress anything.

package/src/shared-tree/treeCheckout.ts

@@ -11,7 +11,7 @@ import {
 	UsageError,
 	type ITelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils/internal";
-import { FluidClientVersion, noopValidator } from "../codec/index.js";
+import { FluidClientVersion, FormatValidatorNoOp } from "../codec/index.js";
 import {
 	type Anchor,
 	type AnchorLocator,
@@ -297,7 +297,7 @@ export function createTreeCheckout(
 	const schema = args?.schema ?? new TreeStoredSchemaRepository();
 	const forest = args?.forest ?? buildForest(breaker, schema);
 	const defaultCodecOptions = {
-		jsonValidator: noopValidator,
+		jsonValidator: FormatValidatorNoOp,
 		oldestCompatibleClient: FluidClientVersion.v2_0,
 	};
 	const defaultFieldBatchVersion = 1;
@@ -789,7 +789,10 @@ export class TreeCheckout implements ITreeCheckoutFork {
 		branch: SharedTreeBranch<SharedTreeEditBuilder, SharedTreeChange>,
 	): void {
 		// TODO: Dispose old branch, if necessary
-		assert(!this.#transaction.isInProgress(), "Cannot switch branches during a transaction");
+		assert(
+			!this.#transaction.isInProgress(),
+			0xc55 /* Cannot switch branches during a transaction */,
+		);
 		const diff = diffHistories(
 			this.changeFamily.rebaser,
 			this.#transaction.branch.getHead(),