@fluidframework/tree 2.23.0 → 2.31.0

package/src/feature-libraries/node-identifier/nodeIdentifierManager.ts

@@ -0,0 +1,95 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { assert } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
+import { assertIsStableId, isStableId } from "@fluidframework/id-compressor/internal";
+
+import { brand, extractFromOpaque } from "../../util/index.js";
+
+import type { LocalNodeIdentifier, StableNodeIdentifier } from "./nodeIdentifier.js";
+
+/**
+ * An object which handles the generation of node identifiers as well as conversion between their two types ({@link StableNodeIdentifier} and {@link LocalNodeIdentifier}).
+ */
+export interface NodeIdentifierManager {
+	/**
+	 * Generate a {@link StableNodeIdentifier}.
+	 */
+	generateLocalNodeIdentifier(): LocalNodeIdentifier;
+
+	/**
+	 * Convert the given {@link StableNodeIdentifier} into its {@link LocalNodeIdentifier} form.
+	 */
+	localizeNodeIdentifier(identifier: StableNodeIdentifier): LocalNodeIdentifier;
+
+	/**
+	 * Convert the given {@link LocalNodeIdentifier} into its {@link StableNodeIdentifier} form.
+	 */
+	stabilizeNodeIdentifier(identifier: LocalNodeIdentifier): StableNodeIdentifier;
+
+	/**
+	 * Attempts to recompress a {@link StableNodeIdentifier}.
+	 * @param identifier - The identifier that is attempted to recompress.
+	 * @returns The `{@link LocalNodeIdentifier}` associated with `identifier` or undefined if the identifier was not generated by any session known to this compressor.
+	 */
+	tryLocalizeNodeIdentifier(identifier: string): LocalNodeIdentifier | undefined;
+}
+
+/**
+ * Creates a {@link NodeIdentifierManager} from the given {@link IIdCompressor}.
+ * @param idCompressor - the compressor to use for identifier generation, compression, and decompression.
+ * If undefined, then attempts to generate or convert identifiers will throw an error.
+ */
+export function createNodeIdentifierManager(
+	idCompressor?: IIdCompressor | undefined,
+): NodeIdentifierManager {
+	return {
+		generateLocalNodeIdentifier: () => {
+			assert(
+				idCompressor !== undefined,
+				0x6e4 /* Runtime IdCompressor must be available to generate local node identifiers */,
+			);
+			return brand(idCompressor.generateCompressedId());
+		},
+
+		localizeNodeIdentifier: (identifier: StableNodeIdentifier) => {
+			assert(
+				idCompressor !== undefined,
+				0x6e5 /* Runtime IdCompressor must be available to convert node identifiers */,
+			);
+			return brand(idCompressor.recompress(identifier));
+		},
+
+		stabilizeNodeIdentifier: (identifier: LocalNodeIdentifier) => {
+			assert(
+				idCompressor !== undefined,
+				0x6e6 /* Runtime IdCompressor must be available to convert node identifiers */,
+			);
+			return brand(
+				// TODO: The assert below is required for type safety but is maybe slow
+				assertIsStableId(idCompressor.decompress(extractFromOpaque(identifier))),
+			);
+		},
+		tryLocalizeNodeIdentifier: (identifier: string) => {
+			assert(
+				idCompressor !== undefined,
+				0x6e9 /* Runtime IdCompressor must be available to convert node identifiers */,
+			);
+			if (isStableNodeIdentifier(identifier)) {
+				const compressedIdentifier = idCompressor.tryRecompress(identifier);
+				if (compressedIdentifier !== undefined) {
+					return brand(compressedIdentifier);
+				}
+			}
+		},
+	};
+}
+
+export function isStableNodeIdentifier(
+	identifier: string,
+): identifier is StableNodeIdentifier {
+	return isStableId(identifier);
+}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils/internal";
+import { assert, fail } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
 import type { Listenable } from "@fluidframework/core-interfaces";
 
