@fluidframework/tree 2.80.0 → 2.81.0

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

@@ -3,9 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import { assert, fail } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
+import type { Listenable } from "@fluidframework/core-interfaces";
+import { assert, fail } from "@fluidframework/core-utils/internal";
 import type { SessionId } from "@fluidframework/id-compressor";
+import {
+	TelemetryEventBatcher,
+	type ITelemetryLoggerExt,
+} from "@fluidframework/telemetry-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 
 import {
@@ -41,11 +46,6 @@ import {
 	minSequenceId,
 	sequenceIdComparator,
 } from "./sequenceIdUtils.js";
-import {
-	TelemetryEventBatcher,
-	type ITelemetryLoggerExt,
-} from "@fluidframework/telemetry-utils/internal";
-import type { Listenable } from "@fluidframework/core-interfaces";
 
 export const minimumPossibleSequenceNumber: SeqNumber = brand(Number.MIN_SAFE_INTEGER);
 const minimumPossibleSequenceId: SequenceId = {
@@ -1090,27 +1090,27 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 		const parentTrunkBase =
 			trunkRevisionCache.get(data.base ?? rootRevision) ??
 			fail(0xc61 /* Expected base revision to be in trunk cache */);
-		this.trunk.setHead(
-			data.trunk.reduce((base, c) => {
-				const sequenceId: SequenceId =
-					c.indexInBatch === undefined
-						? {
-								sequenceNumber: c.sequenceNumber,
-							}
-						: {
-								sequenceNumber: c.sequenceNumber,
-								indexInBatch: c.indexInBatch,
-							};
-				const commit = mintCommit(base, c);
-				this.sequenceIdToCommit.set(sequenceId, commit);
-				this.commitMetadata.set(c.revision, {
-					sequenceId,
-					sessionId: c.sessionId,
-				});
-				trunkRevisionCache.set(c.revision, commit);
-				return commit;
-			}, parentTrunkBase),
-		);
+		let trunkHead = parentTrunkBase;
+		for (const c of data.trunk) {
+			const sequenceId: SequenceId =
+				c.indexInBatch === undefined
+					? {
+							sequenceNumber: c.sequenceNumber,
+						}
+					: {
+							sequenceNumber: c.sequenceNumber,
+							indexInBatch: c.indexInBatch,
+						};
+			const commit = mintCommit(trunkHead, c);
+			this.sequenceIdToCommit.set(sequenceId, commit);
+			this.commitMetadata.set(c.revision, {
+				sequenceId,
+				sessionId: c.sessionId,
+			});
+			trunkRevisionCache.set(c.revision, commit);
+			trunkHead = commit;
+		}
+		this.trunk.setHead(trunkHead);
 
 		this.localBranch.setHead(this.trunk.getHead());
 
@@ -1119,13 +1119,13 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 				trunkRevisionCache.get(branch.base) ??
 				fail(0xad7 /* Expected summary branch to be based off of a revision in the trunk */);
 
+			let branchHead = commit;
+			for (const c of branch.commits) {
+				branchHead = mintCommit(branchHead, c);
+			}
 			this.peerLocalBranches.set(
 				sessionId,
-				new SharedTreeBranch(
-					branch.commits.reduce(mintCommit, commit),
-					this.changeFamily,
-					this.mintRevisionTag,
-				),
+				new SharedTreeBranch(branchHead, this.changeFamily, this.mintRevisionTag),
 			);
 		}
 	}

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

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
+import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	getConfigForMinVersionForCollab,
 	lowestMinVersionForCollab,
@@ -34,7 +35,6 @@ import { brand, unbrand, type JsonCompatibleReadOnly } from "../util/index.js";
 import type { SummaryData } from "./editManager.js";
 import { makeV1CodecWithVersion } from "./editManagerCodecsV1toV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./editManagerCodecsVSharedBranches.js";
