@fluidframework/tree 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0

package/src/feature-libraries/flex-tree/treeEvents.ts

@@ -3,33 +3,20 @@
  * Licensed under the MIT License.
  */
 
-import { UpPath, PathVisitor } from "../../core/index.js";
-import { FlexTreeNode } from "./flexTreeTypes.js";
+import { PathVisitor, UpPath } from "../../core/index.js";
 
 /**
  * This file provides an API for working with trees which is type safe even when schema is not known.
  * This means no editing is allowed.
  *
- * Schema aware APIs for working with trees should superset this, while sub-setting EditableTree.
+ * Schema aware APIs for working with trees should superset this, while sub-setting FlexTree.
  *
  * TODO:
- * This API should replace EditableTree as the default public API for tree access.
+ * This API should replace FlexTree as the default public API for tree access.
  * SchemaAware builds on this, adding editing and type safe APIs which can be accessed via SchematizeView.
- * Once this is finished, the unsafe EditableTree types can be removed (or converted to package internal documentation for the proxies).
+ * Once this is finished, the unsafe FlexTree types can be removed (or converted to package internal documentation for the proxies).
  */
 
-/**
- * An event raised on a {@link FlexTreeNode}.
- *
- * @internal
- */
-export interface TreeEvent {
-	/**
-	 * The node of the tree where the listener receiving the event is attached.
-	 */
-	readonly target: FlexTreeNode;
-}
-
 /**
  * A collection of events that can be raised by a {@link FlexTreeNode}.
  * These events are triggered while the internal data structures are being updated.
@@ -40,12 +27,13 @@ export interface TreeEvent {
  * - Include sub-deltas in events.
  * - Add more events.
  * - Have some events (or a way to defer events) until the tree can be read.
+ * - Consider removing this and just using AnchorEvents and simple-tree's events (and extending them as needed).
  *
  * @internal
  */
