@fluidframework/tree 2.81.0-374083 → 2.81.1

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

@@ -4,8 +4,8 @@
  */
 
 import { assert, Lazy, fail, debugAssert } from "@fluidframework/core-utils/internal";
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import {
 	ObjectNodeStoredSchema,
@@ -26,7 +26,7 @@ import type {
 	JsonCompatibleReadOnlyObject,
 } from "../../../util/index.js";
 import { brand } from "../../../util/index.js";
-
+import type { ObjectSchemaOptionsAlpha } from "../../api/index.js";
 import {
 	CompatibilityLevel,
 	type TreeNodeSchema,
@@ -56,13 +56,6 @@ import {
 	getTreeNodeSchemaInitializedData,
 	getUnhydratedContext,
 } from "../../createContext.js";
-import { tryGetTreeNodeForField } from "../../getTreeNodeForField.js";
-import type {
-	ObjectNodeSchema,
-	ObjectNodeSchemaInternalData,
-	ObjectNodeSchemaPrivate,
-} from "./objectNodeTypes.js";
-import { prepareForInsertion } from "../../prepareForInsertion.js";
 import {
 	type ImplicitFieldSchema,
 	getStoredKey,
@@ -78,16 +71,23 @@ import {
 	extractFieldProvider,
 	isConstant,
 } from "../../fieldSchema.js";
+import { tryGetTreeNodeForField } from "../../getTreeNodeForField.js";
+import { prepareForInsertion } from "../../prepareForInsertion.js";
 import type { SimpleObjectFieldSchema } from "../../simpleSchema.js";
+import { convertFieldKind } from "../../toStoredSchema.js";
 import {
 	unhydratedFlexTreeFromInsertable,
-	flexTreeFromInsertableNode,
+	unhydratedFlexTreeFromInsertableNode,
 	type FactoryContent,
 	type FactoryContentObject,
 	type InsertableContent,
 } from "../../unhydratedFlexTreeFromInsertable.js";
-import { convertFieldKind } from "../../toStoredSchema.js";
-import type { ObjectSchemaOptionsAlpha } from "../../api/index.js";
+
+import type {
+	ObjectNodeSchema,
+	ObjectNodeSchemaInternalData,
+	ObjectNodeSchemaPrivate,
+} from "./objectNodeTypes.js";
 
 /**
  * Generates the properties for an ObjectNode from its field schema object.
@@ -353,32 +353,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 */);
 		}
-	});
+	}
 }
 
 /**
@@ -664,7 +662,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 ??
@@ -672,7 +670,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/object/objectNodeTypes.ts

@@ -3,26 +3,27 @@
  * Licensed under the MIT License.
  */
 
+import type { FieldKey } from "../../../core/index.js";
 import type { RestrictiveStringRecord } from "../../../util/index.js";
-import type {
-	TreeObjectNode,
-	SimpleKeyMap,
-	InsertableObjectFromSchemaRecord,
-} from "./objectNode.js";
-import type { FieldSchemaAlpha, ImplicitFieldSchema } from "../../fieldSchema.js";
 import {
 	NodeKind,
 	type TreeNodeSchemaClass,
 	type TreeNodeSchema,
 	type TreeNodeSchemaCorePrivate,
 } from "../../core/index.js";
-import type { FieldKey } from "../../../core/index.js";
+import type { FieldSchemaAlpha, ImplicitFieldSchema } from "../../fieldSchema.js";
 import type {
 	SchemaType,
 	SimpleObjectFieldSchema,
 	SimpleObjectNodeSchema,
 } from "../../simpleSchema.js";
 
+import type {
+	TreeObjectNode,
+	SimpleKeyMap,
+	InsertableObjectFromSchemaRecord,
+} from "./objectNode.js";
+
 /**
  * A schema for {@link TreeObjectNode}s.
  * @sealed

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

@@ -6,8 +6,14 @@
 import { assert, Lazy } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
+import { MapNodeStoredSchema } from "../../../core/index.js";
+import {
+	isTreeValue,
+	type FlexTreeNode,
+	type FlexTreeOptionalField,
+} from "../../../feature-libraries/index.js";
 import { type JsonCompatibleReadOnlyObject, brand } from "../../../util/index.js";
-
+import type { NodeSchemaOptionsAlpha } from "../../api/index.js";
 import {
 	type TreeNodeSchema,
 	NodeKind,
@@ -34,13 +40,17 @@ import {
 	AnnotatedAllowedTypesInternal,
 } from "../../core/index.js";
 import { getTreeNodeSchemaInitializedData } from "../../createContext.js";
-import { tryGetTreeNodeForField } from "../../getTreeNodeForField.js";
 import { createFieldSchema, FieldKind } from "../../fieldSchema.js";
+import { tryGetTreeNodeForField } from "../../getTreeNodeForField.js";
+import { prepareForInsertion } from "../../prepareForInsertion.js";
+import type { SchemaType, SimpleAllowedTypeAttributes } from "../../simpleSchema.js";
 import {
 	unhydratedFlexTreeFromInsertable,
 	type FactoryContent,
 	type InsertableContent,
 } from "../../unhydratedFlexTreeFromInsertable.js";
+import { recordLikeDataToFlexContent } from "../common.js";
+
 import type {
 	RecordNodeCustomizableSchema,
 	RecordNodeInsertableData,
@@ -48,16 +58,6 @@ import type {
 	RecordNodeSchema,
 	TreeRecordNode,
 } from "./recordNodeTypes.js";
-import {
-	isTreeValue,
-	type FlexTreeNode,
-	type FlexTreeOptionalField,
-} from "../../../feature-libraries/index.js";
-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 { SchemaType, SimpleAllowedTypeAttributes } from "../../simpleSchema.js";
 
 /**
  * Create a proxy which implements the {@link TreeRecordNode} API.
@@ -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 => {

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

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import type { RestrictiveStringRecord } from "../../../util/index.js";
 import { NodeKind } from "../../core/index.js";
 import type {
 	TreeNodeSchemaClass,
@@ -14,9 +15,7 @@ import type {
 	InsertableTreeNodeFromImplicitAllowedTypes,
 	TreeNodeFromImplicitAllowedTypes,
 } from "../../core/index.js";
-
 import type { SchemaType, SimpleRecordNodeSchema } from "../../simpleSchema.js";
-import type { RestrictiveStringRecord } from "../../../util/index.js";
 
 /**
  * A {@link TreeNode} which models a TypeScript {@link https://www.typescriptlang.org/docs/handbook/utility-types.html#recordkeys-type | record}.