@fluidframework/tree 2.81.0-374083 → 2.81.1

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,
@@ -80,8 +80,11 @@ export interface ClonableSchemaAndPolicy extends SchemaAndPolicy {
 export interface SharedTreeCoreOptionsInternal
 	extends CodecWriteOptions,
 		EditManagerCodecOptions,
-		MessageCodecOptions {
-	canMakeDetachedRootEdits: boolean;
+		MessageCodecOptions {}
+
+export interface EnrichmentConfig<TChange> {
+	readonly enricher: ChangeEnricher<TChange>;
+	readonly resubmitMachine?: ResubmitMachine<TChange>;
 }
 
 /**
@@ -145,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(
@@ -178,7 +180,6 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			localSessionId,
 			this.mintRevisionTag,
 			(branchId) => this.registerSharedBranch(branchId),
-			options,
 			rebaseLogger,
 		);
 
@@ -213,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:
@@ -310,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) {
@@ -352,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.
@@ -364,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,
@@ -374,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",
@@ -638,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.

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

@@ -3,14 +3,15 @@
  * Licensed under the MIT License.
  */
 
+import { assert } from "@fluidframework/core-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
+import type { FieldKey } from "../../core/index.js";
+import type { IncrementalEncodingPolicy } from "../../feature-libraries/index.js";
+import { oneFromIterable } from "../../util/index.js";
 import { getTreeNodeSchemaPrivateData, type AllowedTypesFull } from "../core/index.js";
 import { isArrayNodeSchema, isObjectNodeSchema } from "../node-kinds/index.js";
 import type { TreeSchema } from "../treeSchema.js";
-import type { IncrementalEncodingPolicy } from "../../feature-libraries/index.js";
-import { oneFromIterable } from "../../util/index.js";
-import { assert } from "@fluidframework/core-utils/internal";
-import type { FieldKey } from "../../core/index.js";
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 /**
  * A symbol when present in the {@link AnnotatedAllowedTypes.metadata}'s `custom` property as true, opts in the allowed

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

@@ -5,12 +5,12 @@
 
 import type { TreeStoredSchema } from "../../core/index.js";
 import { allowsRepoSuperset, defaultSchemaPolicy } from "../../feature-libraries/index.js";
-
-import type { SchemaCompatibilityStatus } from "./tree.js";
-import { getDiscrepanciesInAllowedContent } from "./discrepancies.js";
 import { toUpgradeSchema } from "../toStoredSchema.js";
 import type { TreeSchema } from "../treeSchema.js";
 
+import { getDiscrepanciesInAllowedContent } from "./discrepancies.js";
+import type { SchemaCompatibilityStatus } from "./tree.js";
+
 /**
  * A collection of View information for schema
  * @remarks

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

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import { assert, fail } from "@fluidframework/core-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
-import type { SchemaFactory, ScopedSchemaName } from "./schemaFactory.js";
+import type { UnionToTuple } from "../../util/index.js";
 import type {
 	NodeFromSchema,
 	InternalTreeNode,
@@ -15,7 +15,8 @@ import type {
 	TreeNodeSchema,
 	TreeNodeSchemaClass,
 } from "../core/index.js";
-import type { UnionToTuple } from "../../util/index.js";
+
+import type { SchemaFactory, ScopedSchemaName } from "./schemaFactory.js";
 
 /*
  * This file does two things:

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

@@ -4,13 +4,15 @@
  */
 
 import { assert, debugAssert, unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
+import { createIdCompressor } from "@fluidframework/id-compressor/internal";
 import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import type { TreeValue } from "../../core/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 { FlexTreeHydratedContextMinimal } from "../../feature-libraries/index.js";
 import {
 	type JsonCompatibleReadOnlyObject,
 	type RestrictiveStringRecord,
@@ -31,6 +33,17 @@ import type {
 	ImplicitAllowedTypes,
 	InsertableTreeNodeFromImplicitAllowedTypes,
 } from "../core/index.js";
+import {
+	FieldKind,
+	type FieldSchema,
+	type ImplicitFieldSchema,
+	// This import prevents a large number of FieldProps references in the API reports from showing up as FieldProps_2.
+	// eslint-disable-next-line unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars
+	type FieldProps,
+	createFieldSchema,
+	type DefaultProvider,
+	getDefaultProvider,
+} from "../fieldSchema.js";
 import {
 	booleanSchema,
 	handleSchema,
@@ -51,24 +64,10 @@ import {
 	type TreeMapNode,
 	type TreeObjectNode,
 } from "../node-kinds/index.js";
-import {
-	FieldKind,
-	type FieldSchema,
-	type ImplicitFieldSchema,
-	// This import prevents a large number of FieldProps references in the API reports from showing up as FieldProps_2.
-	// eslint-disable-next-line unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars
-	type FieldProps,
-	createFieldSchema,
-	type DefaultProvider,
-	getDefaultProvider,
-} from "../fieldSchema.js";
-
-import type { System_Unsafe } from "./typesUnsafe.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-import { createIdCompressor } from "@fluidframework/id-compressor/internal";
-import type { FlexTreeHydratedContextMinimal } from "../../feature-libraries/index.js";
 import { unhydratedFlexTreeFromInsertable } from "../unhydratedFlexTreeFromInsertable.js";
+
 import { type SchemaStatics, schemaStatics } from "./schemaStatics.js";
+import type { System_Unsafe } from "./typesUnsafe.js";
 
 /**
  * Gets the leaf domain schema compatible with a given {@link TreeValue}.

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

@@ -3,6 +3,23 @@
  * Licensed under the MIT License.
  */
 
+import type { RestrictiveStringRecord } from "../../util/index.js";
+import type {
+	NodeKind,
+	TreeNodeSchemaClass,
+	ImplicitAllowedTypes,
+	WithType,
+} from "../core/index.js";
+import type { ImplicitFieldSchema } from "../fieldSchema.js";
+// These imports prevent a large number of type references in the API reports from showing up as *_2.
+/* eslint-disable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, import-x/no-duplicates */
+import type {
+	FieldProps,
+	FieldSchemaAlpha,
+	FieldPropsAlpha,
+	FieldKind,
+} from "../fieldSchema.js";
+import type { LeafSchema } from "../leafNodeSchema.js";
 import {
 	type ArrayNodeCustomizableSchema,
 	arraySchema,
@@ -13,6 +30,9 @@ import {
 	type RecordNodeCustomizableSchema,
 	recordSchema,
 } from "../node-kinds/index.js";
+import type { SchemaType, SimpleObjectNodeSchema } from "../simpleSchema.js";
+import type { SimpleLeafNodeSchema } from "../simpleSchema.js";
+
 import {
 	defaultSchemaFactoryObjectOptions,
 	scoped,
@@ -20,34 +40,14 @@ import {
 	type ObjectSchemaOptionsAlpha,
 	type ScopedSchemaName,
 } from "./schemaFactory.js";
+import { SchemaFactoryBeta } from "./schemaFactoryBeta.js";
 import { schemaStatics } from "./schemaStatics.js";
-import type { ImplicitFieldSchema } from "../fieldSchema.js";
-import type { RestrictiveStringRecord } from "../../util/index.js";
-import type {
-	NodeKind,
-	TreeNodeSchemaClass,
-	ImplicitAllowedTypes,
-	WithType,
-} from "../core/index.js";
 import type {
 	ArrayNodeCustomizableSchemaUnsafe,
 	MapNodeCustomizableSchemaUnsafe,
 	System_Unsafe,
 	TreeRecordNodeUnsafe,
 } from "./typesUnsafe.js";
-import type { SchemaType, SimpleObjectNodeSchema } from "../simpleSchema.js";
-import { SchemaFactoryBeta } from "./schemaFactoryBeta.js";
-
-// These imports prevent a large number of type references in the API reports from showing up as *_2.
-/* eslint-disable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, import-x/no-duplicates */
-import type {
-	FieldProps,
-	FieldSchemaAlpha,
-	FieldPropsAlpha,
-	FieldKind,
-} from "../fieldSchema.js";
-import type { LeafSchema } from "../leafNodeSchema.js";
-import type { SimpleLeafNodeSchema } from "../simpleSchema.js";
 import type { FieldSchemaAlphaUnsafe } from "./typesUnsafe.js";
 /* eslint-enable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, import-x/no-duplicates */
 

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

@@ -3,6 +3,9 @@
  * Licensed under the MIT License.
  */
 
+import type { RestrictiveStringRecord } from "../../util/index.js";
+// eslint-disable-next-line unused-imports/no-unused-imports, import-x/no-duplicates -- This import prevents a large number of type references in the API reports from showing up as *_2.
+import type { RestrictiveStringRecord as _RestrictiveStringRecord } from "../../util/index.js";
 import {
 	AnnotatedAllowedTypesInternal,
 	createSchemaUpgrade,
@@ -19,7 +22,17 @@ import {
 	type TreeNodeSchemaNonClass,
 	type WithType,
 } from "../core/index.js";
-
+import type { ImplicitFieldSchema } from "../fieldSchema.js";
+/* eslint-disable unused-imports/no-unused-imports, import-x/no-duplicates -- These imports prevent a large number of type references in the API reports from showing up as *_2. */
+import type {
+	FieldProps as _FieldProps,
+	FieldSchemaAlpha as _FieldSchemaAlpha,
+	FieldPropsAlpha as _FieldPropsAlpha,
+	FieldKind as _FieldKind,
+	ImplicitFieldSchema as _ImplicitFieldSchema,
+} from "../fieldSchema.js";
+import type { LeafSchema as _LeafSchema } from "../leafNodeSchema.js";
+/* eslint-enable unused-imports/no-unused-imports, import-x/no-duplicates */
 import {
 	objectSchema,
 	recordSchema,
@@ -28,6 +41,9 @@ import {
 	type TreeObjectNode,
 	type TreeRecordNode,
 } from "../node-kinds/index.js";
+// eslint-disable-next-line unused-imports/no-unused-imports -- This import prevents a large number of type references in the API reports from showing up as *_2.
+import type { SimpleLeafNodeSchema as _SimpleLeafNodeSchema } from "../simpleSchema.js";
+
 import {
 	defaultSchemaFactoryObjectOptions,
 	SchemaFactory,
@@ -46,20 +62,6 @@ import type {
 	Unenforced,
 } from "./typesUnsafe.js";
 
-// These imports prevent a large number of type references in the API reports from showing up as *_2.
-/* eslint-disable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, import-x/no-duplicates */
-import type {
-	FieldProps,
-	FieldSchemaAlpha,
-	FieldPropsAlpha,
-	FieldKind,
-	ImplicitFieldSchema,
-} from "../fieldSchema.js";
-import type { LeafSchema } from "../leafNodeSchema.js";
-import type { SimpleLeafNodeSchema } from "../simpleSchema.js";
-import type { RestrictiveStringRecord } from "../../util/index.js";
-/* eslint-enable unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, import-x/no-duplicates */
-
 /**
  * Stateless APIs exposed via {@link SchemaFactoryBeta} as both instance properties and as statics.
  * @see {@link SchemaStatics} for why this is useful.

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

@@ -13,8 +13,8 @@ import type {
 	InsertableTreeNodeFromImplicitAllowedTypes,
 	TreeNodeSchemaClass,
 } from "../core/index.js";
-import type { InsertableObjectFromSchemaRecord } from "../node-kinds/index.js";
 import type { ImplicitFieldSchema } from "../fieldSchema.js";
+import type { InsertableObjectFromSchemaRecord } from "../node-kinds/index.js";
 
 /**
  * Compile time check for validity of a recursive schema.

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

@@ -24,8 +24,8 @@ import type {
 	SimpleNodeSchema,
 	SimpleTreeSchema,
 } from "../simpleSchema.js";
-
 import type { TreeSchema } from "../treeSchema.js";
+
 import { SchemaFactoryAlpha } from "./schemaFactoryAlpha.js";
 
 const factory = new SchemaFactoryAlpha(undefined);

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

@@ -4,6 +4,7 @@
  */
 
 import type { IFluidHandle } from "@fluidframework/core-interfaces";
+
 import type { ImplicitAllowedTypes } from "../core/index.js";
 import { FieldKind, getDefaultProvider, createFieldSchema } from "../fieldSchema.js";
 import type {
@@ -21,6 +22,7 @@ import {
 	nullSchema,
 	handleSchema,
 } from "../leafNodeSchema.js";
+
 import type { System_Unsafe, FieldSchemaAlphaUnsafe } from "./typesUnsafe.js";
 
 /**

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

@@ -3,8 +3,19 @@
  * Licensed under the MIT License.
  */
 
-import { objectToMap, type JsonCompatibleReadOnly } from "../../util/index.js";
 import { unreachableCase, transformMapValues } from "@fluidframework/core-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
+import {
+	DiscriminatedUnionDispatcher,
+	extractJsonValidator,
+	FormatValidatorNoOp,
+	type FormatValidator,
+} from "../../codec/index.js";
+import type { ValueSchema } from "../../core/index.js";
+import { objectToMap, type JsonCompatibleReadOnly } from "../../util/index.js";
+import { createSchemaUpgrade, NodeKind, SchemaUpgrade } from "../core/index.js";
+import type { FieldKind } from "../fieldSchema.js";
 import type {
 	SimpleAllowedTypeAttributes,
 	SimpleArrayNodeSchema,
@@ -17,17 +28,7 @@ import type {
 	SimpleRecordNodeSchema,
 	SimpleTreeSchema,
 } from "../simpleSchema.js";
-import { createSchemaUpgrade, NodeKind, SchemaUpgrade } from "../core/index.js";
-import type { FieldKind } from "../fieldSchema.js";
-import type { ValueSchema } from "../../core/index.js";
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import * as Format from "../simpleSchemaFormatV1.js";
-import {
-	DiscriminatedUnionDispatcher,
-	extractJsonValidator,
-	FormatValidatorNoOp,
-	type FormatValidator,
-} from "../../codec/index.js";
 
 /**
  * Encodes the compatibility impacting subset of simple schema (view or stored) into a serializable format.