@fluidframework/tree 2.41.0-338401 → 2.41.0

package/src/shared-tree-core/messageCodecs.ts

@@ -52,7 +52,7 @@ export function makeMessageCodec<TChangeset>(
 }
 
 /**
- * @privateRemarks - Exported for testing.
+ * @privateRemarks Exported for testing.
  */
 export function makeMessageCodecs<TChangeset>(
 	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,

package/src/shared-tree-core/sequenceIdUtils.ts

@@ -4,6 +4,7 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
+
 import { brand } from "../util/index.js";
 
 import type { SequenceId } from "./editManagerFormat.js";

package/src/shared-tree-core/sharedTreeCore.ts

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import type { IFluidLoadable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
 import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
@@ -17,6 +18,7 @@ import type {
 	IChannelView,
 	IFluidSerializer,
 } from "@fluidframework/shared-object-base/internal";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
 
 import type { ICodecOptions, IJsonCodec } from "../codec/index.js";
 import {
@@ -41,18 +43,16 @@ import {
 } from "../util/index.js";
 
 import type { SharedTreeBranch } from "./branch.js";
+import { BranchCommitEnricher } from "./branchCommitEnricher.js";
+import { type ChangeEnricherReadonlyCheckout, NoOpChangeEnricher } from "./changeEnricher.js";
+import { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 import { EditManager, minimumPossibleSequenceNumber } from "./editManager.js";
 import { makeEditManagerCodec } from "./editManagerCodecs.js";
 import type { SeqNumber } from "./editManagerFormat.js";
 import { EditManagerSummarizer } from "./editManagerSummarizer.js";
 import { type MessageEncodingContext, makeMessageCodec } from "./messageCodecs.js";
 import type { DecodedMessage } from "./messageTypes.js";
-import { type ChangeEnricherReadonlyCheckout, NoOpChangeEnricher } from "./changeEnricher.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
-import { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
-import { BranchCommitEnricher } from "./branchCommitEnricher.js";
-import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
-import type { IFluidLoadable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 
 // TODO: Organize this to be adjacent to persisted types.
 const summarizablesTreeKey = "indexes";

package/src/shared-tree-core/transaction.ts

@@ -3,19 +3,21 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
 import type { IDisposable, Listenable } from "@fluidframework/core-interfaces";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
 import {
 	findAncestor,
 	type ChangeFamilyEditor,
 	type GraphCommit,
 	type TaggedChange,
 } from "../core/index.js";
-import type { SharedTreeBranch, SharedTreeBranchEvents } from "./branch.js";
 import { getOrCreate } from "../util/index.js";
 
+import type { SharedTreeBranch, SharedTreeBranchEvents } from "./branch.js";
+
 /**
  * Describes the result of a transaction.
  * Transactions may either succeed and commit, or fail and abort.

package/src/shared-tree-core/transactionEnricher.ts

@@ -4,7 +4,9 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
+
 import type { ChangeRebaser, GraphCommit, RevisionTag } from "../core/index.js";
+
 import type { ChangeEnricherReadonlyCheckout } from "./changeEnricher.js";
 
 /**

package/src/simple-tree/api/conciseTree.ts

@@ -6,15 +6,16 @@
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
 
 import type { ITreeCursor } from "../../core/index.js";
-import type { TreeLeafValue, ImplicitAllowedTypes } from "../schemaTypes.js";
 import type { TreeNodeSchema } from "../core/index.js";
+import { getUnhydratedContext } from "../createContext.js";
+import type { TreeLeafValue, ImplicitAllowedTypes } from "../schemaTypes.js";
+
 import {
 	customFromCursor,
 	replaceHandles,
 	type TreeEncodingOptions,
 	type HandleConverter,
 } from "./customTree.js";
-import { getUnhydratedContext } from "../createContext.js";
 
 /**
  * Concise encoding of a {@link TreeNode} or {@link TreeLeafValue}.

package/src/simple-tree/api/configuration.ts

@@ -16,7 +16,7 @@ import {
 import { NodeKind, type TreeNodeSchema } from "../core/index.js";
 import { toStoredSchema } from "../toStoredSchema.js";
 import { LeafNodeSchema } from "../leafNodeSchema.js";
-import { isObjectNodeSchema, type ObjectNodeSchema } from "../objectNodeTypes.js";
+import { isObjectNodeSchema, type ObjectNodeSchema } from "../node-kinds/index.js";
 import { getOrCreate } from "../../util/index.js";
 import type { MakeNominal } from "../../util/index.js";
 import { walkFieldSchema } from "../walkFieldSchema.js";

package/src/simple-tree/api/create.ts

@@ -10,97 +10,20 @@ import type {
 	ITreeCursorSynchronous,
 	SchemaAndPolicy,
 } from "../../core/index.js";
-import type {
-	ImplicitFieldSchema,
-	TreeFieldFromImplicitField,
-	FieldSchema,
-	FieldKind,
-	UnsafeUnknownSchema,
-	InsertableField,
-	TreeLeafValue,
-} from "../schemaTypes.js";
+import type { ImplicitFieldSchema, TreeFieldFromImplicitField } from "../schemaTypes.js";
 import {
 	getOrCreateNodeFromInnerNode,
 	UnhydratedFlexTreeNode,
-	type TreeNode,
 	type Unhydrated,
 } from "../core/index.js";
 import {
-	cursorForMapTreeNode,
 	defaultSchemaPolicy,
 	inSchemaOrThrow,
 	mapTreeFromCursor,
-	type NodeIdentifierManager,
+	isFieldInSchema,
 } from "../../feature-libraries/index.js";
-import { isFieldInSchema } from "../../feature-libraries/index.js";
-import { mapTreeFromNodeData } from "../toMapTree.js";
 import { getUnhydratedContext } from "../createContext.js";
-import { createUnknownOptionalFieldPolicy } from "../objectNode.js";
-
-/**
- * Construct tree content that is compatible with the field defined by the provided `schema`.
- * @param schema - The schema for what to construct. As this is an {@link ImplicitFieldSchema}, a {@link FieldSchema}, {@link TreeNodeSchema} or {@link AllowedTypes} array can be provided.
- * @param data - The data used to construct the field content.
- * @remarks
- * When providing a {@link TreeNodeSchemaClass}, this is the same as invoking its constructor except that an unhydrated node can also be provided.
- * This function exists as a generalization that can be used in other cases as well,
- * such as when `undefined` might be allowed (for an optional field), or when the type should be inferred from the data when more than one type is possible.
- *
- * Like with {@link TreeNodeSchemaClass}'s constructor, its an error to provide an existing node to this API.
- * For that case, use {@link TreeBeta.clone}.
- */
-export function createFromInsertable<
-	const TSchema extends ImplicitFieldSchema | UnsafeUnknownSchema,
->(
-	schema: UnsafeUnknownSchema extends TSchema
-		? ImplicitFieldSchema
-		: TSchema & ImplicitFieldSchema,
-	data: InsertableField<TSchema>,
-	context?: NodeIdentifierManager | undefined,
-): Unhydrated<
-	TSchema extends ImplicitFieldSchema
-		? TreeFieldFromImplicitField<TSchema>
-		: TreeNode | TreeLeafValue | undefined
-> {
-	const cursor = cursorFromInsertable(schema, data, context);
-	const result = cursor === undefined ? undefined : createFromCursor(schema, cursor);
-	return result as Unhydrated<
-		TSchema extends ImplicitFieldSchema
-			? TreeFieldFromImplicitField<TSchema>
-			: TreeNode | TreeLeafValue | undefined
-	>;
-}
-
-/**
- * Construct tree content that is compatible with the field defined by the provided `schema`.
- * @param schema - The schema for what to construct. As this is an {@link ImplicitFieldSchema}, a {@link FieldSchema}, {@link TreeNodeSchema} or {@link AllowedTypes} array can be provided.
- * @param data - The data used to construct the field content.
- * @remarks
- * When providing a {@link TreeNodeSchemaClass},
- * this is the same as invoking its constructor except that an unhydrated node can also be provided and the returned value is a cursor.
- * When `undefined` is provided (for an optional field), `undefined` is returned.
- */
-export function cursorFromInsertable<
-	TSchema extends ImplicitFieldSchema | UnsafeUnknownSchema,
->(
-	schema: UnsafeUnknownSchema extends TSchema
-		? ImplicitFieldSchema
-		: TSchema & ImplicitFieldSchema,
-	data: InsertableField<TSchema>,
-	context?: NodeIdentifierManager | undefined,
-):
-	| ITreeCursorSynchronous
-	| (TSchema extends FieldSchema<FieldKind.Optional> ? undefined : never) {
-	const mapTree = mapTreeFromNodeData(
-		data as InsertableField<UnsafeUnknownSchema>,
-		schema,
-		context,
-	);
-	if (mapTree === undefined) {
-		return undefined as TSchema extends FieldSchema<FieldKind.Optional> ? undefined : never;
-	}
-	return cursorForMapTreeNode(mapTree);
-}
+import { createUnknownOptionalFieldPolicy } from "../node-kinds/index.js";
 
 /**
  * Creates an unhydrated simple-tree field from a cursor in nodes mode.

package/src/simple-tree/api/customTree.ts

@@ -4,8 +4,8 @@
  */
 
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
-import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
 import { assert, fail } from "@fluidframework/core-utils/internal";
+import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
 
 import {
 	EmptyKey,
@@ -19,8 +19,8 @@ import {
 	type TreeNodeSchemaIdentifier,
 	type TreeNodeStoredSchema,
 } from "../../core/index.js";
+import { FieldKinds, valueSchemaAllows } from "../../feature-libraries/index.js";
 import { cloneWithReplacements } from "../../util/index.js";
-import type { TreeLeafValue } from "../schemaTypes.js";
 import { NodeKind, type TreeNodeSchema } from "../core/index.js";
 import {
 	booleanSchema,
@@ -29,8 +29,8 @@ import {
 	numberSchema,
 	stringSchema,
 } from "../leafNodeSchema.js";
-import { isObjectNodeSchema } from "../objectNodeTypes.js";
-import { FieldKinds, valueSchemaAllows } from "../../feature-libraries/index.js";
+import { isObjectNodeSchema } from "../node-kinds/index.js";
+import type { TreeLeafValue } from "../schemaTypes.js";
 
 /**
  * Options for how to interpret or encode a tree when schema information is available.

package/src/simple-tree/api/getSimpleSchema.ts

@@ -5,6 +5,7 @@
 
 import type { ImplicitFieldSchema } from "../schemaTypes.js";
 import type { SimpleTreeSchema } from "../simpleSchema.js";
+
 import { toSimpleTreeSchema } from "./viewSchemaToSimpleSchema.js";
 
 /**

package/src/simple-tree/api/identifierIndex.ts

@@ -7,7 +7,7 @@ import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import type { TreeIndexKey } from "../../feature-libraries/index.js";
 import { FieldKind, type ImplicitFieldSchema } from "../schemaTypes.js";
 import type { TreeNode } from "../core/index.js";
-import { ObjectNodeSchema } from "../objectNodeTypes.js";
+import { ObjectNodeSchema } from "../node-kinds/index.js";
 import type { TreeView } from "./tree.js";
 import { walkFieldSchema } from "../walkFieldSchema.js";
 import { createSimpleTreeIndex, type SimpleTreeIndex } from "./simpleTreeIndex.js";

package/src/simple-tree/api/index.ts

@@ -50,10 +50,9 @@ export {
 	tryGetSchema,
 	getStoredKey,
 	getPropertyKeyFromStoredKey,
+	getIdentifierFromNode,
 } from "./treeNodeApi.js";
 export {
-	createFromInsertable,
-	cursorFromInsertable,
 	createFromCursor,
 	createFromMapTree,
 } from "./create.js";
@@ -137,11 +136,3 @@ export {
 export { generateSchemaFromSimpleSchema } from "./schemaFromSimple.js";
 export { toSimpleTreeSchema } from "./viewSchemaToSimpleSchema.js";
 export type { TreeChangeEvents } from "./treeChangeEvents.js";
-
-// Exporting the schema (RecursiveObject) to test that recursive types are working correctly.
-// These are `@internal` so they can't be included in the `InternalClassTreeTypes` due to https://github.com/microsoft/rushstack/issues/3639
-export {
-	RecursiveObject as test_RecursiveObject,
-	base as test_RecursiveObject_base,
-	RecursiveObjectPojoMode as test_RecursiveObjectPojoMode,
-} from "./testRecursiveDomain.js";

package/src/simple-tree/api/schemaCompatibilityTester.ts

@@ -4,6 +4,7 @@
  */
 
 import { unreachableCase, fail } from "@fluidframework/core-utils/internal";
+
 import {
 	AdaptedViewSchema,
 	type TreeNodeStoredSchema,
@@ -24,6 +25,7 @@ import {
 } from "../../feature-libraries/index.js";
 import type { FieldSchema } from "../schemaTypes.js";
 import { toStoredSchema } from "../toStoredSchema.js";
+
 import type { SchemaCompatibilityStatus } from "./tree.js";
 
 /**

package/src/simple-tree/api/schemaFactory.ts

@@ -3,21 +3,29 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
 
 import type { TreeValue } from "../../core/index.js";
 import type { NodeIdentifierManager } from "../../feature-libraries/index.js";
+// This import is required for intellisense in @link doc comments on mouseover in VSCode.
+// eslint-disable-next-line unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars
+import type { TreeAlpha } from "../../shared-tree/index.js";
 import {
 	type RestrictiveStringRecord,
 	getOrCreate,
 	isReadonlyArray,
 } from "../../util/index.js";
-// This import is required for intellisense in @link doc comments on mouseover in VSCode.
-// eslint-disable-next-line unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars
-import type { TreeAlpha } from "../../shared-tree/index.js";
-
+import type {
+	NodeKind,
+	WithType,
+	TreeNodeSchema,
+	TreeNodeSchemaClass,
+	TreeNodeSchemaNonClass,
+	TreeNodeSchemaBoth,
+} from "../core/index.js";
+import { isLazy } from "../flexList.js";
 import {
 	booleanSchema,
 	handleSchema,
@@ -26,6 +34,16 @@ import {
 	stringSchema,
 	type LeafSchema,
 } from "../leafNodeSchema.js";
+import {
+	arraySchema,
+	type MapNodeInsertableData,
+	mapSchema,
+	objectSchema,
+	type TreeArrayNode,
+	type InsertableObjectFromSchemaRecord,
+	type TreeMapNode,
+	type TreeObjectNode,
+} from "../node-kinds/index.js";
 import {
 	FieldKind,
 	type FieldSchema,
@@ -43,24 +61,9 @@ import {
 	type UnannotateImplicitAllowedTypes,
 	type UnannotateSchemaRecord,
 } from "../schemaTypes.js";
-import type {
-	NodeKind,
-	WithType,
-	TreeNodeSchema,
-	TreeNodeSchemaClass,
-	TreeNodeSchemaNonClass,
-	TreeNodeSchemaBoth,
-} from "../core/index.js";
-import { type TreeArrayNode, arraySchema } from "../arrayNode.js";
-import {
-	type InsertableObjectFromSchemaRecord,
-	type TreeObjectNode,
-	objectSchema,
-} from "../objectNode.js";
-import { type MapNodeInsertableData, type TreeMapNode, mapSchema } from "../mapNode.js";
-import type { System_Unsafe, FieldSchemaAlphaUnsafe } from "./typesUnsafe.js";
+
 import { createFieldSchemaUnsafe } from "./schemaFactoryRecursive.js";
-import { isLazy } from "../flexList.js";
+import type { System_Unsafe, FieldSchemaAlphaUnsafe } from "./typesUnsafe.js";
 
 /**
  * Gets the leaf domain schema compatible with a given {@link TreeValue}.
@@ -1072,10 +1075,12 @@ export class SchemaFactory<
 	 * - It is a UUID which will not collide with other generated UUIDs.
 	 *
 	 * - It is compressed to a space-efficient representation when stored in the document.
+	 * Reading the identifier before inserting the node into a tree prevents the identifier from being stored in its compressed form,
+	 * resulting in a larger storage footprint.
 	 *
 	 * - A compressed form of the identifier can be accessed at runtime via the {@link TreeNodeApi.shortId|Tree.shortId()} API.
 	 *
-	 * - It will error if read (and will not be present in the object's iterable properties) before the node has been inserted into a tree.
+	 * - It will not be present in the object's iterable properties until explicitly read or until having been inserted into a tree.
 	 *
 	 * However, a user may alternatively supply their own string as the identifier if desired (for example, if importing identifiers from another system).
 	 * In that case, if the user requires it to be unique, it is up to them to ensure uniqueness.

package/src/simple-tree/api/schemaFactoryAlpha.ts

@@ -3,6 +3,14 @@
  * Licensed under the MIT License.
  */
 
+import {
+	type ArrayNodeCustomizableSchema,
+	arraySchema,
+	type MapNodeCustomizableSchema,
+	mapSchema,
+	type ObjectNodeSchema,
+	objectSchema,
+} from "../node-kinds/index.js";
 import {
 	defaultSchemaFactoryObjectOptions,
 	SchemaFactory,
@@ -17,7 +25,6 @@ import type {
 	ImplicitFieldSchema,
 	NodeSchemaOptions,
 } from "../schemaTypes.js";
-import { objectSchema } from "../objectNode.js";
 import type { RestrictiveStringRecord } from "../../util/index.js";
 import type { NodeKind, TreeNodeSchemaClass } from "../core/index.js";
 import type {
@@ -25,12 +32,7 @@ import type {
 	MapNodeCustomizableSchemaUnsafe,
 	System_Unsafe,
 } from "./typesUnsafe.js";
-import { mapSchema } from "../mapNode.js";
-import { arraySchema } from "../arrayNode.js";
-import type { ObjectNodeSchema } from "../objectNodeTypes.js";
 import type { SimpleObjectNodeSchema } from "../simpleSchema.js";
-import type { ArrayNodeCustomizableSchema } from "../arrayNodeTypes.js";
-import type { MapNodeCustomizableSchema } from "../mapNodeTypes.js";
 
 /**
  * {@link SchemaFactory} with additional alpha APIs.

package/src/simple-tree/api/schemaFactoryRecursive.ts

@@ -4,8 +4,8 @@
  */
 
 import type { RestrictiveStringRecord } from "../../util/index.js";
-import type { InsertableObjectFromSchemaRecord } from "../objectNode.js";
-
+import type { NodeKind, TreeNodeSchema, WithType, TreeNode } from "../core/index.js";
+import type { InsertableObjectFromSchemaRecord } from "../node-kinds/index.js";
 import {
 	type FieldKind,
 	type FieldProps,
@@ -14,7 +14,7 @@ import {
 	type ImplicitFieldSchema,
 	type InsertableTreeNodeFromImplicitAllowedTypes,
 } from "../schemaTypes.js";
-import type { NodeKind, TreeNodeSchema, WithType, TreeNode } from "../core/index.js";
+
 import type { FieldSchemaAlphaUnsafe, System_Unsafe } from "./typesUnsafe.js";
 
 export function createFieldSchemaUnsafe<

package/src/simple-tree/api/schemaFromSimple.ts

@@ -4,6 +4,7 @@
  */
 
 import { unreachableCase, fail } from "@fluidframework/core-utils/internal";
+
 import { NodeKind, type TreeNodeSchema } from "../core/index.js";
 import {
 	type FieldSchema,
@@ -17,8 +18,9 @@ import type {
 	SimpleNodeSchema,
 	SimpleTreeSchema,
 } from "../simpleSchema.js";
-import { SchemaFactoryAlpha } from "./schemaFactoryAlpha.js";
+
 import type { TreeSchema } from "./configuration.js";
+import { SchemaFactoryAlpha } from "./schemaFactoryAlpha.js";
 
 const factory = new SchemaFactoryAlpha(undefined);
 

package/src/simple-tree/api/simpleSchemaToJsonSchema.ts

@@ -28,9 +28,7 @@ import type {
 import { NodeKind, type TreeNodeSchema } from "../core/index.js";
 import type { TreeSchema } from "./configuration.js";
 import type { TreeSchemaEncodingOptions } from "./getJsonSchema.js";
-import { ObjectNodeSchema } from "../objectNodeTypes.js";
-import { ArrayNodeSchema } from "../arrayNodeTypes.js";
-import { MapNodeSchema } from "../mapNodeTypes.js";
+import { ArrayNodeSchema, MapNodeSchema, ObjectNodeSchema } from "../node-kinds/index.js";
 import { LeafNodeSchema } from "../leafNodeSchema.js";
 
 /**

package/src/simple-tree/api/storedSchema.ts

@@ -4,11 +4,11 @@
  */
 
 import type { FluidClientVersion, ICodecOptions } from "../../codec/index.js";
+import { SchemaVersion } from "../../core/index.js";
 import {
 	defaultSchemaPolicy,
 	encodeTreeSchema,
 	makeSchemaCodec,
-	SchemaCodecVersion,
 } from "../../feature-libraries/index.js";
 import {
 	clientVersionToSchemaVersion,
@@ -17,10 +17,11 @@ import {
 } from "../../feature-libraries/schema-index/index.js";
 import type { JsonCompatible } from "../../util/index.js";
 import { normalizeFieldSchema, type ImplicitFieldSchema } from "../schemaTypes.js";
+import type { SimpleTreeSchema } from "../simpleSchema.js";
 import { simpleToStoredSchema } from "../toStoredSchema.js";
-import type { SchemaCompatibilityStatus } from "./tree.js";
+
 import { SchemaCompatibilityTester } from "./schemaCompatibilityTester.js";
-import type { SimpleTreeSchema } from "../simpleSchema.js";
+import type { SchemaCompatibilityStatus } from "./tree.js";
 
 /**
  * Dumps the "persisted" schema subset of the provided `schema` into a deterministic JSON-compatible, semi-human-readable format.
@@ -98,7 +99,7 @@ export function comparePersistedSchema(
 ): Omit<SchemaCompatibilityStatus, "canInitialize"> {
 	// Any version can be passed down to makeSchemaCodec here.
 	// We only use the decode part, which always dispatches to the correct codec based on the version in the data, not the version passed to `makeSchemaCodec`.
-	const schemaCodec = makeSchemaCodec(options, SchemaCodecVersion.v1);
+	const schemaCodec = makeSchemaCodec(options, SchemaVersion.v1);
 	const stored = schemaCodec.decode(persisted as Format);
 	const viewSchema = new SchemaCompatibilityTester(
 		defaultSchemaPolicy,

package/src/simple-tree/api/tree.ts

@@ -10,13 +10,11 @@ import type {
 	RevertibleAlphaFactory,
 	RevertibleFactory,
 } from "../../core/index.js";
-
 import type {
 	// This is referenced by doc comments.
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports
 	TreeAlpha,
 } from "../../shared-tree/index.js";
-
 import type {
 	ImplicitFieldSchema,
 	InsertableField,
@@ -26,8 +24,9 @@ import type {
 	TreeFieldFromImplicitField,
 	UnsafeUnknownSchema,
 } from "../schemaTypes.js";
-import type { VerboseTree } from "./verboseTree.js";
 import type { SimpleTreeSchema } from "../simpleSchema.js";
+
+import type { TreeViewConfiguration } from "./configuration.js";
 import type {
 	RunTransactionParams,
 	TransactionCallbackStatus,
@@ -35,7 +34,7 @@ import type {
 	TransactionResultExt,
 	VoidTransactionCallbackStatus,
 } from "./transactionTypes.js";
-import type { TreeViewConfiguration } from "./configuration.js";
+import type { VerboseTree } from "./verboseTree.js";
 
 /**
  * A tree from which a {@link TreeView} can be created.

package/src/simple-tree/api/treeBeta.ts

@@ -11,10 +11,11 @@ import {
 	type Unhydrated,
 	type WithType,
 } from "../core/index.js";
-import { treeNodeApi } from "./treeNodeApi.js";
-import { createFromCursor } from "./create.js";
 import type { ImplicitFieldSchema, TreeFieldFromImplicitField } from "../schemaTypes.js";
+
+import { createFromCursor } from "./create.js";
 import type { TreeChangeEvents } from "./treeChangeEvents.js";
+import { treeNodeApi } from "./treeNodeApi.js";
 
 // Tests for this file are grouped with those for treeNodeApi.ts as that is where this functionality will eventually land,
 // and where most of the actual implementation is for much of it.