@fluidframework/tree 2.74.0-365691 → 2.74.0-368706

package/src/simple-tree/toStoredSchema.ts

@@ -7,6 +7,7 @@ import {
 	unreachableCase,
 	fail,
 	transformMapValues,
+	assert,
 } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
@@ -21,38 +22,75 @@ import {
 	type TreeNodeSchemaIdentifier,
 	type TreeNodeStoredSchema,
 	type TreeStoredSchema,
+	type TreeTypeSet,
 } from "../core/index.js";
 import { FieldKinds, type FlexFieldKind } from "../feature-libraries/index.js";
-import { brand, getOrCreate, type JsonCompatibleReadOnlyObject } from "../util/index.js";
+import {
+	brand,
+	filterIterable,
+	getOrCreate,
+	mapIterable,
+	type JsonCompatibleReadOnlyObject,
+} from "../util/index.js";
 
 import {
-	allowedTypeFilter,
-	convertAllowedTypes,
 	ExpectStored,
 	NodeKind,
-	type SimpleNodeSchemaBase,
+	Unchanged,
+	type SimpleSchemaTransformationOptions,
 	type StoredFromViewSchemaGenerationOptions,
 	type StoredSchemaGenerationOptions,
 } from "./core/index.js";
 import { FieldKind, normalizeFieldSchema, type ImplicitFieldSchema } from "./fieldSchema.js";
 import type {
+	SchemaType,
+	SimpleAllowedTypeAttributes,
 	SimpleAllowedTypes,
+	SimpleArrayNodeSchema,
 	SimpleFieldSchema,
+	SimpleLeafNodeSchema,
+	SimpleMapNodeSchema,
 	SimpleNodeSchema,
+	SimpleObjectNodeSchema,
+	SimpleRecordNodeSchema,
 	SimpleTreeSchema,
 } from "./simpleSchema.js";
-import { walkFieldSchema } from "./walkFieldSchema.js";
+import { createTreeSchema } from "./treeSchema.js";
+
+// TODO: this file, src/simple-tree/api/storedSchema.ts and src/simple-tree/core/toStored.ts should be refactored to group the logic more logically.
+// The content of src/simple-tree/api/storedSchema.ts should probably removed from the API surface, replaced by simple schema snapshotting APIs.
+// The logic from this file for converting stored-simple-schema to the persisted format can be moved to its own file.
+// The simple-schema related logic from this file and src/simple-tree/core/toStored.ts can be unified and `toStoredSchema` and its other ImplicitFieldSchema consuming variants should probably be removed in favor of acting on TreeSchema and SimpleTreeSchema directly.
 
 const viewToStoredCache = new WeakMap<
 	StoredFromViewSchemaGenerationOptions,
 	WeakMap<ImplicitFieldSchema, TreeStoredSchema>
 >();
 
-export const restrictiveStoredSchemaGenerationOptions: StoredSchemaGenerationOptions = {
-	includeStaged: () => false,
-};
+/**
+ * Maximally restrictive transformation of a view to stored schema.
+ * @remarks
+ * This should only be used when the intent is to produce a stored schema is as restrictive as possible while still being compatible with the input view schema.
+ * This is typically used for cases where backwards compatibility with past versions of an application is required, like {@link toUpgradeSchema} or {@link toInitialSchema}.
+ */
+export const restrictiveStoredSchemaGenerationOptions: StoredFromViewSchemaGenerationOptions =
+	{
+		includeStaged: () => false,
+	};
 
