@fluidframework/tree 2.31.1 → 2.33.0-333010

package/src/simple-tree/index.ts

@@ -31,6 +31,7 @@ export {
 	type ViewableTree,
 	type TreeViewEvents,
 	TreeViewConfiguration,
+	TreeViewConfigurationAlpha,
 	type ITreeViewConfiguration,
 	type SchemaCompatibilityStatus,
 	type ITreeConfigurationOptions,
@@ -70,11 +71,11 @@ export {
 	type JsonTreeSchema,
 	type JsonFieldSchema,
 	type JsonLeafSchemaType,
+	type TreeSchemaEncodingOptions,
 	getJsonSchema,
 	getSimpleSchema,
 	type VerboseTreeNode,
-	type EncodeOptions,
-	type ParseOptions,
+	type TreeEncodingOptions,
 	type VerboseTree,
 	extractPersistedSchema,
 	comparePersistedSchema,
@@ -138,6 +139,7 @@ export {
 	replaceVerboseTreeHandles,
 	type HandleConverter,
 	type FieldSchemaAlphaUnsafe,
+	type TreeSchema,
 } from "./api/index.js";
 export type {
 	SimpleTreeSchema,

package/src/simple-tree/objectNode.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Lazy, fail } from "@fluidframework/core-utils/internal";
+import { assert, Lazy, fail, debugAssert } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import type { FieldKey, SchemaPolicy } from "../core/index.js";
@@ -174,6 +174,8 @@ function createFlexKeyMapping(fields: Record<string, ImplicitFieldSchema>): Simp
 }
 
 /**
+ * Creates a proxy handler for the given schema.
+ *
  * @param allowAdditionalProperties - If true, setting of unexpected properties will be forwarded to the target object.
  * Otherwise setting of unexpected properties will error.
  * TODO: consider implementing this using `Object.preventExtension` instead.
@@ -196,9 +198,9 @@ function createProxyHandler(
 	const handler: ProxyHandler<TreeNode> = {
 		get(target, propertyKey, proxy): unknown {
 			const fieldInfo = schema.flexKeyMap.get(propertyKey);
-
 			if (fieldInfo !== undefined) {
 				const flexNode = getOrCreateInnerNode(proxy);
+				debugAssert(() => !flexNode.context.isDisposed() || "FlexTreeNode is disposed");
 				const field = flexNode.tryGetField(fieldInfo.storedKey);
 				if (field !== undefined) {
 					return getTreeNodeForField(field);

package/src/simple-tree/simpleSchema.ts

@@ -180,22 +180,14 @@ export interface SimpleFieldSchema {
  * @alpha
  * @sealed
  */
-export interface SimpleTreeSchema extends SimpleFieldSchema {
+export interface SimpleTreeSchema {
 	/**
-	 * The kind of tree field representing the root of the tree.
+	 * The tree field representing the root of the tree.
 	 */
-	readonly kind: FieldKind;
-
-	/**
-	 * The types allowed under the tree root.
-	 *
-	 * @remarks Refers to the types by identifier.
-	 * Can be resolved via {@link SimpleTreeSchema.definitions}.
-	 */
-	readonly allowedTypesIdentifiers: ReadonlySet<string>;
+	readonly root: SimpleFieldSchema;
 
 	/**
-	 * The complete set of node schema definitions recursively referenced by the tree's {@link SimpleTreeSchema.allowedTypesIdentifiers}.
+	 * The complete set of node schema definitions recursively referenced by the tree's {@link SimpleTreeSchema.root}.
 	 *
 	 * @remarks the keys are the schemas' {@link TreeNodeSchemaCore.identifier | identifiers}.
 	 */