@fluidframework/tree 2.74.0-365691 → 2.74.0-370705

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

@@ -13,7 +13,7 @@ import type {
 	ImplicitAllowedTypes,
 } from "../../core/index.js";
 
-import type { SimpleMapNodeSchema } from "../../simpleSchema.js";
+import type { SchemaType, SimpleMapNodeSchema } from "../../simpleSchema.js";
 
 /**
  * A schema for customizable {@link (TreeMapNode:interface)}s.
@@ -34,7 +34,7 @@ export interface MapNodeCustomizableSchema<
 			undefined,
 			TCustomMetadata
 		>,
-		SimpleMapNodeSchema<TCustomMetadata> {}
+		SimpleMapNodeSchema<SchemaType.View, TCustomMetadata> {}
 
 /**
  * A schema for POJO emulation mode {@link (TreeMapNode:interface)}s.
@@ -55,7 +55,7 @@ export interface MapNodePojoEmulationSchema<
 			undefined,
 			TCustomMetadata
 		>,
-		SimpleMapNodeSchema<TCustomMetadata> {}
+		SimpleMapNodeSchema<SchemaType.View, TCustomMetadata> {}
 
 /**
  * A schema for {@link (TreeMapNode:interface)}s.

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

@@ -81,7 +81,7 @@ import {
 import type { SimpleObjectFieldSchema } from "../../simpleSchema.js";
 import {
 	unhydratedFlexTreeFromInsertable,
-	unhydratedFlexTreeFromInsertableNode,
+	flexTreeFromInsertableNode,
 	type FactoryContent,
 	type FactoryContentObject,
 	type InsertableContent,
@@ -353,29 +353,31 @@ export function setField(
 	value: InsertableContent | undefined,
 	destinationSchema: TreeFieldStoredSchema,
 ): void {
-	const mapTree = prepareForInsertion(
-		value,
-		simpleFieldSchema,
-		field.context,
-		destinationSchema,
-	);
+	field.context.runInTransaction(() => {
+		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.set(mapTree);
-			break;
-		}
-		case FieldKinds.optional.identifier: {
-			const typedField = field as FlexTreeOptionalField;
-			typedField.editor.set(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.attach(mapTree);
+				break;
+			}
+			case FieldKinds.optional.identifier: {
+				const typedField = field as FlexTreeOptionalField;
+				typedField.editor.attach(mapTree, typedField.length === 0);
+				break;
+			}
 
-		default:
-			fail(0xade /* invalid FieldKind */);
-	}
+			default:
+				fail(0xade /* invalid FieldKind */);
+		}
+	});
 }
 
 /**
@@ -661,7 +663,7 @@ function objectToFlexContent(
 	for (const [key, fieldInfo] of schema.flexKeyMap) {
 		const value = getFieldProperty(data, key);
 
-		let children: UnhydratedFlexTreeNode[] | ContextualFieldProvider;
+		let children: FlexTreeNode[] | ContextualFieldProvider;
 		if (value === undefined) {
 			const defaultProvider =
 				fieldInfo.schema.props?.defaultProvider ??
@@ -669,9 +671,7 @@ function objectToFlexContent(
 			const fieldProvider = extractFieldProvider(defaultProvider);
 			children = isConstant(fieldProvider) ? fieldProvider() : fieldProvider;
 		} else {
-			children = [
-				unhydratedFlexTreeFromInsertableNode(value, fieldInfo.schema.allowedTypeSet),
-			];
+			children = [flexTreeFromInsertableNode(value, fieldInfo.schema.allowedTypeSet)];
 		}
 
 		const kind =

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

@@ -17,7 +17,11 @@ import {
 	type TreeNodeSchemaCorePrivate,
 } from "../../core/index.js";
 import type { FieldKey } from "../../../core/index.js";
-import type { SimpleObjectFieldSchema, SimpleObjectNodeSchema } from "../../simpleSchema.js";
+import type {
+	SchemaType,
+	SimpleObjectFieldSchema,
+	SimpleObjectNodeSchema,
+} from "../../simpleSchema.js";
 
 /**
  * A schema for {@link TreeObjectNode}s.
@@ -40,7 +44,7 @@ export interface ObjectNodeSchema<
 			never,
 			TCustomMetadata
 		>,
-		SimpleObjectNodeSchema<TCustomMetadata> {
+		SimpleObjectNodeSchema<SchemaType.View, TCustomMetadata> {
 	/**
 	 * From property keys to the associated schema.
 	 */

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

@@ -57,7 +57,7 @@ import { prepareForInsertion } from "../../prepareForInsertion.js";
 import { recordLikeDataToFlexContent } from "../common.js";
 import { MapNodeStoredSchema } from "../../../core/index.js";
 import type { NodeSchemaOptionsAlpha } from "../../api/index.js";
-import type { SimpleAllowedTypeAttributes } from "../../simpleSchema.js";
+import type { SchemaType, SimpleAllowedTypeAttributes } from "../../simpleSchema.js";
 
 /**
  * Create a proxy which implements the {@link TreeRecordNode} API.
@@ -128,15 +128,16 @@ function createRecordNodeProxy(
 				innerSchema instanceof MapNodeStoredSchema,
 				0xc1a /* Expected MapNodeStoredSchema */,
 			);
-
-			const mapTree = prepareForInsertion(
-				value,
-				createFieldSchema(FieldKind.Optional, kernel.schema.info as ImplicitAllowedTypes),
-				innerNode.context,
-				innerSchema.mapFields,
-			);
-
-			field.editor.set(mapTree, field.length === 0);
+			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);
+			});
 			return true;
 		},
 		has: (target, key): boolean => {
@@ -350,7 +351,10 @@ export function recordSchema<
 			return lazyAllowedTypesIdentifiers.value;
 		}
 
-		public static get simpleAllowedTypes(): ReadonlyMap<string, SimpleAllowedTypeAttributes> {
+		public static get simpleAllowedTypes(): ReadonlyMap<
+			string,
+			SimpleAllowedTypeAttributes<SchemaType.View>
+		> {
 			return lazySimpleAllowedTypes.value;
 		}
 

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

@@ -15,7 +15,7 @@ import type {
 	TreeNodeFromImplicitAllowedTypes,
 } from "../../core/index.js";
 
-import type { SimpleRecordNodeSchema } from "../../simpleSchema.js";
+import type { SchemaType, SimpleRecordNodeSchema } from "../../simpleSchema.js";
 import type { RestrictiveStringRecord } from "../../../util/index.js";
 
 /**
@@ -83,7 +83,7 @@ export interface RecordNodeCustomizableSchema<
 			/* TConstructorExtra */ undefined,
 			/* TCustomMetadata */ TCustomMetadata
 		>,
-		SimpleRecordNodeSchema<TCustomMetadata> {}
+		SimpleRecordNodeSchema<SchemaType.View, TCustomMetadata> {}
 
 /**
  * A schema for POJO emulation mode {@link (TreeMapNode:interface)}s.
@@ -104,7 +104,7 @@ export interface RecordNodePojoEmulationSchema<
 			/* TConstructorExtra */ undefined,
 			/* TCustomMetadata */ TCustomMetadata
 		>,
-		SimpleRecordNodeSchema<TCustomMetadata> {}
+		SimpleRecordNodeSchema<SchemaType.View, TCustomMetadata> {}
 
 /**
  * A schema for {@link (TreeRecordNode:interface)}s.