-export const permissiveStoredSchemaGenerationOptions: StoredSchemaGenerationOptions = {
+/**
+ * Maximally permissive transformation of a view to stored schema.
+ * @remarks
+ * This should only be used when the intent is to produce a stored schema which allows as much as possible while still being compatible with the input view schema.
+ * This is typically used for cases where forwards compatibility with future versions of an application is required, like {@link toUnhydratedSchema}.
+ *
+ * This is unable to include unknown optional fields in the output, which makes it not truly maximally permissive.
+ *
+ * TODO: {@link StoredFromViewSchemaGenerationOptions} could be updated to allow a way to inject extra optional fields.
+ * If done, then this could take in an existing stored schema, and attempt to generate a valid superset.
+ * This could be useful to use as the schema for unhydrated content cloned from hydrated content.
+ */
+export const permissiveStoredSchemaGenerationOptions: StoredFromViewSchemaGenerationOptions = {
 	includeStaged: () => true,
 };
 
@@ -96,45 +134,98 @@ export const toUnhydratedSchema = permissiveStoredSchemaGenerationOptions;
  */
 export function toStoredSchema(
 	root: ImplicitFieldSchema,
-	options: StoredSchemaGenerationOptions,
+	options: StoredFromViewSchemaGenerationOptions,
 ): TreeStoredSchema {
 	const cache = getOrCreate(viewToStoredCache, options, () => new WeakMap());
 	return getOrCreate(cache, root, () => {
-		const normalized = normalizeFieldSchema(root);
-		const nodeSchema: Map<TreeNodeSchemaIdentifier, TreeNodeStoredSchema> = new Map();
-		walkFieldSchema(normalized, {
-			node(schema) {
-				if (nodeSchema.has(brand(schema.identifier))) {
-					// Use JSON.stringify to quote and escape identifier string.
-					throw new UsageError(
-						`Multiple schema encountered with the identifier ${JSON.stringify(
-							schema.identifier,
-						)}. Remove or rename them to avoid the collision.`,
-					);
-				}
-				nodeSchema.set(
-					brand(schema.identifier),
-					getStoredSchema(
-						schema as SimpleNodeSchemaBase<NodeKind> as SimpleNodeSchema,
-						options,
-					),
-				);
-			},
-			allowedTypeFilter: (allowedType) =>
-				allowedTypeFilter(
-					{ isStaged: allowedType.metadata.stagedSchemaUpgrade ?? false },
-					options,
-				),
-		});
-
-		const result: TreeStoredSchema = {
-			nodeSchema,
-			rootFieldSchema: convertField(normalized, options),
-		};
-		return result;
+		const treeSchema = createTreeSchema(normalizeFieldSchema(root));
+		const simpleSchema = transformSimpleSchema(treeSchema, options);
+		return simpleStoredSchemaToStoredSchema(simpleSchema);
 	});
 }
 
+/**
+ * Converts a {@link SimpleTreeSchema} from `SchemaType.View` to `SchemaType.Stored`.
+ */
+export function transformSimpleSchema(
+	schema: SimpleTreeSchema<SchemaType.View>,
+	options: StoredFromViewSchemaGenerationOptions,
+): SimpleTreeSchema<SchemaType.Stored>;
+
+/**
+ * Copies a `SchemaType.Stored` {@link SimpleTreeSchema}.
+ */
+export function transformSimpleSchema(
+	schema: SimpleTreeSchema<SchemaType.Stored>,
+	options: ExpectStored,
+): SimpleTreeSchema<SchemaType.Stored>;
+
+/**
+ * Copies a {@link SimpleTreeSchema}.
+ */
+export function transformSimpleSchema<T extends SchemaType>(
+	schema: SimpleTreeSchema<T>,
+	options: Unchanged,
+): SimpleTreeSchema<T>;
+
+/**
+ * Converts a {@link SimpleTreeSchema}.
+ */
+export function transformSimpleSchema(
+	schema: SimpleTreeSchema,
+	options: SimpleSchemaTransformationOptions,
+): SimpleTreeSchema;
+
+/**
+ * TODO:#38722 When runtime schema upgrades are implemented, this will need to be updated to check if
+ * a staged allowed type has been upgraded and if so, include it in the conversion.
+ */
+export function transformSimpleSchema(
+	schema: SimpleTreeSchema,
+	options: SimpleSchemaTransformationOptions,
+): SimpleTreeSchema {
+	const simpleNodeSchema = new Map<string, SimpleNodeSchema>();
+	const root = filterFieldAllowedTypes(schema.root, options);
+	const queue = Array.from(root.simpleAllowedTypes.keys());
+	for (const identifier of queue) {
+		getOrCreate(simpleNodeSchema, identifier, (id) => {
+			const nodeSchema = schema.definitions.get(id) ?? fail("missing schema");
+			const transformed = transformSimpleNodeSchema(nodeSchema, options);
+			const kind = transformed.kind;
+			switch (kind) {
+				case NodeKind.Leaf:
+					break;
+				case NodeKind.Array:
+				case NodeKind.Map:
+				case NodeKind.Record:
+					queue.push(...transformed.simpleAllowedTypes.keys());
+					break;
+				case NodeKind.Object:
+					for (const fieldSchema of transformed.fields.values()) {
+						queue.push(...fieldSchema.simpleAllowedTypes.keys());
+					}
+					break;
+				default:
+					unreachableCase(kind);
+			}
+			return transformed;
+		});
+	}
+	// Copy simpleNodeSchema, but in the order from the original schema.definitions
+	// Currently we do not specify anything about the order of definitions, but it is nicer to have a stable order and some tests rely on it.
+	const definitions = new Map<string, SimpleNodeSchema>(
+		mapIterable(
+			filterIterable(schema.definitions.keys(), (id) => simpleNodeSchema.has(id)),
+			(id) => [id, simpleNodeSchema.get(id) ?? fail("missing schema")],
+		),
+	);
+	assert(
+		definitions.size === simpleNodeSchema.size,
+		"Reachable schema missing from input TreeSchema",
+	);
+	return { root, definitions };
+}
+
 /**
  * Convert a {@link SimpleTreeSchema} for a stored schema into a {@link TreeStoredSchema}.
  * @remarks
@@ -144,13 +235,13 @@ export function toStoredSchema(
  * @see {@link ExpectStored}.
  */
 export function simpleStoredSchemaToStoredSchema(
-	treeSchema: SimpleTreeSchema,
+	treeSchema: SimpleTreeSchema<SchemaType.Stored>,
 ): TreeStoredSchema {
 	const result: TreeStoredSchema = {
 		nodeSchema: transformMapValues(treeSchema.definitions, (schema) =>
-			getStoredSchema(schema, ExpectStored),
+			getStoredSchema(schema),
 		) as Map<TreeNodeSchemaIdentifier, TreeNodeStoredSchema>,
-		rootFieldSchema: convertField(treeSchema.root, ExpectStored),
+		rootFieldSchema: convertField(treeSchema.root),
 	};
 	return result;
 }
@@ -159,12 +250,11 @@ export function simpleStoredSchemaToStoredSchema(
  * Convert a {@link SimpleFieldSchema} into a {@link TreeFieldStoredSchema}.
  */
 export function convertField(
-	schema: SimpleFieldSchema,
-	options: StoredSchemaGenerationOptions,
+	schema: SimpleFieldSchema<SchemaType.Stored>,
 ): TreeFieldStoredSchema {
 	const kind: FieldKindIdentifier =
 		convertFieldKind.get(schema.kind)?.identifier ?? fail(0xae3 /* Invalid field kind */);
-	const types = convertAllowedTypes(schema.simpleAllowedTypes, options);
+	const types = convertAllowedTypes(schema.simpleAllowedTypes);
 	return { kind, types, persistedMetadata: schema.persistedMetadata };
 }
 
@@ -186,8 +276,7 @@ export const convertFieldKind: ReadonlyMap<FieldKind, FlexFieldKind> = new Map<
  * TODO: Persist node metadata once schema FormatV2 is supported.
  */
 export function getStoredSchema(
-	schema: SimpleNodeSchema,
-	options: StoredSchemaGenerationOptions,
+	schema: SimpleNodeSchema<SchemaType.Stored>,
 ): TreeNodeStoredSchema {
 	const kind = schema.kind;
 	switch (kind) {
@@ -196,7 +285,7 @@ export function getStoredSchema(
 		}
 		case NodeKind.Map:
 		case NodeKind.Record: {
-			const types = convertAllowedTypes(schema.simpleAllowedTypes, options);
+			const types = convertAllowedTypes(schema.simpleAllowedTypes);
 			return new MapNodeStoredSchema(
 				{
 					kind: FieldKinds.optional.identifier,
@@ -208,16 +297,12 @@ export function getStoredSchema(
 			);
 		}
 		case NodeKind.Array: {
-			return arrayNodeStoredSchema(
-				schema.simpleAllowedTypes,
-				options,
-				schema.persistedMetadata,
-			);
+			return arrayNodeStoredSchema(schema.simpleAllowedTypes, schema.persistedMetadata);
 		}
 		case NodeKind.Object: {
 			const fields: Map<FieldKey, TreeFieldStoredSchema> = new Map();
 			for (const fieldSchema of schema.fields.values()) {
-				fields.set(brand(fieldSchema.storedKey), convertField(fieldSchema, options));
+				fields.set(brand(fieldSchema.storedKey), convertField(fieldSchema));
 			}
 			return new ObjectNodeStoredSchema(fields, schema.persistedMetadata);
 		}
@@ -227,16 +312,189 @@ export function getStoredSchema(
 	}
 }
 
-export function arrayNodeStoredSchema(
-	schema: SimpleAllowedTypes,
-	options: StoredSchemaGenerationOptions,
+/**
+ * Converts a {@link SimpleNodeSchema} from view to stored.
+ */
+export function transformSimpleNodeSchema(
+	schema: SimpleNodeSchema<SchemaType.View>,
+	options: StoredFromViewSchemaGenerationOptions,
+): SimpleNodeSchema<SchemaType.Stored>;
+
+/**
+ * Converts a {@link SimpleNodeSchema}.
+ */
+export function transformSimpleNodeSchema(
+	schema: SimpleNodeSchema,
+	options: SimpleSchemaTransformationOptions,
+): SimpleNodeSchema;
+
+/**
+ * TODO: Persist node metadata once schema FormatV2 is supported.
+ *
+ * This is only exported for use by tests: if other users need them more overloads could be provided, but this is currently sufficient.
+ */
+export function transformSimpleNodeSchema(
+	schema: SimpleNodeSchema,
+	options: SimpleSchemaTransformationOptions,
+): SimpleNodeSchema {
+	const metadata = {
+		persistedMetadata: schema.persistedMetadata,
+		metadata: preservesViewData(options)
+			? {
+					custom: schema.metadata.custom,
+					description: schema.metadata.description,
+				}
+			: {},
+	};
+	const kind = schema.kind;
+	switch (kind) {
+		case NodeKind.Leaf: {
+			return {
+				kind,
+				leafKind: schema.leafKind,
+				...metadata,
+			} satisfies SimpleLeafNodeSchema;
+		}
+		case NodeKind.Array:
+		case NodeKind.Map:
+		case NodeKind.Record: {
+			return {
+				kind,
+				...metadata,
+				simpleAllowedTypes: filterAllowedTypes(schema.simpleAllowedTypes, options),
+			} satisfies SimpleMapNodeSchema | SimpleRecordNodeSchema | SimpleArrayNodeSchema;
+		}
+		case NodeKind.Object: {
+			return {
+				kind,
+				...metadata,
+				fields: transformMapValues(schema.fields, (f) => ({
+					...filterFieldAllowedTypes(f, options),
+					storedKey: f.storedKey,
+				})),
+				allowUnknownOptionalFields: filterViewData(options, schema.allowUnknownOptionalFields),
+			} satisfies SimpleObjectNodeSchema;
+		}
+		default: {
+			unreachableCase(kind);
+		}
+	}
+}
+
+function arrayNodeStoredSchema(
+	schema: SimpleAllowedTypes<SchemaType.Stored>,
 	persistedMetadata: JsonCompatibleReadOnlyObject | undefined,
 ): ObjectNodeStoredSchema {
 	const field = {
 		kind: FieldKinds.sequence.identifier,
-		types: convertAllowedTypes(schema, options),
+		types: convertAllowedTypes(schema),
 		persistedMetadata,
 	};
 	const fields = new Map([[EmptyKey, field]]);
 	return new ObjectNodeStoredSchema(fields, persistedMetadata);
 }
+
+/**
+ * Converts a {@link SimpleAllowedTypes} to a stored schema.
+ * @param schema - The schema to convert.
+ * @param options - The options to use for filtering.
+ * @returns The converted stored schema.
+ */
+export function filterAllowedTypes(
+	schema: SimpleAllowedTypes,
+	options: SimpleSchemaTransformationOptions,
+): SimpleAllowedTypes {
+	const filtered: Map<string, SimpleAllowedTypeAttributes> = new Map();
+	for (const [type, data] of schema) {
+		if (options === Unchanged) {
+			filtered.set(type, { isStaged: data.isStaged });
+		} else if (allowedTypeFilter(data, options)) {
+			filtered.set(type, { isStaged: undefined });
+		}
+	}
+	return filtered;
+}
+
+function filterFieldAllowedTypes(
+	f: SimpleFieldSchema,
+	options: SimpleSchemaTransformationOptions,
+): SimpleFieldSchema {
+	return {
+		kind: f.kind,
+		persistedMetadata: f.persistedMetadata,
+		metadata: preservesViewData(options)
+			? {
+					custom: f.metadata.custom,
+					description: f.metadata.description,
+				}
+			: {},
+		simpleAllowedTypes: filterAllowedTypes(f.simpleAllowedTypes, options),
+	};
+}
+
+/**
+ * Converts a stored {@link SimpleAllowedTypes} to a {@link TreeTypeSet}.
+ */
+function convertAllowedTypes(schema: SimpleAllowedTypes<SchemaType.Stored>): TreeTypeSet {
+	return new Set(schema.keys() as Iterable<TreeNodeSchemaIdentifier>);
+}
+
+/**
+ * Filters an allowed type based on the provided options.
+ * @param allowedType - The allowed type to filter.
+ * @param options - The options to use for filtering.
+ * @returns Whether the allowed type passes the filter.
+ */
+function allowedTypeFilter(
+	data: SimpleAllowedTypeAttributes,
+	options: StoredSchemaGenerationOptions,
+): boolean {
+	if (options === ExpectStored) {
+		if (data.isStaged !== undefined) {
+			throw new UsageError(
+				"Failed to covert view schema to stored schema. The simple schema provided was indicated to be a stored schema by the use of `ExpectStored`, but view schema specific content was encountered which requires a `StoredFromViewSchemaGenerationOptions` to process.",
+			);
+		}
+		return true;
+	}
+
+	if (data.isStaged === undefined) {
+		throw new UsageError(
+			"Failed to covert view schema to stored schema. The simple schema provided as the view schema was actually a stored schema. If this was intended, use `ExpectStored` for the `StoredSchemaGenerationOptions` to indicate the input is already a stored schema and only a format conversion is required.",
+		);
+	}
+
+	// If the allowed type is staged, only include it if the options allow it.
+	if (data.isStaged === false) {
+		return true;
+	}
+
+	return options.includeStaged(data.isStaged);
+}
+
+function isStoredFromView(
+	options: SimpleSchemaTransformationOptions,
+): options is StoredFromViewSchemaGenerationOptions {
+	return typeof options === "object" && "includeStaged" in options;
+}
+
+function filterViewData<T>(
+	options: SimpleSchemaTransformationOptions,
+	data: T,
+): T | undefined {
+	return preservesViewData(options) ? data : undefined;
+}
+
+/**
+ * Determines if the provided options indicate that view specific data should be preserved.
+ * @remarks
+ * This assumes that stored simple schema should not contain view specific data.
+ * Therefore the only case where what this returns should matter is when the input schema is view schema
+ * (and thus there might be view specific data).
+ */
+function preservesViewData(options: SimpleSchemaTransformationOptions): boolean {
+	// As noted above in the doc comment, the only case we care about the return value is when the input is a view schema.
+	// There are two such cases: isStoredFromView where we return false, and Unchanged when applied to a view schema, where we return true.
+	// It does not matter what we return in other cases, so for simplicity they just end up as "true".
+	return isStoredFromView(options) ? false : true;
+}

package/src/simple-tree/treeSchema.ts

@@ -0,0 +1,54 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
+import type { TreeNodeSchema } from "./core/index.js";
+import {
+	type FieldSchemaAlpha,
+	type ImplicitFieldSchema,
+	normalizeFieldSchema,
+} from "./fieldSchema.js";
+import type { SchemaType, SimpleNodeSchema, SimpleTreeSchema } from "./simpleSchema.js";
+import { walkFieldSchema } from "./walkFieldSchema.js";
+
+export function createTreeSchema(rootSchema: ImplicitFieldSchema): TreeSchema {
+	const root = normalizeFieldSchema(rootSchema);
+	const definitions = new Map<string, SimpleNodeSchema<SchemaType.View> & TreeNodeSchema>();
+
+	walkFieldSchema(root, {
+		node: (schema) => {
+			if (definitions.has(schema.identifier)) {
+				throw new UsageError(
+					`Multiple schema encountered with the identifier ${JSON.stringify(schema.identifier)}. Remove or rename them to avoid the collision.`,
+				);
+			}
+			definitions.set(
+				schema.identifier,
+				schema as SimpleNodeSchema<SchemaType.View> & TreeNodeSchema,
+			);
+		},
+	});
+
+	return { root, definitions };
+}
+
+/**
+ * {@link TreeViewConfigurationAlpha}
+ * @sealed @alpha
+ */
+export interface TreeSchema extends SimpleTreeSchema<SchemaType.View> {
+	/**
+	 * {@inheritDoc SimpleTreeSchema.root}
+	 */
+	readonly root: FieldSchemaAlpha;
+
+	/**
+	 * {@inheritDoc SimpleTreeSchema.definitions}
+	 */
+	readonly definitions: ReadonlyMap<
+		string,
+		SimpleNodeSchema<SchemaType.View> & TreeNodeSchema
+	>;
+}

package/src/simple-tree/unhydratedFlexTreeFromInsertable.ts

@@ -9,7 +9,10 @@ import { assert, fail } from "@fluidframework/core-utils/internal";
 
 import { filterIterable, hasSingle, oneFromIterable } from "../util/index.js";
 
-import { normalizeFieldSchema, FieldKind, type ImplicitFieldSchema } from "./fieldSchema.js";
+import type { FlexTreeNode } from "../feature-libraries/index.js";
+
+import type { ImplicitFieldSchema } from "./fieldSchema.js";
+import { normalizeFieldSchema, FieldKind } from "./fieldSchema.js";
 import {
 	CompatibilityLevel,
 	getKernel,
@@ -24,7 +27,7 @@ import {
 import { getUnhydratedContext } from "./createContext.js";
 
 /**
- * Transforms an input {@link TypedNode} tree to an {@link UnhydratedFlexTreeNode}.
+ * Transforms an input {@link TypedNode} tree to a {@link FlexTreeNode}.
  * @param data - The input tree to be converted.
  * If the data is an unsupported value (e.g. NaN), a fallback value will be used when supported,
  * otherwise an error will be thrown.
@@ -49,10 +52,10 @@ import { getUnhydratedContext } from "./createContext.js";
  * Output should comply with the provided view schema, but this is not explicitly validated:
  * validation against stored schema (to guard against document corruption) is done elsewhere.
  */
-export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(
+export function flexTreeFromInsertable<TIn extends InsertableContent | undefined>(
 	data: TIn,
 	allowedTypes: ImplicitFieldSchema,
-): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {
+): TIn extends undefined ? undefined : FlexTreeNode {
 	const normalizedFieldSchema = normalizeFieldSchema(allowedTypes);
 
 	if (data === undefined) {
@@ -60,34 +63,59 @@ export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent |
 		if (normalizedFieldSchema.kind !== FieldKind.Optional) {
 			throw new UsageError("Got undefined for non-optional field.");
 		}
-		return undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+		return undefined as TIn extends undefined ? undefined : FlexTreeNode;
 	}
 
-	const flexTree: UnhydratedFlexTreeNode = unhydratedFlexTreeFromInsertableNode(
+	const flexTree: FlexTreeNode = flexTreeFromInsertableNode(
 		data,
 		normalizedFieldSchema.allowedTypeSet,
 	);
 
-	return flexTree as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+	return flexTree as TIn extends undefined ? undefined : FlexTreeNode;
 }
 
 /**
- * Copy content from `data` into a UnhydratedFlexTreeNode.
+ * Wrapper around {@link flexTreeFromInsertable} which always returns an unhydrated nodes (or undefined).
+ * @remarks
+ * This does not deeply check content is unhydrated.
+ *
+ * Once hybrid content is better supported, this should likely be removed as a simplification.
  */
-export function unhydratedFlexTreeFromInsertableNode(
+export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(
+	data: TIn,
+	allowedTypes: ImplicitFieldSchema,
+): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {
+	const result = flexTreeFromInsertable(data, allowedTypes);
+	if (result === undefined) {
+		return undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+	}
+	assert(result instanceof UnhydratedFlexTreeNode, "expected unhydrated node");
+	return result as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+}
+
+/**
+ * Copy content from `data` into a UnhydratedFlexTreeNode or return an existing node if `data` is a TreeNode.
+ */
+export function flexTreeFromInsertableNode(
 	data: InsertableContent,
 	allowedTypes: ReadonlySet<TreeNodeSchema>,
-): UnhydratedFlexTreeNode {
+): FlexTreeNode {
 	if (isTreeNode(data)) {
 		const kernel = getKernel(data);
-		const inner = kernel.getInnerNodeIfUnhydrated();
-		if (inner === undefined) {
-			// The node is already hydrated, meaning that it already got inserted into the tree previously
-			throw new UsageError("A node may not be inserted into the tree more than once");
+		const inner = kernel.getInnerNode();
+		if (inner.parentField.parent.parent !== undefined) {
+			throw new UsageError(
+				"A node which already has a parent may not be used as part of a new tree.",
+			);
 		} else {
 			if (!allowedTypes.has(kernel.schema)) {
 				throw new UsageError("Invalid schema for this context.");
 			}
+
+			if (inner.isHydrated()) {
+				// TODO: hook up event bubbling from hydrated to unhydrated tree.
+			}
+
 			return inner;
 		}
 	}