@fluidframework/tree 2.90.0-378676 → 2.90.0

package/src/simple-tree/core/unhydratedFlexTree.ts

@@ -5,7 +5,7 @@
 
 import { createEmitter } from "@fluid-internal/client-utils";
 import type { HasListeners, Listenable } from "@fluidframework/core-interfaces/internal";
-import { assert, oob, fail, debugAssert } from "@fluidframework/core-utils/internal";
+import { assert, oob, fail } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import {
@@ -38,16 +38,16 @@ import {
 	type FlexTreeHydratedContext,
 	type FlexFieldKind,
 	FieldKinds,
+	type SequenceFieldEditBuilder,
 	cursorForMapTreeNode,
-	type SequenceFieldEditor,
-	type RequiredFieldEditor,
+	type OptionalFieldEditBuilder,
+	type ValueFieldEditBuilder,
+	type FlexibleNodeContent,
 	type FlexTreeHydratedContextMinimal,
 	type FlexibleFieldContent,
 	type MapTreeFieldViewGeneric,
 	type MapTreeNodeViewGeneric,
 	type HydratedFlexTreeNode,
-	type FlexibleNodeContent,
-	type OptionalFieldEditor,
 	cursorForMapTreeField,
 	type MinimalFieldMap,
 	currentObserver,
@@ -59,7 +59,7 @@ import type { Context } from "./context.js";
 import type { TreeNode } from "./treeNode.js";
 
 interface UnhydratedTreeSequenceFieldEditBuilder
-	extends SequenceFieldEditor<FlexibleFieldContent, readonly FlexTreeNode[]> {
+	extends SequenceFieldEditBuilder<FlexibleFieldContent, UnhydratedFlexTreeNode[]> {
 	/**
 	 * Moves elements from a source position to a destination position.
 	 * Can move within the same field or from another unhydrated sequence field.
@@ -88,7 +88,7 @@ type LocationInField = FlexTreeNode["parentField"];
  * The {@link Unhydrated} implementation of {@link FlexTreeNode}.
  */
 export class UnhydratedFlexTreeNode
-	implements FlexTreeNode, MapTreeNodeViewGeneric<FlexTreeNode>
+	implements FlexTreeNode, MapTreeNodeViewGeneric<UnhydratedFlexTreeNode>
 {
 	public isHydrated(): this is HydratedFlexTreeNode {
 		return false;
@@ -241,7 +241,7 @@ export class UnhydratedFlexTreeNode
 	}
 
 	public borrowCursor(): ITreeCursorSynchronous {
-		return cursorForMapTreeNode<MapTreeNodeViewGeneric<FlexTreeNode>>(this);
+		return cursorForMapTreeNode<MapTreeNodeViewGeneric<UnhydratedFlexTreeNode>>(this);
 	}
 
 	public tryGetField(key: FieldKey): UnhydratedFlexTreeField | undefined {
@@ -315,11 +315,6 @@ export class UnhydratedContext implements FlexTreeContext {
 	public isHydrated(): this is FlexTreeHydratedContext {
 		return false;
 	}
-
-	public runInTransaction(fn: () => void): void {
-		debugAssert(() => !this.isDisposed() || "Disposed");
-		fn();
-	}
 }
 
 // #region Fields
@@ -347,7 +342,7 @@ const unparentedLocation: LocationInField = {
  * The {@link Unhydrated} implementation of {@link FlexTreeField}.
  */
 export class UnhydratedFlexTreeField
-	implements FlexTreeField, MapTreeFieldViewGeneric<FlexTreeNode>
+	implements FlexTreeField, MapTreeFieldViewGeneric<UnhydratedFlexTreeNode>
 {
 	public [flexTreeMarker] = FlexTreeEntityKind.Field as const;
 
@@ -364,23 +359,21 @@ export class UnhydratedFlexTreeField
 		 * See {@link fillPendingDefaults}.
 		 * Note that any fields using a {@link ConstantFieldProvider} should be evaluated before constructing the UnhydratedFlexTreeField.
 		 */
-		private lazyChildren: FlexTreeNode[] | ContextualFieldProvider,
+		private lazyChildren: UnhydratedFlexTreeNode[] | ContextualFieldProvider,
 	) {
 		// When this field is created (which only happens one time, because it is cached), all the children become parented for the first time.
 		// "Adopt" each child by updating its parent information to point to this field.
 		if (Array.isArray(lazyChildren)) {
 			for (const [i, child] of lazyChildren.entries()) {
-				if (child instanceof UnhydratedFlexTreeNode) {
-					child.adoptBy(this, i);
-				} else {
-					// TODO: hook up events from hydrated to unhydrated nodes.
-				}
+				child.adoptBy(this, i);
 			}
 		}
 	}
 
 	public borrowCursor(): ITreeCursorSynchronous {
-		return cursorForMapTreeField<MapTreeNodeViewGeneric<FlexTreeNode>>(this.children);
+		return cursorForMapTreeField<MapTreeNodeViewGeneric<UnhydratedFlexTreeNode>>(
+			this.children,
+		);
 	}
 
 	private getPendingDefault(): ContextualFieldProvider | undefined {
@@ -408,13 +401,13 @@ export class UnhydratedFlexTreeField
 		return this.getPendingDefault() !== undefined;
 	}
 
-	public get children(): FlexTreeNode[] {
+	public get children(): UnhydratedFlexTreeNode[] {
 		const provider = this.getPendingDefault();
 		if (provider) {
 			const content = provider("UseGlobalContext");
 			this.lazyChildren = content;
 		}
-		return this.lazyChildren as FlexTreeNode[];
+		return this.lazyChildren as UnhydratedFlexTreeNode[];
 	}
 
 	public get length(): number {
@@ -434,7 +427,7 @@ export class UnhydratedFlexTreeField
 		return m;
 	}
 
-	public [Symbol.iterator](): IterableIterator<FlexTreeNode> {
+	public [Symbol.iterator](): IterableIterator<UnhydratedFlexTreeNode> {
 		return this.children[Symbol.iterator]();
 	}
 
@@ -446,17 +439,19 @@ export class UnhydratedFlexTreeField
 	 * @remarks All edits to the field (i.e. mutations of the field's MapTrees) should be directed through this function.
 	 * This function ensures that the parent MapTree has no empty fields (which is an invariant of `MapTree`) after the mutation.
 	 */
-	protected edit(edit: (mapTrees: FlexTreeNode[]) => void | FlexTreeNode[]): void {
+	protected edit(
+		edit: (mapTrees: UnhydratedFlexTreeNode[]) => void | UnhydratedFlexTreeNode[],
+	): void {
 		// Clear parents for all old map trees.
 		for (const tree of this.children) {
-			orphan(tree);
+			tree.adoptBy(undefined);
 		}
 
 		this.lazyChildren = edit(this.children) ?? this.children;
 
 		// Set parents for all new map trees.
 		for (const [index, tree] of this.children.entries()) {
-			adoptNode(this, tree, index);
+			tree.adoptBy(this, index);
 		}
 
 		this.parent?.emitChangedEvent(this.key);
@@ -467,7 +462,7 @@ export class UnhydratedFlexTreeField
 	}
 
 	/** Unboxes leaf nodes to their values */
-	protected unboxed(index: number): TreeValue | FlexTreeNode {
+	protected unboxed(index: number): TreeValue | UnhydratedFlexTreeNode {
 		const child = this.children[index] ?? oob();
 		const value = child.value;
 		if (value !== undefined) {
@@ -477,22 +472,6 @@ export class UnhydratedFlexTreeField
 	}
 }
 
-function adoptNode(parent: UnhydratedFlexTreeField, node: FlexTreeNode, index: number): void {
-	if (node instanceof UnhydratedFlexTreeNode) {
-		node.adoptBy(parent, index);
-	} else {
-		// TODO: handle parenting for hydrated nodes.
-	}
-}
-
-function orphan(node: FlexTreeNode): void {
-	if (node instanceof UnhydratedFlexTreeNode) {
-		node.adoptBy(undefined);
-	} else {
-		// TODO: handle unparenting for hydrated nodes.
-	}
-}
-
 /**
  * The {@link Unhydrated} implementation of {@link FlexTreeOptionalField}.
  */
@@ -500,9 +479,8 @@ export class UnhydratedOptionalField
 	extends UnhydratedFlexTreeField
 	implements FlexTreeOptionalField
 {
-	public readonly editor: OptionalFieldEditor<FlexibleNodeContent, FlexTreeNode> = {
+	public readonly editor = {
 		set: (newContent: FlexibleNodeContent | undefined): void => {
-			// If the new content is a UnhydratedFlexTreeNode, it needs to have its parent pointer updated
 			if (newContent !== undefined) {
 				assert(
 					newContent instanceof UnhydratedFlexTreeNode,
@@ -518,13 +496,8 @@ export class UnhydratedOptionalField
 				}
 			});
 		},
-		clear: (): void => {
-			this.editor.set(undefined, true /* <- dummy wasEmpty argument */);
-		},
-		attach: (content): void => {
-			this.editor.set(content, true /* <- dummy wasEmpty argument */);
-		},
-	};
+	} satisfies OptionalFieldEditBuilder<FlexibleNodeContent> &
+		ValueFieldEditBuilder<FlexibleNodeContent>;
 
 	public get content(): FlexTreeUnknownUnboxed | undefined {
 		const value = this.children[0];
@@ -536,34 +509,17 @@ export class UnhydratedOptionalField
 	}
 }
 
-export class UnhydratedRequiredField
-	extends UnhydratedFlexTreeField
+class UnhydratedRequiredField
+	extends UnhydratedOptionalField
 	implements FlexTreeRequiredField
 {
-	public readonly editor: RequiredFieldEditor<FlexibleNodeContent, FlexTreeNode> = {
-		set: (newContent: FlexibleNodeContent): void => {
-			assert(
-				newContent instanceof UnhydratedFlexTreeNode,
-				0xbb7 /* Expected unhydrated node */,
-			);
-
-			this.edit((mapTrees) => {
-				mapTrees[0] = newContent;
-			});
-		},
-		attach: (content): void => {
-			this.editor.set(content);
-		},
-	};
-
-	public get content(): FlexTreeUnknownUnboxed {
-		const value = this.children[0];
+	public override get content(): FlexTreeUnknownUnboxed {
 		// This cannot use ?? since null is a legal value here.
 		assert(
-			value !== undefined,
+			super.content !== undefined,
 			0xa57 /* Expected EagerMapTree required field to have a value */,
 		);
-		return this.unboxed(0);
+		return super.content;
 	}
 }
 
@@ -578,9 +534,9 @@ export class UnhydratedSequenceField
 		insert: (index, newContent): void => {
 			for (const c of newContent) {
 				assert(c !== undefined, 0xa0a /* Unexpected sparse array content */);
-				// TODO: ensure somewhere checks for not already having parents
+				assert(c instanceof UnhydratedFlexTreeNode, 0xbb8 /* Expected unhydrated node */);
 			}
-			const newContentChecked: readonly FlexTreeNode[] = newContent;
+			const newContentChecked = newContent as readonly UnhydratedFlexTreeNode[];
 			this.edit((mapTrees) => {
 				if (newContent.length < 1000) {
 					// For "smallish arrays" (`1000` is not empirically derived), the `splice` function is appropriate...
@@ -591,20 +547,17 @@ export class UnhydratedSequenceField
 				}
 			});
 		},
-		remove: (index, count): FlexTreeNode[] => {
+		remove: (index, count): UnhydratedFlexTreeNode[] => {
 			for (let i = index; i < index + count; i++) {
 				const c = this.children[i];
 				assert(c !== undefined, 0xa0b /* Unexpected sparse array */);
 			}
-			let removed: FlexTreeNode[] | undefined;
+			let removed: UnhydratedFlexTreeNode[] | undefined;
 			this.edit((mapTrees) => {
 				removed = mapTrees.splice(index, count);
 			});
 			return removed ?? fail(0xb4a /* Expected removed to be set by edit */);
 		},
-		attach: (index, content: readonly FlexTreeNode[]): void => {
-			this.editor.insert(index, content);
-		},
 		move: (sourceIndex, count, destIndex, source?): void => {
 			const sourceField = source ?? this;
 			if (sourceField === this) {

package/src/simple-tree/fieldSchema.ts

@@ -8,10 +8,7 @@ import { Lazy } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import type { FieldKey } from "../core/index.js";
-import type {
-	FlexTreeHydratedContextMinimal,
-	FlexTreeNode,
-} from "../feature-libraries/index.js";
+import type { FlexTreeHydratedContextMinimal } from "../feature-libraries/index.js";
 import {
 	type MakeNominal,
 	brand,
@@ -25,6 +22,7 @@ import {
 import type {
 	TreeNodeSchema,
 	TreeNode,
+	UnhydratedFlexTreeNode,
 	ImplicitAllowedTypes,
 	TreeNodeFromImplicitAllowedTypes,
 	TreeLeafValue,
@@ -191,11 +189,11 @@ export interface FieldPropsAlpha<TCustomMetadata = unknown>
  */
 export type ContextualFieldProvider = (
 	context: FlexTreeHydratedContextMinimal | "UseGlobalContext",
-) => FlexTreeNode[];
+) => UnhydratedFlexTreeNode[];
 /**
  * A {@link FieldProvider} which can produce its content in a vacuum.
  */
-export type ConstantFieldProvider = () => FlexTreeNode[];
+export type ConstantFieldProvider = () => UnhydratedFlexTreeNode[];
 /**
  * A function which produces content for a field every time that it is called.
  */

package/src/simple-tree/index.ts

@@ -95,10 +95,10 @@ export {
 	importConcise,
 	TreeBeta,
 	type TreeChangeEventsBeta,
-	type SimpleTreeIndex,
 	type IdentifierIndex,
-	createSimpleTreeIndex,
+	createTreeIndex,
 	createIdentifierIndex,
+	type TreeIndexKey,
 	type DirtyTreeStatus,
 	trackDirtyNodes,
 	type DirtyTreeMap,
@@ -201,6 +201,8 @@ export {
 	type SnapshotFileSystem,
 	type SnapshotSchemaCompatibilityOptions,
 	createCustomizedFluidFrameworkScopedFactory,
+	type TreeContextAlpha,
+	type WithValue,
 } from "./api/index.js";
 export type {
 	SimpleTreeSchema,
@@ -271,7 +273,7 @@ export {
 	createArrayInsertionAnchor,
 } from "./node-kinds/index.js";
 export {
-	flexTreeFromInsertable as unhydratedFlexTreeFromInsertable,
+	unhydratedFlexTreeFromInsertable,
 	type InsertableContent,
 	type FactoryContent,
 	type FactoryContentObject,
@@ -279,7 +281,6 @@ export {
 export {
 	prepareForInsertion,
 	prepareForInsertionContextless,
-	type PreparedContent,
 } from "./prepareForInsertion.js";
 export {
 	toStoredSchema,

package/src/simple-tree/node-kinds/array/arrayNode.ts

@@ -63,9 +63,9 @@ import { prepareArrayContentForInsertion } from "../../prepareForInsertion.js";
 import type { SchemaType, SimpleAllowedTypeAttributes } from "../../simpleSchema.js";
 import {
 	type FactoryContent,
-	flexTreeFromInsertableNode,
 	type InsertableContent,
 	unhydratedFlexTreeFromInsertable,
+	unhydratedFlexTreeFromInsertableNode,
 } from "../../unhydratedFlexTreeFromInsertable.js";
 
 import type {
@@ -969,10 +969,8 @@ abstract class CustomArrayNodeBase<const T extends ImplicitAllowedTypes>
 	public insertAt(index: number, ...value: Insertable<T>): void {
 		const field = getSequenceField(this);
 		validateIndex(index, field, "TreeArrayNode.insertAt", true);
-		field.context.runInTransaction(() => {
-			const content = this.#mapTreesFromFieldData(value);
-			field.editor.attach(index, content);
-		});
+		const content = this.#mapTreesFromFieldData(value);
+		field.editor.insert(index, content);
 	}
 	public insertAtStart(...value: Insertable<T>): void {
 		this.insertAt(0, ...value);
@@ -1321,7 +1319,7 @@ export function arraySchema<
 function arrayChildToFlexTree(
 	child: InsertableContent,
 	allowedTypes: ReadonlySet<TreeNodeSchema>,
-): FlexTreeNode {
+): UnhydratedFlexTreeNode {
 	// We do not support undefined sequence entries.
 	// If we encounter an undefined entry, use null instead if supported by the schema, otherwise throw.
 	let childWithFallback = child;
@@ -1332,7 +1330,7 @@ function arrayChildToFlexTree(
 			throw new TypeError(`Received unsupported array entry value: ${child}.`);
 		}
 	}
-	return flexTreeFromInsertableNode(childWithFallback, allowedTypes);
+	return unhydratedFlexTreeFromInsertableNode(childWithFallback, allowedTypes);
 }
 
 /**

package/src/simple-tree/node-kinds/common.ts

@@ -16,7 +16,7 @@ import {
 } from "../core/index.js";
 import { getUnhydratedContext } from "../createContext.js";
 import {
-	flexTreeFromInsertableNode,
+	unhydratedFlexTreeFromInsertableNode,
 	type InsertableContent,
 } from "../unhydratedFlexTreeFromInsertable.js";
 
@@ -44,7 +44,10 @@ export function recordLikeDataToFlexContent(
 
 		// Omit undefined values - an entry with an undefined value is equivalent to one that has been removed or omitted
 		if (value !== undefined) {
-			const child = flexTreeFromInsertableNode(value, allowedChildTypes.evaluateSet());
+			const child = unhydratedFlexTreeFromInsertableNode(
+				value,
+				allowedChildTypes.evaluateSet(),
+			);
 			const field = createField(context, FieldKinds.optional.identifier, brand(key), [child]);
 			transformedFields.set(brand(key), field);
 		}

package/src/simple-tree/node-kinds/map/mapNode.ts

@@ -12,7 +12,7 @@ import {
 	type FlexibleNodeContent,
 	type FlexTreeNode,
 	type FlexTreeOptionalField,
-	type OptionalFieldEditor,
+	type OptionalFieldEditBuilder,
 } from "../../../feature-libraries/index.js";
 import {
 	brand,
@@ -178,14 +178,14 @@ abstract class CustomMapNodeBase<const T extends ImplicitAllowedTypes> extends T
 		return getInnerNode(this);
 	}
 
-	private editor(key: string): OptionalFieldEditor<FlexibleNodeContent, FlexTreeNode> {
+	private editor(key: string): OptionalFieldEditBuilder<FlexibleNodeContent> {
 		const field = this.innerNode.getBoxed(brand(key)) as FlexTreeOptionalField;
 		return field.editor;
 	}
 
 	public delete(key: string): void {
 		const field = this.innerNode.getBoxed(brand(key));
-		this.editor(key).clear(field.length === 0);
+		this.editor(key).set(undefined, field.length === 0);
 	}
 	public *entries(): IterableIterator<[string, TreeNodeFromImplicitAllowedTypes<T>]> {
 		const node = this.innerNode;
@@ -228,7 +228,7 @@ abstract class CustomMapNodeBase<const T extends ImplicitAllowedTypes> extends T
 
 		const field = node.getBoxed(brand(key));
 
-		this.editor(key).attach(mapTree, field.length === 0);
+		this.editor(key).set(mapTree, field.length === 0);
 		return this;
 	}
 	public get size(): number {

package/src/simple-tree/node-kinds/object/objectNode.ts

@@ -77,7 +77,7 @@ import type { SimpleObjectFieldSchema } from "../../simpleSchema.js";
 import { convertFieldKind } from "../../toStoredSchema.js";
 import {
 	unhydratedFlexTreeFromInsertable,
-	flexTreeFromInsertableNode,
+	unhydratedFlexTreeFromInsertableNode,
 	type FactoryContent,
 	type FactoryContentObject,
 	type InsertableContent,
@@ -354,32 +354,30 @@ export function setField(
 	value: InsertableContent | undefined,
 	destinationSchema: TreeFieldStoredSchema,
 ): void {
-	field.context.runInTransaction(() => {
-		const mapTree = prepareForInsertion(
-			value,
-			simpleFieldSchema,
-			field.context,
-			destinationSchema,
-		);
+	const mapTree = prepareForInsertion(
+		value,
+		simpleFieldSchema,
+		field.context,
+		destinationSchema,
+	);
 
-		switch (field.schema) {
-			case FieldKinds.required.identifier: {
-				assert(mapTree !== undefined, 0xa04 /* Cannot set a required field to undefined */);
-				const typedField = field as FlexTreeRequiredField;
-				typedField.editor.attach(mapTree);
-				break;
-			}
-			case FieldKinds.optional.identifier: {
-				const typedField = field as FlexTreeOptionalField;
-				typedField.editor.attach(mapTree, typedField.length === 0);
-				break;
-			}
+	switch (field.schema) {
+		case FieldKinds.required.identifier: {
+			assert(mapTree !== undefined, 0xa04 /* Cannot set a required field to undefined */);
+			const typedField = field as FlexTreeRequiredField;
+			typedField.editor.set(mapTree);
+			break;
+		}
+		case FieldKinds.optional.identifier: {
+			const typedField = field as FlexTreeOptionalField;
+			typedField.editor.set(mapTree, typedField.length === 0);
+			break;
+		}
 
-			default: {
-				fail(0xade /* invalid FieldKind */);
-			}
+		default: {
+			fail(0xade /* invalid FieldKind */);
 		}
-	});
+	}
 }
 
 /**
@@ -665,7 +663,7 @@ function objectToFlexContent(
 	for (const [key, fieldInfo] of schema.flexKeyMap) {
 		const value = getFieldProperty(data, key);
 
-		let children: FlexTreeNode[] | ContextualFieldProvider;
+		let children: UnhydratedFlexTreeNode[] | ContextualFieldProvider;
 		if (value === undefined) {
 			const defaultProvider =
 				fieldInfo.schema.props?.defaultProvider ??
@@ -673,7 +671,9 @@ function objectToFlexContent(
 			const fieldProvider = extractFieldProvider(defaultProvider);
 			children = isConstant(fieldProvider) ? fieldProvider() : fieldProvider;
 		} else {
-			children = [flexTreeFromInsertableNode(value, fieldInfo.schema.allowedTypeSet)];
+			children = [
+				unhydratedFlexTreeFromInsertableNode(value, fieldInfo.schema.allowedTypeSet),
+			];
 		}
 
 		const kind =

package/src/simple-tree/node-kinds/record/recordNode.ts

@@ -127,16 +127,15 @@ function createRecordNodeProxy(
 				innerSchema instanceof MapNodeStoredSchema,
 				0xc1a /* Expected MapNodeStoredSchema */,
 			);
-			field.context.runInTransaction(() => {
-				const mapTree = prepareForInsertion(
-					value,
-					createFieldSchema(FieldKind.Optional, kernel.schema.info as ImplicitAllowedTypes),
-					innerNode.context,
-					innerSchema.mapFields,
-				);
-
-				field.editor.attach(mapTree, field.length === 0);
-			});
+
+			const mapTree = prepareForInsertion(
+				value,
+				createFieldSchema(FieldKind.Optional, kernel.schema.info as ImplicitAllowedTypes),
+				innerNode.context,
+				innerSchema.mapFields,
+			);
+
+			field.editor.set(mapTree, field.length === 0);
 			return true;
 		},
 		has: (target, key): boolean => {