@fluidframework/tree 2.90.0 → 2.92.0

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

@@ -882,6 +882,7 @@ export class ModularChangeFamily
 		taggedChange: TaggedChange<ModularChangeset>,
 		potentiallyConflictedOver: TaggedChange<ModularChangeset>,
 		revisionMetadata: RevisionMetadataSource,
+		ignoreNoChangeViolation: boolean = false,
 	): ModularChangeset {
 		// Our current cell ordering scheme in sequences depends on being able to rebase over a change with conflicts.
 		// This means that we must rebase over a muted version of the conflicted changeset.
@@ -943,7 +944,11 @@ export class ModularChangeFamily
 		);
 
 		let noChangeConstraint = change.noChangeConstraint;
-		if (noChangeConstraint !== undefined && !noChangeConstraint.violated) {
+		if (
+			noChangeConstraint !== undefined &&
+			!noChangeConstraint.violated &&
+			!ignoreNoChangeViolation
+		) {
 			noChangeConstraint = { violated: true };
 			constraintState.violationCount += 1;
 		}
@@ -2387,7 +2392,7 @@ abstract class CrossFieldManagerI<T> implements CrossFieldManager {
 		id: ChangesetLocalId,
 		count: number,
 		addDependency: boolean,
-	): RangeQueryResult<ChangeAtomId, unknown> {
+	): RangeQueryResult<unknown> {
 		if (addDependency) {
 			// We assume that if there is already an entry for this ID it is because
 			// a field handler has called compose on the same node multiple times.
@@ -3148,9 +3153,14 @@ function getFieldsForCrossFieldKey(
 	key: CrossFieldKey,
 	count: number,
 ): FieldId[] {
-	return changeset.crossFieldKeys
-		.getAll(key, count)
-		.map(({ value: fieldId }) => normalizeFieldId(fieldId, changeset.nodeAliases));
+	const fieldIds: FieldId[] = [];
+	for (const { value: fieldId } of changeset.crossFieldKeys.getAll(key, count)) {
+		if (fieldId !== undefined) {
+			fieldIds.push(normalizeFieldId(fieldId, changeset.nodeAliases));
+		}
+	}
+
+	return fieldIds;
 }
 
 // This is only exported for use in test utilities.
@@ -3169,7 +3179,6 @@ export function normalizeFieldId(
 function normalizeNodeId(nodeId: NodeId, nodeAliases: ChangeAtomIdBTree<NodeId>): NodeId {
 	let currentId = nodeId;
 
-	// eslint-disable-next-line no-constant-condition
 	while (true) {
 		const dealiased = getFromChangeAtomIdMap(nodeAliases, currentId);
 		if (dealiased === undefined) {

package/src/feature-libraries/object-forest/objectForest.ts

@@ -120,8 +120,14 @@ export class ObjectForest implements IEditableForest, WithBreakable {
 		return this.roots.fields.size === 0;
 	}
 
-	public clone(schema: TreeStoredSchemaSubscription, anchors: AnchorSet): ObjectForest {
-		return new ObjectForest(this.breaker, schema, anchors, this.additionalAsserts, this.roots);
+	public clone(schema: TreeStoredSchemaSubscription, breaker?: Breakable): ObjectForest {
+		return new ObjectForest(
+			breaker ?? this.breaker,
+			schema,
+			undefined,
+			this.additionalAsserts,
+			this.roots,
+		);
 	}
 
 	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk[] {

package/src/feature-libraries/optional-field/optionalFieldCodecV2.ts

@@ -5,32 +5,31 @@
 
 import type { TAnySchema } from "@sinclair/typebox";
 
-import type { IJsonCodec } from "../../codec/index.js";
+import type { IJsonCodec, JsonCodecPart } from "../../codec/index.js";
 import type {
+	RevisionTagSchema,
 	ChangeAtomId,
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
 } from "../../core/index.js";
 import type { Mutable } from "../../util/index.js";
 import { makeChangeAtomIdCodec } from "../changeAtomIdCodec.js";
-import {
-	EncodedNodeChangeset,
-	type EncodedChangeAtomId,
-	type FieldChangeEncodingContext,
+import type {
+	FieldChangeEncodingContext,
+	EncodedChangeAtomId,
 } from "../modular-schema/index.js";
+import { EncodedNodeChangeset } from "../modular-schema/index.js";
 
 import { EncodedOptionalChangeset, EncodedRegisterId } from "./optionalFieldChangeFormatV2.js";
 import type { OptionalChangeset, RegisterId, Replace } from "./optionalFieldChangeTypes.js";
 
 function makeRegisterIdCodec(
-	changeAtomIdCodec: IJsonCodec<
+	changeAtomIdCodec: JsonCodecPart<
 		ChangeAtomId,
-		EncodedChangeAtomId,
-		EncodedChangeAtomId,
+		typeof EncodedChangeAtomId,
 		ChangeEncodingContext
 	>,
-): IJsonCodec<RegisterId, EncodedRegisterId, EncodedRegisterId, ChangeEncodingContext> {
+): JsonCodecPart<RegisterId, typeof EncodedRegisterId, ChangeEncodingContext> {
 	return {
 		encode: (registerId: RegisterId, context: ChangeEncodingContext) => {
 			if (registerId === "self") {
@@ -49,10 +48,9 @@ function makeRegisterIdCodec(
 }
 
 export function makeOptionalFieldCodec(
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): IJsonCodec<

package/src/feature-libraries/optional-field/optionalFieldCodecs.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { type ICodecFamily, type IJsonCodec, makeCodecFamily } from "../../codec/index.js";
+import { type ICodecFamily, type JsonCodecPart, makeCodecFamily } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import type { FieldChangeEncodingContext } from "../modular-schema/index.js";
 
@@ -15,10 +15,9 @@ import type { OptionalChangeset } from "./optionalFieldChangeTypes.js";
 import { makeOptionalFieldCodec as makeV2Codec } from "./optionalFieldCodecV2.js";
 
 export const makeOptionalFieldCodecFamily = (
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): ICodecFamily<OptionalChangeset, FieldChangeEncodingContext> =>

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

@@ -3,9 +3,6 @@
  * Licensed under the MIT License.
  */
 
-export {
-	makeSchemaChangeCodecs,
-	getCodecTreeForSchemaChangeFormat,
-} from "./schemaChangeCodecs.js";
+export { makeSchemaChangeCodec } from "./schemaChangeCodecs.js";
 export type { SchemaChange } from "./schemaChangeTypes.js";
 export { EncodedSchemaChange } from "./schemaChangeFormat.js";

package/src/feature-libraries/schema-edits/schemaChangeCodecs.ts

@@ -4,90 +4,24 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 
-import {
-	type CodecTree,
-	type CodecWriteOptions,
-	type ICodecFamily,
-	type IJsonCodec,
-	makeCodecFamily,
-	makeVersionDispatchingCodec,
-	withSchemaValidation,
-} from "../../codec/index.js";
-import { SchemaFormatVersion } from "../../core/index.js";
-import { makeSchemaCodec, schemaCodecBuilder } from "../schema-index/index.js";
+import type { CodecWriteOptions, JsonCodecPart } from "../../codec/index.js";
+import { schemaCodecBuilder } from "../schema-index/index.js";
 
 import { EncodedSchemaChange } from "./schemaChangeFormat.js";
 import type { SchemaChange } from "./schemaChangeTypes.js";
 
 /**
- * Create a family of schema change codecs.
- * @param options - Specifies common codec options, including which `validator` to use.
- * @returns The composed codec family.
- */
-export function makeSchemaChangeCodecs(
-	options: CodecWriteOptions,
-): ICodecFamily<SchemaChange> {
-	return makeCodecFamily([
-		[SchemaFormatVersion.v1, makeSchemaChangeCodecV1(options, SchemaFormatVersion.v1)],
-		// This code  (makeSchemaChangeCodecs) is constructing a SchemaFormatVersion.v2 codec, regardless of the requested write version.
-		// It then trusts the user of the produced makeCodecFamily to only select if when it is valid to do so.
-		// This trust is manifests in having to use `allowPossiblyIncompatibleWriteVersionOverrides`
-		// here as it needs to build the v2 codec regardless of if its valid to use.
-		// TODO: There should not be two separate places selecting the write version for this codec. Such cases should instead adopt one of the following patterns:
-		// 1. The outer coded should let the inner one do its own version selection instead of forcing it.
-		// 2. The outer codec should fully handle version selection and embed the inner content directly (referencing its format not codec) and not involve the codec at all.
-		// TODO: fix this up when migrating SchemaChangeCodec to use ClientVersionDispatchingCodecBuilder.
-		// This should probably use pattern 1 above, which will result in this codec having two identical versions.
-		[
-			SchemaFormatVersion.v2,
-			makeSchemaChangeCodecV1(
-				{ ...options, allowPossiblyIncompatibleWriteVersionOverrides: true },
-				SchemaFormatVersion.v2,
-			),
-		],
-	]);
-}
-
-export function getCodecTreeForSchemaChangeFormat(
-	version: SchemaFormatVersion,
-	clientVersion: MinimumVersionForCollab,
-): CodecTree {
-	return {
-		name: "SchemaChange",
-		version,
-		children: [schemaCodecBuilder.getCodecTree(clientVersion)],
-	};
-}
-
-/**
- * Create a schema change codec.
- * @param options - Specifies common codec options, including which `validator` to use.
- * @param writeVersion - The schema change write version.
- * @returns The composed codec.
- */
-export function makeSchemaChangeCodec(
-	options: CodecWriteOptions,
-	writeVersion: SchemaFormatVersion,
-): IJsonCodec<SchemaChange> {
-	const family = makeSchemaChangeCodecs(options);
-	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
-}
-
-/**
- * Compose the change codec using mostly v1 logic.
+ * Creates a codec for schema changes.
  * @param options - The codec options.
- * @param schemaWriteVersion - The schema write version.
- * @returns The composed schema change codec.
+ * @returns The composed schema change codec part.
  */
-function makeSchemaChangeCodecV1(
+export function makeSchemaChangeCodec(
 	options: CodecWriteOptions,
-	schemaWriteVersion: SchemaFormatVersion,
-): IJsonCodec<SchemaChange, EncodedSchemaChange> {
-	const schemaCodec = makeSchemaCodec(options, schemaWriteVersion);
-	const schemaChangeCodec: IJsonCodec<SchemaChange, EncodedSchemaChange> = {
-		encode: (schemaChange) => {
+): JsonCodecPart<SchemaChange, typeof EncodedSchemaChange> {
+	const schemaCodec = schemaCodecBuilder.build(options);
+	return {
+		encode: (schemaChange: SchemaChange): EncodedSchemaChange => {
 			assert(
 				!schemaChange.isInverse,
 				0x933 /* Inverse schema changes should never be transmitted */,
@@ -97,7 +31,7 @@ function makeSchemaChangeCodecV1(
 				old: schemaCodec.encode(schemaChange.schema.old),
 			};
 		},
-		decode: (encoded) => {
+		decode: (encoded: EncodedSchemaChange): SchemaChange => {
 			return {
 				schema: {
 					new: schemaCodec.decode(encoded.new),
@@ -108,6 +42,4 @@ function makeSchemaChangeCodecV1(
 		},
 		encodedSchema: EncodedSchemaChange,
 	};
-
-	return withSchemaValidation(EncodedSchemaChange, schemaChangeCodec, options.jsonValidator);
 }

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

@@ -8,9 +8,7 @@ import { lowestMinVersionForCollab } from "@fluidframework/runtime-utils/interna
 
 import {
 	ClientVersionDispatchingCodecBuilder,
-	type CodecWriteOptions,
 	FluidClientVersion,
-	type IJsonCodec,
 } from "../../codec/index.js";
 import {
 	SchemaFormatVersion,
@@ -27,29 +25,6 @@ import { brand } from "../../util/index.js";
 import { Format as FormatV1 } from "./formatV1.js";
 import { Format as FormatV2 } from "./formatV2.js";
 
-/**
- * Create a schema codec.
- * @param options - Specifies common codec options, including `minVersionForCollab` and which `validator` to use.
- * @param writeVersionOverride - The schema version to write. If not provided, the version will be derived from `minVersionForCollab`.
- * TODO: Currently this parameter is provided when it probably should not be. Users of it should probably allow the automatic selection to occur and this parameter can be removed.
- * Any case where an override is actually required can use `options` to do so.
- * @returns The composed codec.
- *
- * @privateRemarks We should consider using the Shared Tree format version instead as it may be more valuable for application authors than the schema version.
- *
- * TODO: replace use of this with schemaCodecBuilder.build(...).
- */
-export function makeSchemaCodec(
-	options: CodecWriteOptions,
-	writeVersionOverride?: SchemaFormatVersion,
-): IJsonCodec<TreeStoredSchema> {
-	const overrides = new Map(options.writeVersionOverrides ?? []);
-	if (writeVersionOverride !== undefined) {
-		overrides.set(schemaCodecBuilder.name, writeVersionOverride);
-	}
-	return schemaCodecBuilder.build({ ...options, writeVersionOverrides: overrides });
-}
-
 function encodeRepoV1(repo: TreeStoredSchema): FormatV1 {
 	const nodeSchema = encodeNodeSchema(repo, (schema) => schema.encodeV1());
 	const rootFieldSchema = encodeFieldSchemaV1(repo.rootFieldSchema);

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

@@ -17,7 +17,7 @@ const noAdditionalProps: ObjectOptions = { additionalProperties: false };
  * This chooses to use lists of named objects instead of maps:
  * this choice is somewhat arbitrary, but avoids user data being used as object keys,
  * which can sometimes be an issue (for example handling that for "__proto__" can require care).
- * It also makes it simpler to determinately sort by keys.
+ * It also makes it simpler to deterministically sort by keys.
  */
 export const Format = Type.Object(
 	{

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

@@ -4,9 +4,6 @@
  */
 
 export { SchemaSummarizer } from "./schemaSummarizer.js";
-export {
-	makeSchemaCodec,
-	schemaCodecBuilder,
-} from "./codec.js";
+export { schemaCodecBuilder } from "./codec.js";
 export { Format as FormatV1 } from "./formatV1.js";
 export { Format as FormatV2 } from "./formatV2.js";

package/src/feature-libraries/sequence-field/moveEffectTable.ts

@@ -101,7 +101,7 @@ export function getMoveEffect(
 	id: MoveId,
 	count: number,
 	addDependency: boolean = true,
-): RangeQueryResult<ChangeAtomId, MoveEffect> {
+): RangeQueryResult<MoveEffect | undefined> {
 	const result = moveEffects.get(target, revision, id, count, addDependency);
 	return result.value === undefined
 		? result

package/src/feature-libraries/sequence-field/sequenceFieldCodecV2.ts

@@ -10,12 +10,14 @@ import {
 	DiscriminatedUnionDispatcher,
 	type DiscriminatedUnionLibrary,
 	type IJsonCodec,
+	type JsonCodecPart,
 } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
 	ChangesetLocalId,
 	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import { type JsonCompatibleReadOnly, type Mutable, brand } from "../../util/index.js";
 import { makeChangeAtomIdCodec } from "../changeAtomIdCodec.js";
@@ -43,10 +45,9 @@ import {
 import { isNoopMark, normalizeCellRename } from "./utils.js";
 
 export function makeV2CodecHelpers(
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): SequenceCodecHelpers<MarkEffect, Encoded.MarkEffect> {
@@ -261,10 +262,9 @@ export function makeV2CodecHelpers(
 }
 
 export function makeV2Codec(
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): IJsonCodec<

package/src/feature-libraries/sequence-field/sequenceFieldCodecV3.ts

@@ -5,11 +5,15 @@
 
 import type { TAnySchema } from "@sinclair/typebox";
 
-import { DiscriminatedUnionDispatcher, type IJsonCodec } from "../../codec/index.js";
+import {
+	DiscriminatedUnionDispatcher,
+	type IJsonCodec,
+	type JsonCodecPart,
+} from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import type { JsonCompatibleReadOnly } from "../../util/index.js";
 import {
@@ -23,10 +27,9 @@ import type { Changeset, Mark, MarkEffect, Rename } from "./types.js";
 import { isNoopMark } from "./utils.js";
 
 export function makeV3Codec(
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): IJsonCodec<

package/src/feature-libraries/sequence-field/sequenceFieldCodecs.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { type IJsonCodec, makeCodecFamily, type ICodecFamily } from "../../codec/index.js";
+import { type JsonCodecPart, makeCodecFamily, type ICodecFamily } from "../../codec/index.js";
 import type {
 	ChangeEncodingContext,
-	EncodedRevisionTag,
 	RevisionTag,
+	RevisionTagSchema,
 } from "../../core/index.js";
 import type { FieldChangeEncodingContext } from "../modular-schema/index.js";
 
@@ -16,10 +16,9 @@ import { makeV3Codec } from "./sequenceFieldCodecV3.js";
 import type { Changeset, MarkList } from "./types.js";
 
 export const sequenceFieldChangeCodecFactory = (
-	revisionTagCodec: IJsonCodec<
+	revisionTagCodec: JsonCodecPart<
 		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
+		typeof RevisionTagSchema,
 		ChangeEncodingContext
 	>,
 ): ICodecFamily<MarkList, FieldChangeEncodingContext> =>

package/src/index.ts

@@ -3,6 +3,9 @@
  * Licensed under the MIT License.
  */
 
+// For the time being, if exports are changed, additional files under entrypoints need updated.
+// Run `pnpm generate:entrypoint-sources` to update them.
+
 export {
 	ValueSchema,
 	type Revertible,
@@ -68,9 +71,6 @@ export {
 	Tree,
 	type RunTransaction,
 	type ForestOptions,
-	getBranch,
-	type BranchableTree,
-	type TreeBranchFork,
 	independentInitializedView,
 	type ViewContent,
 	TreeAlpha,
@@ -88,6 +88,7 @@ export {
 
 export {
 	TreeArrayNode,
+	type TreeArrayNodeAlpha,
 	type Unhydrated,
 	IterableTreeArrayContent,
 	TreeNode,
@@ -122,6 +123,7 @@ export {
 	NodeKind,
 	type TreeObjectNode,
 	ObjectNodeSchema,
+	type ObjectNodeSchemaWorkaround,
 	type TreeNodeFromImplicitAllowedTypes,
 	type TreeNodeSchemaClass,
 	type SchemaCompatibilityStatus,
@@ -130,7 +132,14 @@ export {
 	normalizeFieldSchema,
 	type InternalTreeNode,
 	type WithType,
+	type ArrayNodeDeltaOp,
+	type ArrayNodeInsertOp,
+	type ArrayNodeRemoveOp,
+	type ArrayNodeRetainOp,
 	type NodeChangedData,
+	type NodeChangedDataAlpha,
+	type NodeChangedDataDelta,
+	type NodeChangedDataProperties,
 	type SchemaUpgrade,
 	contentSchemaSymbol,
 	// Types not really intended for public use, but used in links.
@@ -144,6 +153,8 @@ export {
 	type AllowedTypes,
 	type System_Unsafe,
 	type FieldSchemaAlphaUnsafe,
+	type FieldHasDefaultAlphaUnsafe,
+	type InsertableObjectFromSchemaRecordAlphaUnsafe,
 	type ArrayNodeCustomizableSchemaUnsafe,
 	type MapNodeCustomizableSchemaUnsafe,
 	type TreeRecordNodeUnsafe,
@@ -192,9 +203,14 @@ export {
 	type AllowedTypesFull,
 	type AllowedTypesFullFromMixed,
 	type SchemaType,
+	type SchemaStaticsAlpha,
+	type NodeProvider,
+	type InsertableObjectFromSchemaRecordAlpha,
+	type FieldHasDefaultAlpha,
 	// Beta APIs
 	TreeBeta,
 	type TreeChangeEventsBeta,
+	type TreeChangeEventsAlpha,
 	// Other
 	type VerboseTreeNode,
 	type TreeEncodingOptions,
@@ -274,6 +290,7 @@ export {
 	allowUnused,
 	type LeafSchema,
 	type ArrayNodeCustomizableSchema,
+	type ArrayNodeCustomizableSchemaAlpha,
 	type ArrayNodePojoEmulationSchema,
 	ArrayNodeSchema,
 	type MapNodeCustomizableSchema,
@@ -303,6 +320,9 @@ export {
 	incrementalEncodingPolicyForAllowedTypes,
 	eraseSchemaDetails,
 	eraseSchemaDetailsSubclassable,
+	type ErasedSchema,
+	type ErasedNode,
+	type ErasedSchemaSubclassable,
 	type SnapshotSchemaCompatibilityOptions,
 	type ArrayPlaceAnchor,
 	createArrayInsertionAnchor,
@@ -359,6 +379,12 @@ import * as InternalTypes from "./internalTypes.js";
 /**
  * Contains types used by the API, but which serve mechanical purposes and do not represent semantic concepts.
  * They are used internally to implement API aspects, but are not intended for use by external consumers.
+ *
+ * @public
+ * @system
+ *
+ * @privateRemarks These TS-Docs are not recognized by API-Extractor, but the
+ * support level tag is recognized by flub entrypoint generation.
  */
 // eslint-disable-next-line unicorn/prefer-export-from -- fixing requires `export * as` (breaks API-Extractor)
 export { InternalTypes };

package/src/packageVersion.ts

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

package/src/shared-tree/independentView.ts

@@ -10,29 +10,22 @@ import {
 	createIdCompressor,
 } from "@fluidframework/id-compressor/internal";
 
-import {
-	FluidClientVersion,
-	type CodecWriteOptions,
-	type ICodecOptions,
-} from "../codec/index.js";
+import type { CodecWriteOptions, ICodecOptions } from "../codec/index.js";
 import {
 	type RevisionTag,
 	RevisionTagCodec,
-	SchemaFormatVersion,
 	TreeStoredSchemaRepository,
 } from "../core/index.js";
 import {
 	createNodeIdentifierManager,
 	fieldBatchCodecBuilder,
-	makeSchemaCodec,
 	type FieldBatchEncodingContext,
 	defaultSchemaPolicy,
 	TreeCompressionStrategy,
 	defaultIncrementalEncodingPolicy,
+	schemaCodecBuilder,
 } from "../feature-libraries/index.js";
 import { combineChunks } from "../feature-libraries/index.js";
-// eslint-disable-next-line import-x/no-internal-modules
-import type { Format } from "../feature-libraries/schema-index/formatV1.js";
 import type {
 	TreeViewConfiguration,
 	ImplicitFieldSchema,
@@ -236,15 +229,9 @@ export function createIndependentTreeAlpha<const TSchema extends ImplicitFieldSc
 	});
 
 	if (options?.content !== undefined) {
-		// Any version can be passed down to `makeSchemaCodec` and `fieldBatchCodecBuilder.build` here.
-		// We only use the decode part, which always dispatches to the correct codec based on the version in the data, not `minVersionForCollab`.
-		const writeOptions: CodecWriteOptions = {
-			...options,
-			minVersionForCollab: FluidClientVersion.v2_0,
-		};
-		const schemaCodec = makeSchemaCodec(writeOptions, SchemaFormatVersion.v1);
-		const fieldBatchCodec = fieldBatchCodecBuilder.build(writeOptions);
-		const newSchema = schemaCodec.decode(options.content.schema as Format);
+		const schemaCodec = schemaCodecBuilder.buildDecoder(options);
+		const fieldBatchCodec = fieldBatchCodecBuilder.buildDecoder(options);
+		const newSchema = schemaCodec.decode(options.content.schema);
 
 		const context: FieldBatchEncodingContext = {
 			encodeType: TreeCompressionStrategy.Compressed,

package/src/shared-tree/index.ts

@@ -9,7 +9,6 @@ export {
 	type SharedTreeOptions,
 	type SharedTreeOptionsBeta,
 	SharedTreeKernel,
-	getBranch,
 	type ForestType,
 	type SharedTreeContentSnapshot,
 	type SharedTreeFormatOptions,
@@ -31,9 +30,6 @@ export {
 	TreeCheckout,
 	type ITreeCheckout,
 	type CheckoutEvents,
-	type ITreeCheckoutFork,
-	type BranchableTree,
-	type TreeBranchFork,
 } from "./treeCheckout.js";
 
 export { SchematizingSimpleTreeView } from "./schematizingTreeView.js";