@@ -12,6 +12,7 @@ import {
 	AnchorSet,
 	type AnnouncedVisitor,
 	type CursorLocationType,
+	type DeltaDetachedNodeId,
 	type DeltaVisitor,
 	type DetachedField,
 	type FieldAnchor,
@@ -26,8 +27,8 @@ import {
 	type MapTree,
 	type PathRootPrefix,
 	type PlaceIndex,
-	type ProtoNodes,
 	type Range,
+	type TreeChunk,
 	TreeNavigationResult,
 	type TreeNodeSchemaIdentifier,
 	type TreeStoredSchemaSubscription,
@@ -42,10 +43,10 @@ import {
 	assertValidIndex,
 	assertValidRange,
 	brand,
-	fail,
 } from "../../util/index.js";
 import { cursorForMapTreeNode, mapTreeFromCursor } from "../mapTreeCursor.js";
 import { type CursorWithNode, SynchronousCursor } from "../treeCursorUtils.js";
+import { chunkFieldSingle, defaultChunkPolicy } from "../chunked-forest/index.js";
 
 /** A `MapTree` with mutable fields */
 interface MutableMapTree extends MapTree {
@@ -107,6 +108,10 @@ export class ObjectForest implements IEditableForest {
 		return new ObjectForest(anchors, this.additionalAsserts, this.roots);
 	}
 
+	public chunkField(cursor: ITreeCursorSynchronous): TreeChunk {
+		return chunkFieldSingle(cursor, { idCompressor: undefined, policy: defaultChunkPolicy });
+	}
+
 	public forgetAnchor(anchor: Anchor): void {
 		this.anchors.forget(anchor);
 	}
@@ -163,7 +168,7 @@ export class ObjectForest implements IEditableForest {
 				preEdit();
 				this.forest.delete(detachedField);
 			}
-			public create(content: ProtoNodes, destination: FieldKey): void {
+			public create(content: readonly ITreeCursorSynchronous[], destination: FieldKey): void {
 				preEdit();
 				this.forest.add(content, destination);
 				this.forest.#events.emit("afterRootFieldCreated", destination);
@@ -172,7 +177,7 @@ export class ObjectForest implements IEditableForest {
 				preEdit();
 				this.attachEdit(source, count, destination);
 			}
-			public detach(source: Range, destination: FieldKey): void {
+			public detach(source: Range, destination: FieldKey, id: DeltaDetachedNodeId): void {
 				preEdit();
 				this.detachEdit(source, destination);
 			}
@@ -235,6 +240,7 @@ export class ObjectForest implements IEditableForest {
 				newContentSource: FieldKey,
 				range: Range,
 				oldContentDestination: FieldKey,
+				oldContentId: DeltaDetachedNodeId,
 			): void {
 				preEdit();
 				assert(

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

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import { fail } from "@fluidframework/core-utils/internal";
 import {
 	type ICodecOptions,
 	type IJsonCodec,
@@ -18,7 +19,7 @@ import {
 	storedSchemaDecodeDispatcher,
 	toTreeNodeSchemaDataFormat,
 } from "../../core/index.js";
-import { brand, fail } from "../../util/index.js";
+import { brand } from "../../util/index.js";
 
 import { Format } from "./format.js";
 

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 
 import {
 	type ChangeAtomId,
@@ -11,7 +11,7 @@ import {
 	type RevisionTag,
 	offsetChangeAtomId,
 } from "../../core/index.js";
-import { type IdAllocator, fail } from "../../util/index.js";
+import type { IdAllocator } from "../../util/index.js";
 import {
 	type CrossFieldManager,
 	CrossFieldTarget,

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

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 
 import type { RevisionTag } from "../../core/index.js";
-import { type IdAllocator, type Mutable, fail, hasSingle } from "../../util/index.js";
+import { type IdAllocator, type Mutable, hasSingle } from "../../util/index.js";
 import {
 	type CrossFieldManager,
 	CrossFieldTarget,

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 import type { TAnySchema } from "@sinclair/typebox";
 
 import { DiscriminatedUnionDispatcher, type IJsonCodec } from "../../codec/index.js";
@@ -13,7 +13,7 @@ import type {
 	EncodedRevisionTag,
 	RevisionTag,
 } from "../../core/index.js";
-import { type JsonCompatibleReadOnly, type Mutable, brand, fail } from "../../util/index.js";
+import { type JsonCompatibleReadOnly, type Mutable, brand } from "../../util/index.js";
 import { makeChangeAtomIdCodec } from "../changeAtomIdCodec.js";
 
 import {

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 import type { TAnySchema } from "@sinclair/typebox";
 
 import {
@@ -17,7 +17,7 @@ import type {
 	EncodedRevisionTag,
 	RevisionTag,
 } from "../../core/index.js";
-import { type JsonCompatibleReadOnly, type Mutable, brand, fail } from "../../util/index.js";
+import { type JsonCompatibleReadOnly, type Mutable, brand } from "../../util/index.js";
 import { makeChangeAtomIdCodec } from "../changeAtomIdCodec.js";
 
 import { Changeset as ChangesetSchema, type Encoded } from "./formatV2.js";

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 
 import {
 	type ChangeAtomId,
@@ -14,7 +14,7 @@ import {
 	areEqualChangeAtomIds,
 	makeChangeAtomId,
 } from "../../core/index.js";
-import { type Mutable, brand, fail } from "../../util/index.js";
+import { type Mutable, brand } from "../../util/index.js";
 import {
 	CrossFieldTarget,
 	type NodeId,

package/src/feature-libraries/treeCursorUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, oob, debugAssert } from "@fluidframework/core-utils/internal";
+import { assert, oob, debugAssert, fail } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
@@ -19,7 +19,6 @@ import {
 	detachedFieldAsKey,
 	rootField,
 } from "../core/index.js";
-import { fail } from "../util/index.js";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 /**
@@ -182,7 +181,7 @@ class StackCursor<TNode> extends SynchronousCursor implements CursorWithNode<TNo
 		const siblings = this.getField();
 		if (!(index in siblings)) {
 			throw new UsageError(
-				"A child does not exist at the specified index, check the status of a node using `Tree.status()`.",
+				`A child does not exist at index '${index}' in field containing ${siblings.length} nodes.`,
 			);
 		}
 		this.siblingStack.push(this.siblings);

package/src/index.ts

@@ -100,12 +100,14 @@ export {
 	type TreeLeafValue,
 	FieldKind,
 	FieldSchema,
+	type FieldSchemaAlpha,
 	type FieldSchemaMetadata,
 	type ImplicitAllowedTypes,
 	type InsertableTreeFieldFromImplicitField,
 	type InsertableTypedNode,
 	NodeKind,
 	type TreeObjectNode,
+	ObjectNodeSchema,
 	type TreeNodeFromImplicitAllowedTypes,
 	type TreeNodeSchemaClass,
 	type SchemaCompatibilityStatus,
@@ -122,6 +124,8 @@ export {
 	// Can not be moved to internalTypes since doing so causes app code to throw errors like:
 	// error TS2742: The inferred type of 'Inventory' cannot be named without a reference to '../node_modules/@fluidframework/tree/lib/internalTypes.js'. This is likely not portable. A type annotation is necessary.
 	type AllowedTypes,
+	type ImplicitAllowedTypesUnsafe,
+	type ImplicitFieldSchemaUnsafe,
 	type TreeObjectNodeUnsafe,
 	type InsertableTreeNodeFromImplicitAllowedTypesUnsafe,
 	type TreeArrayNodeUnsafe,
@@ -131,6 +135,9 @@ export {
 	type FieldSchemaUnsafe,
 	type TreeNodeSchemaClassUnsafe,
 	type InsertableTreeNodeFromAllowedTypesUnsafe,
+	type FieldSchemaAlphaUnsafe,
+	type ArrayNodeCustomizableSchemaUnsafe,
+	type MapNodeCustomizableSchemaUnsafe,
 	// System types (not in Internal types for various reasons, like doc links or cannot be named errors).
 	type typeSchemaSymbol,
 	type TreeNodeSchemaNonClass,
@@ -194,6 +201,7 @@ export {
 	type SimpleMapNodeSchema,
 	type SimpleArrayNodeSchema,
 	type SimpleObjectNodeSchema,
+	type SimpleObjectFieldSchema,
 	normalizeAllowedTypes,
 	getSimpleSchema,
 	type ReadonlyArrayNode,
@@ -204,7 +212,7 @@ export {
 	asTreeViewAlpha,
 	type NodeSchemaOptions,
 	type NodeSchemaMetadata,
-	type schemaStatics,
+	type SchemaStatics,
 	type ITreeAlpha,
 	type TransactionConstraint,
 	type NodeInDocumentConstraint,
@@ -216,13 +224,25 @@ export {
 	type TransactionResultSuccess,
 	type TransactionResultFailed,
 	rollback,
+	generateSchemaFromSimpleSchema,
+	evaluateLazySchema,
+	replaceConciseTreeHandles,
+	replaceHandles,
+	replaceVerboseTreeHandles,
+	type HandleConverter,
+	type LeafSchema,
+	type ArrayNodeCustomizableSchema,
+	type ArrayNodePojoEmulationSchema,
+	ArrayNodeSchema,
+	type MapNodeCustomizableSchema,
+	type MapNodePojoEmulationSchema,
+	MapNodeSchema,
 } from "./simple-tree/index.js";
 export {
 	SharedTree,
 	configuredSharedTree,
-	SharedTreeAttributes,
-	SharedTreeFactoryType,
 } from "./treeFactory.js";
+export { SharedTreeAttributes, SharedTreeFactoryType } from "./sharedTreeAttributes.js";
 
 export {
 	type ICodecOptions,
@@ -233,15 +253,27 @@ export {
 export { noopValidator } from "./codec/index.js";
 export { typeboxValidator } from "./external-utilities/index.js";
 
-export {
-	type RestrictiveReadonlyRecord,
-	type RestrictiveStringRecord,
-	type MakeNominal,
-	type IsUnion,
-	type UnionToIntersection,
-	type UnionToTuple,
-	type PopUnion,
+export type {
+	// Type Testing
+	requireTrue,
+	requireFalse,
+	requireAssignableTo,
+	areSafelyAssignable,
+	isAssignableTo,
+	isAny,
+	eitherIsAny,
+	// Other
+	RestrictiveReadonlyRecord,
+	RestrictiveStringRecord,
+	MakeNominal,
+	IsUnion,
+	UnionToIntersection,
+	UnionToTuple,
+	PopUnion,
+	JsonCompatible,
+	JsonCompatibleObject,
 } from "./util/index.js";
+export { cloneWithReplacements } from "./util/index.js";
 
 import * as InternalTypes from "./internalTypes.js";
 export {
@@ -257,7 +289,5 @@ export {
 // The inferred type of 'NodeMap' cannot be named without a reference to '../../node_modules/@fluidframework/tree/lib/internalTypes.js'. This is likely not portable. A type annotation is necessary.
 export type { MapNodeInsertableData } from "./simple-tree/index.js";
 
-export type { JsonCompatible, JsonCompatibleObject } from "./util/index.js";
-
 export { JsonAsTree } from "./jsonDomainSchema.js";
 export { FluidSerializableAsTree } from "./serializableDomainSchema.js";

package/src/jsonDomainSchema.ts

@@ -3,12 +3,26 @@
  * Licensed under the MIT License.
  */
 
-import {
-	SchemaFactory,
-	type AllowedTypes,
-	type FixRecursiveArraySchema,
-	type TreeNodeFromImplicitAllowedTypes,
-	type ValidateRecursiveSchema,
+import { SchemaFactory } from "./simple-tree/index.js";
+
+import type {
+	AllowedTypes,
+	FixRecursiveArraySchema,
+	TreeNodeFromImplicitAllowedTypes,
+	ValidateRecursiveSchema,
+	// #region Unused imports to make d.ts cleaner
+	/* eslint-disable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars */
+	InsertableTypedNodeUnsafe,
+	TreeNodeSchemaNonClass,
+	TreeNodeSchemaClass,
+	TreeMapNodeUnsafe,
+	NodeKind,
+	TreeNodeSchemaCore,
+	WithType,
+	TreeArrayNodeUnsafe,
+	LeafSchema,
+	/* eslint-enable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars */
+	// #endregion
 } from "./simple-tree/index.js";
 
 const sf = new SchemaFactory("com.fluidframework.json");
@@ -34,10 +48,10 @@ export namespace JsonAsTree {
 	 * @alpha
 	 */
 	export const Primitive = [
-		sf.null,
-		sf.boolean,
-		sf.number,
-		sf.string,
+		SchemaFactory.null,
+		SchemaFactory.number,
+		SchemaFactory.string,
+		SchemaFactory.boolean,
 	] as const satisfies AllowedTypes;
 
 	/**
@@ -51,9 +65,14 @@ export namespace JsonAsTree {
 	 * ```typescript
 	 * const tree = TreeAlpha.importConcise(JsonAsTree.Union, { example: { nested: true }, value: 5 });
 	 * ```
+	 * @privateRemarks
+	 * The order here should not matter for any functionality related reasons.
+	 * In an attempt to improve readability of derived types (in errors, api-reports, IntelliSense etc.)
+	 * and possibly reduce incremental build related order dependence issues,
+	 * the simpler non-recursive types are listed first, followed by the recursive types.
 	 * @alpha
 	 */
-	export const Tree = [() => JsonObject, () => Array, ...Primitive] as const;
+	export const Tree = [...Primitive, () => JsonObject, () => Array] as const;
 
 	/**
 	 * @alpha

package/src/packageVersion.ts

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

package/src/shared-tree/checkoutFlexTreeView.ts

@@ -7,7 +7,7 @@ import { assert } from "@fluidframework/core-utils/internal";
 import {
 	type Context,
 	type FlexTreeField,
-	type NodeKeyManager,
+	type NodeIdentifierManager,
 	getTreeContext,
 	type FlexTreeHydratedContext,
 	type FullSchemaPolicy,
@@ -43,7 +43,7 @@ export class CheckoutFlexTreeView<out TCheckout extends ITreeCheckout = ITreeChe
 		 */
 		public readonly checkout: TCheckout,
 		public readonly schema: FullSchemaPolicy,
-		public readonly nodeKeyManager: NodeKeyManager,
+		public readonly nodeKeyManager: NodeIdentifierManager,
 		private readonly onDispose?: () => void,
 	) {
 		this.context = getTreeContext(schema, this.checkout, nodeKeyManager);

package/src/shared-tree/independentView.ts

@@ -14,19 +14,15 @@ import {
 	type RevisionTag,
 	RevisionTagCodec,
 	TreeStoredSchemaRepository,
-	initializeForest,
-	type ITreeCursorSynchronous,
-	mapCursorField,
 } from "../core/index.js";
 import {
-	createNodeKeyManager,
+	createNodeIdentifierManager,
 	makeFieldBatchCodec,
 	makeSchemaCodec,
 	type FieldBatchEncodingContext,
 	defaultSchemaPolicy,
-	chunkTree,
-	defaultChunkPolicy,
 	TreeCompressionStrategy,
+	initializeForest,
 } from "../feature-libraries/index.js";
 // eslint-disable-next-line import/no-internal-modules
 import type { Format } from "../feature-libraries/schema-index/format.js";
@@ -73,7 +69,7 @@ export function independentView<const TSchema extends ImplicitFieldSchema>(
 	const out: TreeViewAlpha<TSchema> = new SchematizingSimpleTreeView<TSchema>(
 		checkout,
 		config,
-		createNodeKeyManager(idCompressor),
+		createNodeIdentifierManager(idCompressor),
 	);
 	return out;
 }
@@ -116,9 +112,7 @@ export function independentInitializedView<const TSchema extends ImplicitFieldSc
 	assert(fieldCursors.length === 1, 0xa5b /* must have exactly 1 field in batch */);
 	// Checked above.
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-	const cursors = fieldCursorToNodesCursors(fieldCursors[0]!);
-
-	initializeForest(forest, cursors, revisionTagCodec, idCompressor, false);
+	initializeForest(forest, fieldCursors[0]!, revisionTagCodec, idCompressor, false);
 
 	const checkout = createTreeCheckout(idCompressor, mintRevisionTag, revisionTagCodec, {
 		forest,
@@ -127,29 +121,11 @@ export function independentInitializedView<const TSchema extends ImplicitFieldSc
 	const out: TreeViewAlpha<TSchema> = new SchematizingSimpleTreeView<TSchema>(
 		checkout,
 		config,
-		createNodeKeyManager(idCompressor),
+		createNodeIdentifierManager(idCompressor),
 	);
 	return out;
 }
 
-function fieldCursorToNodesCursors(
-	fieldCursor: ITreeCursorSynchronous,
-): ITreeCursorSynchronous[] {
-	return mapCursorField(fieldCursor, copyNodeCursor);
-}
-
-/**
- * TODO: avoid needing this, or optimize it.
- */
-function copyNodeCursor(cursor: ITreeCursorSynchronous): ITreeCursorSynchronous {
-	const copy = chunkTree(cursor, {
-		policy: defaultChunkPolicy,
-		idCompressor: undefined,
-	}).cursor();
-	copy.enterNode(0);
-	return copy;
-}
-
 /**
  * The portion of SharedTree data typically persisted by the container.
  * Usable with {@link independentInitializedView} to create a {@link TreeView}

package/src/shared-tree/index.ts

@@ -21,6 +21,7 @@ export {
 	ForestTypeOptimized,
 	ForestTypeExpensiveDebug,
 	ForestTypeReference,
+	exportSimpleSchema,
 } from "./sharedTree.js";
 
 export {

package/src/shared-tree/schematizeTree.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
 
 import {
 	AllowedUpdateType,
@@ -20,7 +20,7 @@ import {
 	defaultSchemaPolicy,
 	mapTreeFromCursor,
 } from "../feature-libraries/index.js";
-import { fail, isReadonlyArray } from "../util/index.js";
+import { isReadonlyArray } from "../util/index.js";
 
 import type { ITreeCheckout } from "./treeCheckout.js";
 import { toStoredSchema, type ViewSchema } from "../simple-tree/index.js";
@@ -180,6 +180,7 @@ export function initialize(checkout: ITreeCheckout, treeContent: TreeStoredConte
 		initializeContent(checkout, treeContent.schema, () => {
 			const field = { field: rootFieldKey, parent: undefined };
 			const content = normalizeNewFieldContent(treeContent.initialTree);
+			const contentChunk = checkout.forest.chunkField(content);
 
 			switch (checkout.storedSchema.rootFieldSchema.kind) {
 				case FieldKinds.optional.identifier: {
@@ -188,13 +189,13 @@ export function initialize(checkout: ITreeCheckout, treeContent: TreeStoredConte
 						content.getFieldLength() <= 1,
 						0x7f4 /* optional field content should normalize at most one item */,
 					);
-					fieldEditor.set(content.getFieldLength() === 0 ? undefined : content, true);
+					fieldEditor.set(contentChunk.topLevelLength === 0 ? undefined : contentChunk, true);
 					break;
 				}
 				case FieldKinds.sequence.identifier: {
 					const fieldEditor = checkout.editor.sequenceField(field);
 					// TODO: should do an idempotent edit here.
-					fieldEditor.insert(0, content);
+					fieldEditor.insert(0, contentChunk);
 					break;
 				}
 				default: {

package/src/shared-tree/schematizingTreeView.ts

@@ -14,7 +14,7 @@ import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import { AllowedUpdateType, anchorSlot, type SchemaPolicy } from "../core/index.js";
 import {
-	type NodeKeyManager,
+	type NodeIdentifierManager,
 	defaultSchemaPolicy,
 	ContextSlot,
 	cursorForMapTreeNode,
@@ -117,7 +117,7 @@ export class SchematizingSimpleTreeView<
 	public constructor(
 		public readonly checkout: TreeCheckout,
 		public readonly config: TreeViewConfiguration<ReadSchema<TRootSchema>>,
-		public readonly nodeKeyManager: NodeKeyManager,
+		public readonly nodeKeyManager: NodeIdentifierManager,
 		private readonly onDispose?: () => void,
 	) {
 		this.breaker = checkout.breaker;
@@ -509,7 +509,7 @@ export function requireSchema(
 	checkout: ITreeCheckout,
 	viewSchema: ViewSchema,
 	onDispose: () => void,
-	nodeKeyManager: NodeKeyManager,
+	nodeKeyManager: NodeIdentifierManager,
 	schemaPolicy: FullSchemaPolicy,
 ): CheckoutFlexTreeView {
 	const slots = checkout.forest.anchors.slots;