-export interface EditableTreeEvents {
+export interface FlexTreeNodeEvents {
 	/**
-	 * Raised when a specific EditableTree node is changing.
+	 * Raised when a specific FlexTree node is changing.
 	 * This includes its fields.
 	 * @param upPath - the path corresponding to the location of the node being changed, upward.
 	 */
@@ -60,58 +48,4 @@ export interface EditableTreeEvents {
 	 * @returns a visitor to traverse the subtree or `void`.
 	 */
 	subtreeChanging(upPath: UpPath): PathVisitor | void;
-
-	/**
-	 * Raised on a node right before a change is applied to one of its fields or the fields of a descendant node.
-	 *
-	 * @param event - The event object. See {@link TreeEvent} for details.
-	 *
-	 * @remarks
-	 * What exactly qualifies as a change that triggers this event (or {@link EditableTreeEvents.afterChange}) is dependent
-	 * on the implementation of SharedTree. In general, these events will fire once for every atomic editing operation
-	 * supported by SharedTree; {@link EditableTreeEvents.beforeChange} before the change is applied, and
-	 * {@link EditableTreeEvents.afterChange} after it is.
-	 *
-	 * {@link FieldKinds.sequence} fields present two exceptions:
-	 *
-	 * The first one is that events will fire separately for each node involved in the operation (when inserting, removing,
-	 * or moving more than one node at a time). This means that, for example, when inserting two nodes into a {@link FieldKinds.sequence}
-	 * field the following will happen:
-	 * - {@link EditableTreeEvents.beforeChange} will fire once before either new node is present in the tree.
-	 * - {@link EditableTreeEvents.afterChange} will fire once after the first node is present in the tree, but the second one isn't.
-	 * - {@link EditableTreeEvents.beforeChange} will fire once before the second node is present in the tree, but the first one already is.
-	 * - {@link EditableTreeEvents.afterChange} will fire once after the second node is present in the tree (so at this point both nodes are).
-	 * Something similar applies to removing nodes from a sequence, and moving them to another sequence.
-	 *
-	 * The second one is that for an operation to move nodes, events will fire *twice* for each node being moved; once
-	 * while they are being detached from their source location, and once when they are being attached at the target location.
-	 */
-	beforeChange(event: TreeEvent): void;
-
-	/**
-	 * Raised on a node right after a change is applied to one of its fields or the fields of a descendant node.
-	 *
-	 * @param event - The event object. See {@link TreeEvent} for details.
-	 *
-	 * @remarks
-	 * What exactly qualifies as a change that triggers this event (or {@link EditableTreeEvents.beforeChange}) is dependent
-	 * on the implementation of SharedTree. In general, these events will fire once for every atomic editing operation supported
-	 * by SharedTree; {@link EditableTreeEvents.beforeChange} before the change is applied, and
-	 * {@link EditableTreeEvents.afterChange} after it is.
-	 *
-	 * {@link FieldKinds.sequence} present two exceptions:
-	 *
-	 * The first one is that events will fire separately for each node involved in the operation (when inserting, removing,
-	 * or moving more than one node at a time). This means that, for example, when inserting two nodes into a {@link FieldKinds.sequence}
-	 * field the following will happen:
-	 * - {@link EditableTreeEvents.beforeChange} will fire once before either new node is present in the tree.
-	 * - {@link EditableTreeEvents.afterChange} will fire once after the first node is present in the tree, but the second one isn't.
-	 * - {@link EditableTreeEvents.beforeChange} will fire once before the second node is present in the tree, but the first one already is.
-	 * - {@link EditableTreeEvents.afterChange} will fire once after the second node is present in the tree (so at this point both nodes are).
-	 * Something similar applies to removing nodes from a sequence, and moving them to another sequence.
-	 *
-	 * The second one is that for an operation to move nodes, events will fire *twice* for each node being moved; once
-	 * while they are being detached from their source location, and once when they are being attached at the target location.
-	 */
-	afterChange(event: TreeEvent): void;
 }

package/src/feature-libraries/flex-tree/unboxed.ts

@@ -4,14 +4,15 @@
  */
 
 import { ITreeSubscriptionCursor, inCursorNode } from "../../core/index.js";
-import { FlexFieldKind } from "../modular-schema/index.js";
 import { FieldKinds } from "../default-schema/index.js";
+import { FlexFieldKind } from "../modular-schema/index.js";
 import {
 	FlexAllowedTypes,
 	FlexFieldSchema,
 	FlexTreeNodeSchema,
 	schemaIsLeaf,
 } from "../typed-schema/index.js";
+
 import { Context } from "./context.js";
 import {
 	FlexTreeNode,
@@ -19,8 +20,8 @@ import {
 	FlexTreeUnboxNode,
 	FlexTreeUnboxNodeUnion,
 } from "./flexTreeTypes.js";
-import { makeTree } from "./lazyNode.js";
 import { makeField } from "./lazyField.js";
+import { makeTree } from "./lazyNode.js";
 
 /**
  * See {@link FlexTreeUnboxNode} for documentation on what unwrapping this performs.

package/src/feature-libraries/flex-tree/utilities.ts

@@ -11,6 +11,7 @@ import {
 	getDetachedFieldContainingPath,
 	rootField,
 } from "../../core/index.js";
+
 import { TreeStatus } from "./flexTreeTypes.js";
 /**
  * Checks the detached field and returns the TreeStatus based on whether or not the detached field is a root field.

package/src/feature-libraries/forest-summary/codec.ts

@@ -3,10 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { ICodecOptions, IJsonCodec, makeVersionedValidatedCodec } from "../../codec/index.js";
 import { FieldKey, ITreeCursorSynchronous } from "../../core/index.js";
 import { FieldBatchCodec, FieldBatchEncodingContext } from "../chunked-forest/index.js";
+
 import { Format } from "./format.js";
 
 /**

package/src/feature-libraries/forest-summary/forestSummarizer.ts

@@ -4,27 +4,29 @@
  */
 
 import { bufferToString } from "@fluid-internal/client-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import {
-	ITelemetryContext,
-	ISummaryTreeWithStats,
 	IGarbageCollectionData,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { createSingleBlobSummary } from "@fluidframework/shared-object-base";
-import { assert } from "@fluidframework/core-utils";
+import { createSingleBlobSummary } from "@fluidframework/shared-object-base/internal";
+
+import { ICodecOptions, noopValidator } from "../../codec/index.js";
 import {
-	applyDelta,
 	DeltaDetachedNodeBuild,
 	DeltaFieldChanges,
 	FieldKey,
-	forEachField,
 	IEditableForest,
 	ITreeCursorSynchronous,
 	ITreeSubscriptionCursor,
-	makeDetachedFieldIndex,
-	mapCursorField,
 	RevisionTagCodec,
 	TreeNavigationResult,
+	applyDelta,
+	forEachField,
+	makeDetachedFieldIndex,
+	mapCursorField,
 } from "../../core/index.js";
 import {
 	Summarizable,
@@ -32,12 +34,12 @@ import {
 	SummaryElementStringifier,
 } from "../../shared-tree-core/index.js";
 import { idAllocatorFromMaxId } from "../../util/index.js";
-import { ICodecOptions, noopValidator } from "../../codec/index.js";
-import { FieldBatchEncodingContext, FieldBatchCodec } from "../chunked-forest/index.js";
 // eslint-disable-next-line import/no-internal-modules
 import { chunkField, defaultChunkPolicy } from "../chunked-forest/chunkTree.js";
-import { Format } from "./format.js";
+import { FieldBatchCodec, FieldBatchEncodingContext } from "../chunked-forest/index.js";
+
 import { ForestCodec, makeForestSummarizerCodec } from "./codec.js";
+import { Format } from "./format.js";
 /**
  * The storage key for the blob in the summary containing tree data
  */

package/src/feature-libraries/forest-summary/format.ts

@@ -4,8 +4,9 @@
  */
 
 import { Static, Type } from "@sinclair/typebox";
-import { schemaFormat } from "../../core/index.js";
+
 import { Versioned } from "../../codec/index.js";
+import { schemaFormat } from "../../core/index.js";
 
 export const version = 1.0;
 

package/src/feature-libraries/index.ts

@@ -44,7 +44,6 @@ export {
 export {
 	typeNameSymbol,
 	valueSymbol,
-	isTreeValue,
 	ContextuallyTypedNodeDataObject,
 	ContextuallyTypedNodeData,
 	MarkedArrayLike,
@@ -63,7 +62,7 @@ export {
 	getAllowedTypes,
 } from "./contextuallyTyped.js";
 
-export { allowsValue, assertAllowedValue, isFluidHandle } from "./valueUtilities.js";
+export { allowsValue, assertAllowedValue, isFluidHandle, isTreeValue } from "./valueUtilities.js";
 
 export { FieldGenerator, TreeDataContext } from "./fieldGenerator.js";
 
@@ -99,15 +98,16 @@ export {
 	FieldChangeHandler,
 	FieldChangeRebaser,
 	FieldEditor,
-	NodeChangeset,
 	FieldChangeMap,
 	FieldChange,
 	FieldChangeset,
 	ToDelta,
 	ModularChangeset,
+	makeModularChangeCodecFamily,
 	NodeChangeComposer,
 	NodeChangeInverter,
 	NodeChangeRebaser,
+	NodeChangePruner,
 	CrossFieldManager,
 	CrossFieldTarget,
 	FlexFieldKind,
@@ -120,13 +120,14 @@ export {
 	NodeExistenceState,
 	FieldKindWithEditor,
 	ModularChangeFamily,
-	makeV0Codec,
 	RelevantRemovedRootsFromChild,
 	EncodedModularChangeset,
+	NodeId,
+	FieldChangeEncodingContext,
+	FieldKindConfiguration,
+	FieldKindConfigurationEntry,
 } from "./modular-schema/index.js";
 
-export { Multiplicity } from "./multiplicity.js";
-
 export {
 	FlexTreeNodeSchema,
 	FlexAllowedTypes,
@@ -159,7 +160,6 @@ export {
 	FlexObjectNodeFields,
 	intoStoredSchema,
 	intoStoredSchemaCollection,
-	ArrayToUnion,
 	ExtractItemType,
 	NormalizeLazyItem,
 	FlexList,
@@ -191,7 +191,6 @@ export {
 	makeTreeChunker,
 	makeFieldBatchCodec,
 	FieldBatchEncodingContext,
-	SchemaAndPolicy,
 } from "./chunked-forest/index.js";
 
 export {
@@ -212,6 +211,7 @@ export {
 	Optional,
 	Sequence,
 	NodeKeyFieldKind,
+	Identifier,
 	Forbidden,
 	DefaultChangeset,
 	DefaultChangeFamily,
@@ -222,6 +222,7 @@ export {
 	SequenceFieldEditBuilder,
 	defaultSchemaPolicy,
 	fieldKinds,
+	fieldKindConfigurations,
 	intoDelta,
 	relevantRemovedRoots,
 } from "./default-schema/index.js";
@@ -250,11 +251,10 @@ export {
 	CheckTypesOverlap,
 	TreeStatus,
 	Context,
-	TreeEvent,
-	EditableTreeEvents,
+	FlexTreeNodeEvents,
 	FlexTreeUnknownUnboxed,
-	onNextChange,
 	isFlexTreeNode,
+	ContextSlot,
 
 	// Internal
 	FlexTreeTypedFieldInner,
@@ -276,6 +276,7 @@ export {
 	reservedObjectNodeFieldPropertyNamePrefixes,
 	FlexTreeObjectNodeFieldsInner,
 	assertFlexTreeEntityNotFreed,
+	flexTreeSlot,
 } from "./flex-tree/index.js";
 
 export { treeSchemaFromStoredSchema } from "./storedToViewSchema.js";
@@ -299,6 +300,6 @@ export {
 
 export { DetachedFieldIndexSummarizer } from "./detachedFieldIndexSummarizer.js";
 
-export { SchemaChange, makeSchemaChangeCodec, EncodedSchemaChange } from "./schema-edits/index.js";
+export { SchemaChange, makeSchemaChangeCodecs, EncodedSchemaChange } from "./schema-edits/index.js";
 
 export { makeMitigatedChangeFamily } from "./mitigatedChangeFamily.js";

package/src/feature-libraries/mapTreeCursor.ts

@@ -3,18 +3,20 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import {
-	FieldKey,
-	MapTree,
-	ITreeCursor,
 	CursorLocationType,
-	mapCursorField,
 	DetachedField,
+	FieldKey,
+	ITreeCursor,
+	MapTree,
+	aboveRootPlaceholder,
 	detachedFieldAsKey,
+	mapCursorField,
 	rootField,
-	aboveRootPlaceholder,
 } from "../core/index.js";
+
 import {
 	CursorAdapter,
 	CursorWithNode,

package/src/feature-libraries/memoizedIdRangeAllocator.ts

@@ -5,12 +5,12 @@
 
 import { ChangesetLocalId, RevisionTag } from "../core/index.js";
 import {
+	Mutable,
 	RangeMap,
-	getOrAddEmptyToMap,
+	brand,
 	getFirstEntryFromRangeMap,
+	getOrAddEmptyToMap,
 	setInRangeMap,
-	Mutable,
-	brand,
 } from "../util/index.js";
 
 /**

package/src/feature-libraries/modular-schema/comparison.ts

@@ -3,19 +3,21 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { compareSets, fail } from "../../util/index.js";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import {
-	TreeNodeStoredSchema,
-	ValueSchema,
-	TreeFieldStoredSchema,
-	TreeTypeSet,
-	TreeStoredSchema,
-	storedEmptyFieldSchema,
 	LeafNodeStoredSchema,
 	MapNodeStoredSchema,
 	ObjectNodeStoredSchema,
+	TreeFieldStoredSchema,
+	TreeNodeStoredSchema,
+	TreeStoredSchema,
+	TreeTypeSet,
+	ValueSchema,
+	storedEmptyFieldSchema,
 } from "../../core/index.js";
+import { compareSets, fail } from "../../util/index.js";
+
 import { FullSchemaPolicy } from "./fieldKind.js";
 import { withEditor } from "./fieldKindWithEditor.js";
 import { isNeverTree } from "./isNeverTree.js";
@@ -138,7 +140,7 @@ export function allowsFieldSuperset(
 	superset: TreeFieldStoredSchema,
 ): boolean {
 	return withEditor(
-		policy.fieldKinds.get(original.kind.identifier) ?? fail("missing kind"),
+		policy.fieldKinds.get(original.kind) ?? fail("missing kind"),
 	).allowsFieldSuperset(policy, originalData, original.types, superset);
 }
 

package/src/feature-libraries/modular-schema/fieldChangeHandler.ts

@@ -3,21 +3,23 @@
  * Licensed under the MIT License.
  */
 
+import { ICodecFamily, IJsonCodec } from "../../codec/index.js";
 import {
-	TaggedChange,
-	RevisionTag,
-	RevisionMetadataSource,
-	DeltaFieldMap,
-	DeltaFieldChanges,
+	ChangeEncodingContext,
 	DeltaDetachedNodeId,
+	DeltaFieldChanges,
+	DeltaFieldMap,
 	EncodedRevisionTag,
-	ChangeEncodingContext,
+	RevisionMetadataSource,
+	RevisionTag,
+	TaggedChange,
 } from "../../core/index.js";
-import { IdAllocator, Invariant, JsonCompatibleReadOnly } from "../../util/index.js";
-import { ICodecFamily, IJsonCodec } from "../../codec/index.js";
+import { IdAllocator, Invariant } from "../../util/index.js";
 import { MemoizedIdRangeAllocator } from "../memoizedIdRangeAllocator.js";
+
 import { CrossFieldManager } from "./crossFieldQueries.js";
-import { NodeChangeset } from "./modularChangeTypes.js";
+import { NodeId } from "./modularChangeTypes.js";
+import { EncodedNodeChangeset } from "./modularChangeFormat.js";
 
 /**
  * Functionality provided by a field kind which will be composed with other `FieldChangeHandler`s to
@@ -30,19 +32,13 @@ export interface FieldChangeHandler<
 	_typeCheck?: Invariant<TChangeset>;
 	readonly rebaser: FieldChangeRebaser<TChangeset>;
 	readonly codecsFactory: (
-		childCodec: IJsonCodec<
-			NodeChangeset,
-			JsonCompatibleReadOnly,
-			JsonCompatibleReadOnly,
-			ChangeEncodingContext
-		>,
 		revisionTagCodec: IJsonCodec<
 			RevisionTag,
 			EncodedRevisionTag,
 			EncodedRevisionTag,
 			ChangeEncodingContext
 		>,
-	) => ICodecFamily<TChangeset, ChangeEncodingContext>;
+	) => ICodecFamily<TChangeset, FieldChangeEncodingContext>;
 	readonly editor: TEditor;
 	intoDelta(
 		change: TaggedChange<TChangeset>,
@@ -103,7 +99,6 @@ export interface FieldChangeRebaser<TChangeset> {
 	 */
 	invert(
 		change: TaggedChange<TChangeset>,
-		invertChild: NodeChangeInverter,
 		isRollback: boolean,
 		genId: IdAllocator,
 		crossFieldManager: CrossFieldManager,
@@ -162,7 +157,7 @@ export interface FieldEditor<TChangeset> {
 	/**
 	 * Creates a changeset which represents the given `change` to the child at `childIndex` of this editor's field.
 	 */
-	buildChildChange(childIndex: number, change: NodeChangeset): TChangeset;
+	buildChildChange(childIndex: number, change: NodeId): TChangeset;
 }
 
 /**
@@ -170,12 +165,12 @@ export interface FieldEditor<TChangeset> {
  * The `index` should be `undefined` iff the child node does not exist in the input context (e.g., an inserted node).
  * @internal
  */
-export type ToDelta = (child: NodeChangeset) => DeltaFieldMap;
+export type ToDelta = (child: NodeId) => DeltaFieldMap;
 
 /**
  * @internal
  */
-export type NodeChangeInverter = (change: NodeChangeset) => NodeChangeset;
+export type NodeChangeInverter = (change: NodeId) => NodeId;
 
 /**
  * @internal
@@ -189,39 +184,45 @@ export enum NodeExistenceState {
  * @internal
  */
 export type NodeChangeRebaser = (
-	change: NodeChangeset | undefined,
-	baseChange: NodeChangeset | undefined,
+	change: NodeId | undefined,
+	baseChange: NodeId | undefined,
 	/**
 	 * Whether or not the node is alive or dead in the input context of change.
 	 * Defaults to Alive if undefined.
 	 */
 	state?: NodeExistenceState,
-) => NodeChangeset | undefined;
+) => NodeId | undefined;
 
 /**
  * @internal
  */
 export type NodeChangeComposer = (
-	change1: NodeChangeset | undefined,
-	change2: NodeChangeset | undefined,
-) => NodeChangeset;
+	change1: NodeId | undefined,
+	change2: NodeId | undefined,
+) => NodeId;
 
 /**
  * @internal
  */
-export type NodeChangePruner = (change: NodeChangeset) => NodeChangeset | undefined;
+export type NodeChangePruner = (change: NodeId) => NodeId | undefined;
 
 /**
  * A function that returns the set of removed roots that should be in memory for a given node changeset to be applied.
  *
  * @internal
  */
-export type RelevantRemovedRootsFromChild = (child: NodeChangeset) => Iterable<DeltaDetachedNodeId>;
+export type RelevantRemovedRootsFromChild = (child: NodeId) => Iterable<DeltaDetachedNodeId>;
 
 export interface RebaseRevisionMetadata extends RevisionMetadataSource {
 	readonly getBaseRevisions: () => RevisionTag[];
 }
 
+export interface FieldChangeEncodingContext {
+	readonly baseContext: ChangeEncodingContext;
+	encodeNode(nodeId: NodeId): EncodedNodeChangeset;
+	decodeNode(encodedNode: EncodedNodeChangeset): NodeId;
+}
+
 /**
  * @internal
  */

package/src/feature-libraries/modular-schema/fieldKind.ts

@@ -3,8 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { FieldKindIdentifier, FieldKindSpecifier } from "../../core/index.js";
-import { Multiplicity } from "../multiplicity.js";
+import {
+	FieldKindIdentifier,
+	FieldKindData,
+	Multiplicity,
+	SchemaPolicy,
+} from "../../core/index.js";
 
 /**
  * Functionality for FieldKinds that is stable,
@@ -28,7 +32,7 @@ import { Multiplicity } from "../multiplicity.js";
 export abstract class FlexFieldKind<
 	TName extends string = string,
 	TMultiplicity extends Multiplicity = Multiplicity,
-> implements FieldKindSpecifier
+> implements FieldKindData
 {
 	/**
 	 * @param identifier - Globally scoped identifier.
@@ -46,7 +50,7 @@ export abstract class FlexFieldKind<
  * The app must ensure consistency for all users of the document.
  * @internal
  */
-export interface FullSchemaPolicy {
+export interface FullSchemaPolicy extends SchemaPolicy {
 	/**
 	 * Policy information about FieldKinds:
 	 * This is typically stored as code, not in documents, and defines how to handles fields based on their kind.

package/src/feature-libraries/modular-schema/fieldKindConfiguration.ts

@@ -0,0 +1,24 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { FieldKindIdentifier } from "../../core/index.js";
+
+import { FieldKindWithEditor } from "./fieldKindWithEditor.js";
+
+/**
+ * Configuration for a single field kind.
+ */
+export interface FieldKindConfigurationEntry {
+	readonly kind: FieldKindWithEditor;
+	/**
+	 * The format to be used for encoding changesets for this field kind.
+	 */
+	readonly formatVersion: number;
+}
+
+/**
+ * Configuration for a set of field kinds.
+ */
+export type FieldKindConfiguration = ReadonlyMap<FieldKindIdentifier, FieldKindConfigurationEntry>;

package/src/feature-libraries/modular-schema/fieldKindWithEditor.ts

@@ -3,17 +3,19 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import {
-	TreeFieldStoredSchema,
 	FieldKindIdentifier,
+	TreeFieldStoredSchema,
 	TreeStoredSchema,
 	TreeTypeSet,
+	Multiplicity,
 } from "../../core/index.js";
-import { Multiplicity } from "../multiplicity.js";
-import { isNeverField } from "./isNeverTree.js";
+
 import { FieldChangeHandler, FieldEditor } from "./fieldChangeHandler.js";
 import { FlexFieldKind, FullSchemaPolicy } from "./fieldKind.js";
+import { isNeverField } from "./isNeverTree.js";
 
 /**
  * Functionality for FieldKinds that is stable,
@@ -73,7 +75,7 @@ export class FieldKindWithEditor<
 	): boolean {
 		if (
 			isNeverField(policy, originalData, {
-				kind: this,
+				kind: this.identifier,
 				types: originalTypes,
 			})
 		) {