-import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	EditManagerFormatVersion,
 	editManagerFormatVersions,

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

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 import type { IJsonCodec, IMultiFormatCodec } from "../codec/index.js";
 import type {
@@ -14,14 +14,16 @@ import type {
 	SchemaAndPolicy,
 } from "../core/index.js";
 import { mapIterable, type JsonCompatibleReadOnly, type Mutable } from "../util/index.js";
+
+import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
+import type { SharedBranchSummaryData } from "./editManager.js";
 import type {
 	Commit,
 	EncodedCommit,
 	EncodedSharedBranch,
+	SequenceId,
 	SequencedCommit,
 } from "./editManagerFormatCommons.js";
-import type { SharedBranchSummaryData } from "./editManager.js";
-import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;
@@ -174,9 +176,8 @@ export function decodeSharedBranch<TChangeset>(
 	context: EditManagerEncodingContext,
 	originatorId: SessionId | undefined,
 ): SharedBranchSummaryData<TChangeset> {
-	// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	const trunk: readonly any[] = json.trunk;
+	// TODO: sort out EncodedCommit vs Commit, and make this type check without type assertion.
+	const trunk = json.trunk as readonly (EncodedCommit<JsonCompatibleReadOnly> & SequenceId)[];
 	const data: Mutable<SharedBranchSummaryData<TChangeset>> = {
 		trunk: trunk.map(
 			(commit): SequencedCommit<TChangeset> =>

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

@@ -20,8 +20,8 @@ import type {
 import { type JsonCompatibleReadOnly, JsonCompatibleReadOnlySchema } from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
-import { EncodedEditManager } from "./editManagerFormatV1toV4.js";
 import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
+import { EncodedEditManager } from "./editManagerFormatV1toV4.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;

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

@@ -24,11 +24,11 @@ import {
 	type Mutable,
 } from "../util/index.js";
 
+import type { BranchId } from "./branch.js";
 import type { SharedBranchSummaryData, SummaryData } from "./editManager.js";
-import { EncodedEditManager } from "./editManagerFormatVSharedBranches.js";
 import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
 import type { EncodedSharedBranch } from "./editManagerFormatCommons.js";
-import type { BranchId } from "./branch.js";
+import { EncodedEditManager } from "./editManagerFormatVSharedBranches.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;

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

@@ -13,6 +13,7 @@ import {
 	SessionIdSchema,
 } from "../core/index.js";
 import { type Brand, brandedNumberType, strictEnum, type Values } from "../util/index.js";
+
 import type { EncodedBranchId } from "./branch.js";
 
 /**

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

@@ -7,6 +7,7 @@ import type { SessionId } from "@fluidframework/id-compressor";
 import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 
 import { SessionIdSchema } from "../core/index.js";
+
 import {
 	EditManagerFormatVersion,
 	type EncodedSummarySessionBranch,

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

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 import type { SessionId } from "@fluidframework/id-compressor";
+import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 
-import { EncodedSharedBranch, EditManagerFormatVersion } from "./editManagerFormatCommons.js";
 import { SessionIdSchema } from "../core/index.js";
 
+import { EncodedSharedBranch, EditManagerFormatVersion } from "./editManagerFormatCommons.js";
+
 const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 
 // Many of the return types in this module are intentionally derived, rather than explicitly specified.

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

@@ -25,6 +25,7 @@ export {
 	SharedTreeCore,
 	type ClonableSchemaAndPolicy,
 	type SharedTreeCoreOptionsInternal,
+	type EnrichmentConfig,
 } from "./sharedTreeCore.js";
 export {
 	SharedTreeSummaryFormatVersion,
@@ -39,11 +40,7 @@ export { VersionedSummarizer } from "./versionedSummarizer.js";
 export type { ResubmitMachine } from "./resubmitMachine.js";
 export { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 
-export {
-	type ChangeEnricherReadonlyCheckout,
-	type ChangeEnricherMutableCheckout,
-	NoOpChangeEnricher,
-} from "./changeEnricher.js";
+export { type ChangeEnricher } from "./changeEnricher.js";
 
 export {
 	makeEditManagerCodec,

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

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { type TAnySchema, Type } from "@sinclair/typebox";
 import { assert } from "@fluidframework/core-utils/internal";
+import { type TAnySchema, Type } from "@sinclair/typebox";
 
 import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
 import type {
@@ -15,10 +15,10 @@ import type {
 } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
 
-import { Message } from "./messageFormatV1ToV4.js";
-import type { DecodedMessage } from "./messageTypes.js";
 import type { MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
+import { Message } from "./messageFormatV1ToV4.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export function makeV1ToV4CodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,

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

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { type TAnySchema, Type } from "@sinclair/typebox";
 
 import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
@@ -14,12 +15,11 @@ import type {
 } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
 
-import { Message } from "./messageFormatVSharedBranches.js";
-import type { DecodedMessage } from "./messageTypes.js";
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
-import type { MessageEncodingContext } from "./messageCodecs.js";
 import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
+import type { MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
+import { Message } from "./messageFormatVSharedBranches.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export function makeSharedBranchesCodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,

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

@@ -4,6 +4,7 @@
  */
 
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	getConfigForMinVersionForCollab,
@@ -31,11 +32,10 @@ import type {
 } from "../core/index.js";
 import { brand, unbrand, type JsonCompatibleReadOnly } from "../util/index.js";
 
-import type { DecodedMessage } from "./messageTypes.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 import { makeV1ToV4CodecWithVersion } from "./messageCodecV1ToV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./messageCodecVSharedBranches.js";
 import { MessageFormatVersion, messageFormatVersions } from "./messageFormat.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export interface MessageEncodingContext {
 	idCompressor: IIdCompressor;

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

@@ -8,6 +8,7 @@ import { type TSchema, Type } from "@sinclair/typebox";
 
 import { type EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
+
 import { MessageFormatVersion } from "./messageFormat.js";
 
 /**

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

@@ -8,6 +8,7 @@ import { type TSchema, Type } from "@sinclair/typebox";
 
 import { type EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
+
 import type { EncodedBranchId } from "./branch.js";
 import { MessageFormatVersion } from "./messageFormat.js";
 

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

@@ -6,6 +6,7 @@
 import type { SessionId } from "@fluidframework/id-compressor";
 
 import type { GraphCommit } from "../core/index.js";
+
 import type { BranchId } from "./branch.js";
 
 export type DecodedMessage<TChange> = CommitMessage<TChange> | BranchMessage;

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

@@ -30,11 +30,11 @@ import {
 	type ChangeFamily,
 	type ChangeFamilyEditor,
 	type GraphCommit,
+	replaceChange,
 	type RevisionTag,
 	RevisionTagCodec,
 	type SchemaAndPolicy,
 	type SchemaPolicy,
-	type TaggedChange,
 	type TreeStoredSchemaRepository,
 } from "../core/index.js";
 import {
@@ -48,7 +48,7 @@ import {
 
 import type { BranchId, SharedTreeBranch } from "./branch.js";
 import { BranchCommitEnricher } from "./branchCommitEnricher.js";
-import { type ChangeEnricherReadonlyCheckout, NoOpChangeEnricher } from "./changeEnricher.js";
+import type { ChangeEnricher } from "./changeEnricher.js";
 import { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 import { EditManager, minimumPossibleSequenceNumber } from "./editManager.js";
 import { makeEditManagerCodec, type EditManagerCodecOptions } from "./editManagerCodecs.js";
@@ -59,9 +59,9 @@ import {
 	type MessageEncodingContext,
 	makeMessageCodec,
 } from "./messageCodecs.js";
+import type { MessageFormatVersion } from "./messageFormat.js";
 import type { DecodedMessage } from "./messageTypes.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
-import type { MessageFormatVersion } from "./messageFormat.js";
 import {
 	minVersionToSharedTreeSummaryFormatVersion,
 	summarizablesTreeKey,
@@ -82,6 +82,11 @@ export interface SharedTreeCoreOptionsInternal
 		EditManagerCodecOptions,
 		MessageCodecOptions {}
 
+export interface EnrichmentConfig<TChange> {
+	readonly enricher: ChangeEnricher<TChange>;
+	readonly resubmitMachine?: ResubmitMachine<TChange>;
+}
+
 /**
  * Generic shared tree, which needs to be configured with indexes, field kinds and other configuration.
  */
@@ -143,8 +148,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 		protected readonly idCompressor: IIdCompressor,
 		schema: TreeStoredSchemaRepository,
 		schemaPolicy: SchemaPolicy,
-		resubmitMachine?: ResubmitMachine<TChange>,
-		enricher?: ChangeEnricherReadonlyCheckout<TChange>,
+		enrichmentConfig?: EnrichmentConfig<TChange>,
 		public readonly getEditor: () => TEditor = () => this.getLocalBranch().editor,
 	) {
 		super(
@@ -210,11 +214,13 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			options,
 		);
 
-		this.registerSharedBranchForEditing(
-			"main",
-			enricher ?? new NoOpChangeEnricher(),
-			resubmitMachine,
-		);
+		if (enrichmentConfig !== undefined) {
+			this.registerSharedBranchForEditing(
+				"main",
+				enrichmentConfig.enricher,
+				enrichmentConfig.resubmitMachine,
+			);
+		}
 	}
 
 	// TODO: SharedObject's merging of the two summary methods into summarizeCore is not what we want here:
@@ -307,11 +313,12 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 	}
 
 	private registerSharedBranch(branchId: BranchId): void {
-		this.editManager.getLocalBranch(branchId).events.on("beforeChange", (change) => {
+		const branch = this.editManager.getLocalBranch(branchId);
+		branch.events.on("beforeChange", (change) => {
 			if (change.type === "append") {
 				if (this.detachedRevision === undefined) {
 					// Commit enrichment is only necessary for changes that will be submitted as ops, and changes issued while detached are not submitted.
-					this.getCommitEnricher(branchId).processChange(change);
+					this.getCommitEnricher(branchId).prepareChanges(change.newCommits);
 				}
 
 				for (const commit of change.newCommits) {
@@ -349,11 +356,6 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			0x95a /* Detached revision should only be set when not attached */,
 		);
 
-		const enrichedCommit =
-			this.detachedRevision === undefined && !isResubmit
-				? this.getCommitEnricher(branchId).enrich(commit)
-				: commit;
-
 		// Edits submitted before the first attach are treated as sequenced because they will be included
 		// in the attach summary that is uploaded to the service.
 		// Until this attach workflow happens, this instance essentially behaves as a centralized data structure.
@@ -361,7 +363,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			const newRevision: SeqNumber = brand((this.detachedRevision as number) + 1);
 			this.detachedRevision = newRevision;
 			this.editManager.addSequencedChanges(
-				[enrichedCommit],
+				[commit],
 				this.editManager.localSessionId,
 				newRevision,
 				this.detachedRevision,
@@ -371,6 +373,10 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			return undefined;
 		}
 
+		const enrichedCommit = isResubmit
+			? commit
+			: replaceChange(commit, this.getCommitEnricher(branchId).retrieveChange(commit));
+
 		this.submitMessage(
 			{
 				type: "commit",
@@ -635,21 +641,14 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 
 	protected registerSharedBranchForEditing(
 		branchId: BranchId,
-		enricher: ChangeEnricherReadonlyCheckout<TChange>,
+		enricher: ChangeEnricher<TChange>,
 		resubmitMachine?: ResubmitMachine<TChange>,
 	): void {
-		const changeEnricher = enricher ?? new NoOpChangeEnricher();
-		const commitEnricher = new BranchCommitEnricher(this.changeFamily.rebaser, changeEnricher);
+		const commitEnricher = new BranchCommitEnricher(enricher);
 		assert(!this.enrichers.has(branchId), 0xc6d /* Branch already registered */);
 		this.enrichers.set(branchId, {
 			enricher: commitEnricher,
-			resubmitMachine:
-				resubmitMachine ??
-				new DefaultResubmitMachine(
-					(change: TaggedChange<TChange>) =>
-						this.changeFamily.rebaser.invert(change, true, this.mintRevisionTag()),
-					changeEnricher,
-				),
+			resubmitMachine: resubmitMachine ?? new DefaultResubmitMachine(enricher),
 		});
 	}
 

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

@@ -12,6 +12,9 @@ import type {
 } from "@fluidframework/runtime-definitions/internal";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
+import { readAndParseSnapshotBlob } from "../util/index.js";
+
 import {
 	summarizablesMetadataKey,
 	type SharedTreeSummarizableMetadata,
@@ -19,7 +22,6 @@ import {
 	type SummaryElementParser,
 	type SummaryElementStringifier,
 } from "./summaryTypes.js";
-import { readAndParseSnapshotBlob } from "../util/index.js";
 
 /**
  * Utility for implementing {@link Summarizable}s classes with versioning.

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

@@ -6,17 +6,14 @@
 import { assert, fail, oob, unreachableCase } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
-import { type FieldSchemaAlpha, type ImplicitFieldSchema, FieldKind } from "../fieldSchema.js";
+import { getOrCreate } from "../../util/index.js";
+import type { MakeNominal } from "../../util/index.js";
 import {
 	type AllowedTypesFullEvaluated,
 	NodeKind,
 	type TreeNodeSchema,
 } from "../core/index.js";
-import {
-	toInitialSchema,
-	toUnhydratedSchema,
-	transformSimpleSchema,
-} from "../toStoredSchema.js";
+import { type FieldSchemaAlpha, type ImplicitFieldSchema, FieldKind } from "../fieldSchema.js";
 import {
 	isArrayNodeSchema,
 	isMapNodeSchema,
@@ -27,11 +24,14 @@ import {
 	type ObjectNodeSchema,
 	type RecordNodeSchema,
 } from "../node-kinds/index.js";
-import { getOrCreate } from "../../util/index.js";
-import type { MakeNominal } from "../../util/index.js";
-import { walkFieldSchema } from "../walkFieldSchema.js";
 import type { SchemaType, SimpleNodeSchema } from "../simpleSchema.js";
+import {
+	toInitialSchema,
+	toUnhydratedSchema,
+	transformSimpleSchema,
+} from "../toStoredSchema.js";
 import { createTreeSchema, type TreeSchema } from "../treeSchema.js";
+import { walkFieldSchema } from "../walkFieldSchema.js";
 
 /**
  * Options when constructing a tree view.

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

@@ -15,7 +15,11 @@ import {
 	type SchemaAndPolicy,
 	type TreeFieldStoredSchema,
 } from "../../core/index.js";
-import type { ImplicitFieldSchema, TreeFieldFromImplicitField } from "../fieldSchema.js";
+import {
+	defaultSchemaPolicy,
+	isFieldInSchema,
+	throwOutOfSchema,
+} from "../../feature-libraries/index.js";
 import {
 	type Context,
 	getOrCreateNodeFromInnerNode,
@@ -23,12 +27,9 @@ import {
 	UnhydratedFlexTreeNode,
 	createField,
 } from "../core/index.js";
-import {
-	defaultSchemaPolicy,
-	isFieldInSchema,
-	throwOutOfSchema,
-} from "../../feature-libraries/index.js";
 import { getUnhydratedContext } from "../createContext.js";
+import type { ImplicitFieldSchema, TreeFieldFromImplicitField } from "../fieldSchema.js";
+
 import { unknownTypeError } from "./customTree.js";
 
 /**

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

@@ -4,6 +4,7 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
+
 import {
 	createAnnouncedVisitor,
 	CursorLocationType,
@@ -12,11 +13,12 @@ import {
 	type IEditableForest,
 	type UpPath,
 } from "../../core/index.js";
-import { TreeNode, treeNodeFromAnchor } from "../core/index.js";
-import type { TreeViewAlpha } from "./tree.js";
 import type { SchematizingSimpleTreeView } from "../../shared-tree/index.js";
+import { TreeNode, treeNodeFromAnchor } from "../core/index.js";
 import type { ImplicitFieldSchema } from "../fieldSchema.js";
 
+import type { TreeViewAlpha } from "./tree.js";
+
 /**
  * The status of a node in a that has been {@link trackDirtyNodes | tracked for changes}.
  * @remarks Nodes can be marked "new", "changed", or "moved", with "new" taking precedence over "changed" and "changed" taking precedence over "moved".

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

@@ -21,6 +21,7 @@ import {
 	type TreeTypeSet,
 	type ValueSchema,
 } from "../../core/index.js";
+import { FieldKinds } from "../../feature-libraries/index.js";
 import { brand } from "../../util/index.js";
 import {
 	NodeKind,
@@ -28,6 +29,13 @@ import {
 	type AnnotatedAllowedType,
 	type TreeNodeSchema,
 } from "../core/index.js";
+import {
+	createFieldSchema,
+	FieldKind,
+	FieldSchemaAlpha,
+	type FieldSchema,
+} from "../fieldSchema.js";
+import { LeafNodeSchema } from "../leafNodeSchema.js";
 import {
 	isArrayNodeSchema,
 	isMapNodeSchema,
@@ -36,16 +44,9 @@ import {
 	type ObjectNodeSchemaPrivate,
 } from "../node-kinds/index.js";
 import { convertFieldKind } from "../toStoredSchema.js";
-import {
-	createFieldSchema,
-	FieldKind,
-	FieldSchemaAlpha,
-	type FieldSchema,
-} from "../fieldSchema.js";
-import { LeafNodeSchema } from "../leafNodeSchema.js";
 import type { TreeSchema } from "../treeSchema.js";
+
 import { tryStoredSchemaAsArray } from "./customTree.js";
-import { FieldKinds } from "../../feature-libraries/index.js";
 
 /**
  * Discriminated union (keyed on `mismatch`) of discrepancies between a view and stored schema which

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

@@ -3,11 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import type { JsonTreeSchema } from "./jsonSchema.js";
 import type { ImplicitAllowedTypes } from "../core/index.js";
-import { toJsonSchema } from "./simpleSchemaToJsonSchema.js";
-import type { TreeParsingOptions } from "./customTree.js";
+
 import { TreeViewConfigurationAlpha } from "./configuration.js";
+import type { TreeParsingOptions } from "./customTree.js";
+import type { JsonTreeSchema } from "./jsonSchema.js";
+import { toJsonSchema } from "./simpleSchemaToJsonSchema.js";
 
 /**
  * Options for how to interpret or encode a tree when schema information is available.

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

@@ -4,13 +4,15 @@
  */
 
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
 import type { TreeIndexKey } from "../../feature-libraries/index.js";
-import { FieldKind, type ImplicitFieldSchema } from "../fieldSchema.js";
 import type { TreeNode } from "../core/index.js";
+import { FieldKind, type ImplicitFieldSchema } from "../fieldSchema.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";
+import type { TreeView } from "./tree.js";
 
 /**
  * An index that returns tree nodes given their associated identifiers.