@fluidframework/tree 2.81.0-374083 → 2.81.1

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

@@ -18,6 +18,7 @@ import {
 	makeVersionedValidatedCodec,
 } from "../../codec/index.js";
 import type { FieldKey, ITreeCursorSynchronous } from "../../core/index.js";
+import { brand } from "../../util/index.js";
 import type { FieldBatchCodec, FieldBatchEncodingContext } from "../chunked-forest/index.js";
 
 import {
@@ -26,7 +27,6 @@ import {
 	type Format,
 	FormatCommon,
 } from "./formatCommon.js";
-import { brand } from "../../util/index.js";
 
 /**
  * Uses field cursors

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

@@ -41,27 +41,27 @@ import {
 	type FieldBatchEncodingContext,
 	type IncrementalEncodingPolicy,
 } from "../chunked-forest/index.js";
+import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 
 import {
 	clientVersionToForestFormatVersion,
 	type ForestCodec,
 	makeForestSummarizerCodec,
 } from "./codec.js";
+import { ForestFormatVersion } from "./formatCommon.js";
 import {
 	ForestIncrementalSummaryBehavior,
 	ForestIncrementalSummaryBuilder,
 } from "./incrementalSummaryBuilder.js";
-import {
-	minVersionToForestSummaryFormatVersion,
-	getForestRootSummaryContentKey,
-} from "./summaryTypes.js";
-import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
-import { ForestFormatVersion } from "./formatCommon.js";
 import {
 	ForestSummaryFormatVersion,
 	forestSummaryKey,
 	supportedForestSummaryFormatVersions,
 } from "./summaryFormatCommon.js";
+import {
+	minVersionToForestSummaryFormatVersion,
+	getForestRootSummaryContentKey,
+} from "./summaryTypes.js";
 
 /**
  * Provides methods for summarizing and loading a forest.

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

@@ -6,6 +6,7 @@
 import type { Static } from "@sinclair/typebox";
 
 import { brand } from "../../util/index.js";
+
 import { FormatCommon, ForestFormatVersion } from "./formatCommon.js";
 
 export const FormatV1 = FormatCommon(brand<ForestFormatVersion>(ForestFormatVersion.v1));

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

@@ -6,6 +6,7 @@
 import type { Static } from "@sinclair/typebox";
 
 import { brand } from "../../util/index.js";
+
 import { FormatCommon, ForestFormatVersion } from "./formatCommon.js";
 
 export const FormatV2 = FormatCommon(brand<ForestFormatVersion>(ForestFormatVersion.v2));

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

@@ -3,9 +3,17 @@
  * Licensed under the MIT License.
  */
 
+import type { IFluidHandle } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
+import { SummaryType } from "@fluidframework/driver-definitions";
+import type { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 import type { IExperimentalIncrementalSummaryContext } from "@fluidframework/runtime-definitions/internal";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
+import { LoggingError } from "@fluidframework/telemetry-utils/internal";
+
+import type { ITreeCursorSynchronous } from "../../core/index.js";
+import type { SummaryElementStringifier } from "../../shared-tree-core/index.js";
 import {
 	brand,
 	setInNestedMap,
@@ -20,13 +28,7 @@ import type {
 	IncrementalEncodingPolicy,
 	TreeChunk,
 } from "../chunked-forest/index.js";
-import type { ITreeCursorSynchronous } from "../../core/index.js";
-import { SummaryType } from "@fluidframework/driver-definitions";
-import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
-import type { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
-import { LoggingError } from "@fluidframework/telemetry-utils/internal";
-import type { IFluidHandle } from "@fluidframework/core-interfaces";
-import type { SummaryElementStringifier } from "../../shared-tree-core/index.js";
+
 import { summaryContentBlobKey } from "./summaryFormatV3.js";
 
 /**

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

@@ -10,6 +10,7 @@ import {
 } from "@fluidframework/runtime-utils/internal";
 
 import { FluidClientVersion } from "../../codec/index.js";
+
 import { ForestSummaryFormatVersion } from "./summaryFormatCommon.js";
 import { summaryContentBlobKey as summaryContentBlobKeyV1ToV2 } from "./summaryFormatV1ToV2.js";
 import { summaryContentBlobKey as summaryContentBlobKeyV3 } from "./summaryFormatV3.js";

package/src/feature-libraries/index.ts

@@ -69,9 +69,7 @@ export {
 	type NodeChangeInverter,
 	type NodeChangeRebaser,
 	type NodeChangePruner,
-	type ComposeNodeManager,
-	type InvertNodeManager,
-	type RebaseNodeManager,
+	type CrossFieldManager,
 	CrossFieldTarget,
 	FlexFieldKind,
 	type FullSchemaPolicy,
@@ -81,6 +79,7 @@ export {
 	type HasFieldChanges,
 	type NodeExistsConstraint,
 	ModularChangeFamily,
+	type RelevantRemovedRootsFromChild,
 	EncodedModularChangesetV1,
 	EncodedModularChangesetV2,
 	updateRefreshers,
@@ -92,11 +91,7 @@ export {
 	DefaultRevisionReplacer,
 } from "./modular-schema/index.js";
 
-export {
-	mapRootChanges,
-	nodeIdFromChangeAtom,
-	changeAtomFromDetachedNodeId,
-} from "./deltaUtils.js";
+export { mapRootChanges } from "./deltaUtils.js";
 
 export {
 	type TreeChunk,
@@ -131,32 +126,18 @@ export {
 
 export {
 	FieldKinds,
-	type Required,
-	type Optional,
-	type Sequence,
-	type Identifier,
-	type Forbidden,
 	type DefaultChangeset,
-	type DetachedRootIds,
 	DefaultChangeFamily,
-	type IdBasedChangeFamilyDataEditor,
-	DefaultIdBasedDataEditor,
-	type DataEditor,
-	type RequiredFieldEditor,
-	type OptionalFieldEditor,
-	type SequenceFieldEditor,
+	DefaultEditBuilder,
+	type IDefaultEditBuilder,
+	type ValueFieldEditBuilder,
+	type OptionalFieldEditBuilder,
+	type SequenceFieldEditBuilder,
 	defaultSchemaPolicy,
 	fieldKinds,
 	fieldKindConfigurations,
 	intoDelta,
 	relevantRemovedRoots,
-	getBuildsIds,
-	type DetachedRootLocation,
-	type DetachedRootsLocation,
-	type DetachedRootIdRange,
-	type Locator,
-	LocationBasedDataEditor,
-	type ILocationBasedDataEditor,
 	getCodecTreeForModularChangeFormat,
 	type ModularChangeFormatVersion,
 } from "./default-schema/index.js";

package/src/feature-libraries/mapTreeCursor.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, debugAssert } from "@fluidframework/core-utils/internal";
+import { assert } from "@fluidframework/core-utils/internal";
 
 import {
 	CursorLocationType,
@@ -19,6 +19,7 @@ import {
 	rootField,
 	rootFieldKey,
 } from "../core/index.js";
+import type { requireAssignableTo } from "../util/index.js";
 
 import {
 	type CursorAdapter,
@@ -27,7 +28,6 @@ import {
 	stackTreeFieldCursor,
 	stackTreeNodeCursor,
 } from "./treeCursorUtils.js";
-import type { requireAssignableTo } from "../util/index.js";
 
 /**
  * A generic variant of {@link MapTree} that can be used to strongly type trees implementing a MapTree-like API.
@@ -161,7 +161,6 @@ export function mapTreeFromCursor(cursor: ITreeCursor): ExclusiveMapTree {
 	const fields: Map<FieldKey, ExclusiveMapTree[]> = new Map();
 	for (let inField = cursor.firstField(); inField; inField = cursor.nextField()) {
 		const field: ExclusiveMapTree[] = mapCursorField(cursor, mapTreeFromCursor);
-		debugAssert(() => field.length > 0 || "field must have at least one child");
 		fields.set(cursor.getFieldKey(), field);
 	}
 

package/src/feature-libraries/mitigatedChangeFamily.ts

@@ -7,7 +7,6 @@ import type {
 	ChangeFamily,
 	ChangeFamilyEditor,
 	ChangeRebaser,
-	EditorOptions,
 	RevisionMetadataSource,
 	RevisionReplacer,
 	RevisionTag,
@@ -37,9 +36,8 @@ export function makeMitigatedChangeFamily<TEditor extends ChangeFamilyEditor, TC
 		buildEditor: (
 			mintRevisionTag: () => RevisionTag,
 			changeReceiver: (change: TaggedChange<TChange>) => void,
-			options?: EditorOptions,
 		): TEditor => {
-			return unmitigatedChangeFamily.buildEditor(mintRevisionTag, changeReceiver, options);
+			return unmitigatedChangeFamily.buildEditor(mintRevisionTag, changeReceiver);
 		},
 		rebaser: makeMitigatedRebaser(unmitigatedChangeFamily.rebaser, fallbackChange, onError),
 		codecs: unmitigatedChangeFamily.codecs,

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

@@ -16,13 +16,23 @@ import type { NodeId } from "./modularChangeTypes.js";
 export type CrossFieldMap<T> = ChangeAtomIdRangeMap<T>;
 export type CrossFieldQuerySet = CrossFieldMap<boolean>;
 
+export function addCrossFieldQuery(
+	set: CrossFieldQuerySet,
+	revision: RevisionTag | undefined,
+	id: ChangesetLocalId,
+	count: number,
+): void {
+	setInCrossFieldMap(set, revision, id, count, true);
+}
+
 export function setInCrossFieldMap<T>(
 	map: CrossFieldMap<T>,
-	id: ChangeAtomId,
+	revision: RevisionTag | undefined,
+	id: ChangesetLocalId,
 	count: number,
 	value: T,
 ): void {
-	map.set(id, count, value);
+	map.set({ revision, localId: id }, count, value);
 }
 
 export function getFirstFromCrossFieldMap<T>(
@@ -30,168 +40,60 @@ export function getFirstFromCrossFieldMap<T>(
 	revision: RevisionTag | undefined,
 	id: ChangesetLocalId,
 	count: number,
-): RangeQueryResult<T | undefined> {
+): RangeQueryResult<ChangeAtomId, T> {
 	return map.getFirst({ revision, localId: id }, count);
 }
 
-// TODO: Rename to NodeMoveType(Attach | Detach)
 export enum CrossFieldTarget {
 	Source,
 	Destination,
 }
 
-export interface InvertNodeManager {
-	/**
-	 * Transfers the given node changes from the input context of the field changeset being inverted to the input context of the detached space (from which it may be further moved).
-	 *
-	 * This must be called for each detach in the field kind when rolling-back or undoing an detach.
-	 * This implies that all detaches in the field must be inverted.
-	 * @param detachId - The ID of the detach to invert.
-	 * @param count - The number of nodes being detached.
-	 * @param nodeChanges - The node changes to transfer.
-	 * @param newAttachId - The ID that the nodes will be attached with in the inverted changeset of this field.
-	 */
-	invertDetach(
-		detachId: ChangeAtomId,
-		count: number,
-		nodeChanges: NodeId | undefined,
-		newAttachId: ChangeAtomId,
-	): void;
-
-	/**
-	 * Gets the node changes associated with the node being attached in input changeset.
-	 *
-	 * This must be called for each attach in the field kind when rolling-back or undoing an attach.
-	 * This implies that all attaches in the field must be inverted.
-	 * @param attachId - The ID of the attach to invert.
-	 * @param count - The number of nodes being attached.
-	 */
-	invertAttach(
-		attachId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<DetachedNodeEntry | undefined>;
-}
-
-export interface ComposeNodeManager {
-	/**
-	 * Allows a field kind to query nested changes associated with a node in the input context of the new changeset.
-	 * This should be called for every detach in the base changeset.
-	 * @param baseDetachId - The ID of the detach in the base changeset.
-	 * @param count - The number of nodes being detached.
-	 */
-	getNewChangesForBaseDetach(
-		baseDetachId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<DetachedNodeEntry | undefined>;
-
+/**
+ * Used by {@link FieldChangeHandler} implementations for exchanging information across other fields
+ * while rebasing, composing, or inverting a change.
+ */
+export interface CrossFieldManager<T = unknown> {
 	/**
-	 * Must be called by a field kind when composing an attach in the base changeset with a detach in the new changeset.
-	 * This allows Modular Change Family to keep track of how a given node is being renamed.
-	 * @param baseAttachId - The ID of the attach in the base changeset.
-	 * @param newDetachId - The ID of the detach in the new changeset.
-	 * @param count - The number of nodes being attached then detached.
+	 * Returns the first data range associated with the key of `target`, `revision`, between `id` and `id + count`.
+	 * Calling this records a dependency for the current field on this key if `addDependency` is true.
 	 */
-	composeAttachDetach(
-		baseAttachId: ChangeAtomId,
-		newDetachId: ChangeAtomId,
+	get(
+		target: CrossFieldTarget,
+		revision: RevisionTag | undefined,
+		id: ChangesetLocalId,
 		count: number,
-	): void;
-
-	/**
-	 * Must be called by a field kind when composing an attach in the base changeset with nested changes the new changeset.
-	 *
-	 * This is needed because child changes are represented at the location of the node they impact in the input context of a changeset.
-	 * So if the later of the two changes being composed carries nested changes for a node,
-	 * then in the composed changeset, these nested changes must to be represented at the location of that node in the input context of the composed changeset.
-	 *
-	 * @param baseAttachId - The ID of the attach in the base changeset.
-	 * @param newChanges - The ID of the nested changes associated with this node in the new changeset.
-	 */
-	sendNewChangesToBaseSourceLocation(baseAttachId: ChangeAtomId, newChanges: NodeId): void;
+		addDependency: boolean,
+	): RangeQueryResult<ChangeAtomId, T>;
 
-	// XXX: It doesn't seem like it should be mandatory to call this if you don't want the rename to be removed (e.g., optional field pin).
 	/**
-	 * Must be called by a field kind when composing a detach in the base changeset with an attach of the same nodes in the new changeset.
-	 * @param baseDetachId - The ID of the detach in the base changeset.
-	 * @param newAttachId - The ID of the attach in the new changeset.
-	 * @param count - The number of nodes being detached then attached.
-	 * @param convertToPin - Should be set to true if the composed change will include a detach and attach with `newAttachId`.
-	 * Otherwise the composed change should not include either `baseDetachId` or `newAttachId`.
+	 * Sets the range of keys to `newValue`.
+	 * If `invalidateDependents` is true, all fields which took a dependency on this key will be considered invalidated
+	 * and will be given a chance to address the new data in `amendCompose`, or a second pass of `rebase` or `invert` as appropriate.
 	 */
-	composeDetachAttach(
-		baseDetachId: ChangeAtomId,
-		newAttachId: ChangeAtomId,
+	set(
+		target: CrossFieldTarget,
+		revision: RevisionTag | undefined,
+		id: ChangesetLocalId,
 		count: number,
-		convertToPin: boolean,
+		newValue: T,
+		invalidateDependents: boolean,
 	): void;
-}
 
-export interface RebaseNodeManager {
-	// XXX: It's not clear whether the returned changes are already rebased or not.
 	/**
-	 * Must be called by a field kind when rebasing over an attach.
-	 * The returned child changes and detach intentions must be represented in the output changeset.
-	 * @param baseAttachId - The ID of the attach that is being rebased over.
-	 * @param count - The number of nodes attached by the base attach.
-	 * @returns The new nested changes and detach intentions associated with the node in the changeset being rebased.
+	 * This must be called whenever a new node is moved into this field as part of the current rebase, compose, or invert.
+	 * Calling this for a node which was already in the field is tolerated.
 	 */
-	getNewChangesForBaseAttach(
-		baseAttachId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<RebaseDetachedNodeEntry | undefined>;
+	onMoveIn(id: NodeId): void;
 
-	// XXX: It's not clear if this must be called even when newDetachId and nodeChange are undefined.
-	// XXX: It's not clear if it's okay to call this once with a newDetachId then once with a nodeChange.
-	// XXX: It's not clear if nodeChange should be rebased already, or should not be rebased, or if it doesn't matter.
 	/**
-	 * Must be called by a field kind when rebasing over a detach.
-	 * The field kind must provide the nested changes and detach intentions associated with the node in the changeset being rebased.
-	 * @param baseDetachId - The ID of the detach that is being rebased over.
-	 * @param count - The number of nodes detached by the base detach.
-	 * @param newDetachId - The ID associated the detach intention (if any) for these nodes in the rebased changeset.
-	 * @param nodeChange - The nested changes (if any) associated with this node in the rebased changeset.
-	 * @param newDetachCellId - An additional ID to associate with this node.
-	 * This ID will be included in the result of {@link getNewChangesForBaseAttach}.
-	 * This is only used by sequence field for compatibility with earlier client versions.
+	 * This must be called whenever a new cross field key is moved into this field as part of the current rebase or compose.
+	 * Calling this for a key which was already in the field is tolerated.
 	 */
-	rebaseOverDetach(
-		baseDetachId: ChangeAtomId,
+	moveKey(
+		target: CrossFieldTarget,
+		revision: RevisionTag | undefined,
+		id: ChangesetLocalId,
 		count: number,
-		newDetachId: ChangeAtomId | undefined,
-		nodeChange: NodeId | undefined,
-		newDetachCellId?: ChangeAtomId,
 	): void;
-
-	addDetach(id: ChangeAtomId, count: number): void;
-	removeDetach(id: ChangeAtomId, count: number): void;
-
-	/**
-	 * Returns whether nodes which were either previously detached by `id` or the base changeset is now detaching with `id`
-	 * are also reattached by the base changeset.
-	 */
-	doesBaseAttachNodes(id: ChangeAtomId, count: number): RangeQueryResult<boolean>;
-
-	/**
-	 * Returns the root ID the base change renames `id` to, if any.
-	 */
-	getBaseRename(id: ChangeAtomId, count: number): RangeQueryResult<ChangeAtomId | undefined>;
-
-	/**
-	 * Given a detached node ID in the base changeset's output context,
-	 * returns the ID the rebased changeset renames that ID to, if any.
-	 */
-	getNewRenameForBaseRename(
-		baseRenameTo: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<ChangeAtomId | undefined>;
-}
-
-export interface DetachedNodeEntry {
-	nodeChange?: NodeId;
-	detachId?: ChangeAtomId;
-}
-
-export interface RebaseDetachedNodeEntry extends DetachedNodeEntry {
-	// This is only needed for sequence field to implement detach cell IDs.
-	cellRename?: ChangeAtomId;
 }

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

@@ -5,9 +5,10 @@
 
 import type { ICodecFamily, IJsonCodec } from "../../codec/index.js";
 import type {
-	ChangeAtomId,
-	ChangeAtomIdRangeMap,
 	ChangeEncodingContext,
+	DeltaDetachedNodeChanges,
+	DeltaDetachedNodeId,
+	DeltaDetachedNodeRename,
 	DeltaFieldChanges,
 	DeltaFieldMap,
 	EncodedRevisionTag,
@@ -15,17 +16,35 @@ import type {
 	RevisionReplacer,
 	RevisionTag,
 } from "../../core/index.js";
-import type { IdAllocator, Invariant, RangeQueryResult } from "../../util/index.js";
-import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
-import type {
-	ComposeNodeManager,
-	InvertNodeManager,
-	RebaseNodeManager,
-} from "./crossFieldQueries.js";
+import type { IdAllocator, Invariant } from "../../util/index.js";
+
+import type { CrossFieldManager } from "./crossFieldQueries.js";
 import type { EncodedNodeChangeset } from "./modularChangeFormatV1.js";
-import type { CrossFieldKeyRange, NodeId, RebaseVersion } from "./modularChangeTypes.js";
+import type { CrossFieldKeyRange, NodeId } from "./modularChangeTypes.js";
+
+export type NestedChangesIndices = [
+	NodeId,
+	number | undefined /* inputIndex */,
+	number | undefined /* outputIndex */,
+][];
 
-export type NestedChangesIndices = [NodeId, number /* inputIndex */][];
+/**
+ * The return value of calling {@link FieldChangeHandler.intoDelta}.
+ */
+export interface FieldChangeDelta {
+	/**
+	 * {@inheritdoc DeltaFieldChanges}
+	 */
+	readonly local?: DeltaFieldChanges;
+	/**
+	 * {@inheritdoc DeltaRoot.global}
+	 */
+	readonly global?: readonly DeltaDetachedNodeChanges[];
+	/**
+	 * {@inheritdoc DeltaRoot.rename}
+	 */
+	readonly rename?: readonly DeltaDetachedNodeRename[];
+}
 
 /**
  * Functionality provided by a field kind which will be composed with other `FieldChangeHandler`s to
@@ -46,7 +65,27 @@ export interface FieldChangeHandler<
 		>,
 	) => ICodecFamily<TChangeset, FieldChangeEncodingContext>;
 	readonly editor: TEditor;
-	intoDelta(change: TChangeset, deltaFromChild: ToDelta): DeltaFieldChanges;
+	intoDelta(change: TChangeset, deltaFromChild: ToDelta): FieldChangeDelta;
+	/**
+	 * Returns the set of removed roots that should be in memory for the given change to be applied.
+	 * A removed root is relevant if any of the following is true:
+	 * - It is being inserted
+	 * - It is being restored
+	 * - It is being edited
+	 * - The ID it is associated with is being changed
+	 *
+	 * Implementations are allowed to be conservative by returning more removed roots than strictly necessary
+	 * (though they should, for the sake of performance, try to avoid doing so).
+	 *
+	 * Implementations are not allowed to return IDs for non-root trees, even if they are removed.
+	 *
+	 * @param change - The change to be applied.
+	 * @param relevantRemovedRootsFromChild - Delegate for collecting relevant removed roots from child changes.
+	 */
+	readonly relevantRemovedRoots: (
+		change: TChangeset,
+		relevantRemovedRootsFromChild: RelevantRemovedRootsFromChild,
+	) => Iterable<DeltaDetachedNodeId>;
 
 	/**
 	 * Returns whether this change is empty, meaning that it represents no modifications to the field
@@ -91,7 +130,7 @@ export interface FieldChangeRebaser<TChangeset> {
 		change2: TChangeset,
 		composeChild: NodeChangeComposer,
 		genId: IdAllocator,
-		nodeManager: ComposeNodeManager,
+		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RevisionMetadataSource,
 	): TChangeset;
 
@@ -104,11 +143,10 @@ export interface FieldChangeRebaser<TChangeset> {
 		isRollback: boolean,
 		genId: IdAllocator,
 		revision: RevisionTag | undefined,
-		nodeManager: InvertNodeManager,
+		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RevisionMetadataSource,
 	): TChangeset;
 
-	// XXX: It's not clear whether `rebaseChild` must be called in all cases.
 	/**
 	 * Rebase `change` over `over`.
 	 * See `ChangeRebaser` for details.
@@ -118,9 +156,8 @@ export interface FieldChangeRebaser<TChangeset> {
 		over: TChangeset,
 		rebaseChild: NodeChangeRebaser,
 		genId: IdAllocator,
-		nodeManager: RebaseNodeManager,
+		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RebaseRevisionMetadata,
-		rebaseVersion: RebaseVersion,
 	): TChangeset;
 
 	/**
@@ -209,7 +246,10 @@ export type NodeChangeComposer = (
 
 export type NodeChangePruner = (change: NodeId) => NodeId | undefined;
 
-export type HasDetachedChanges = (detachId: ChangeAtomId, count: number) => boolean;
+/**
+ * A function that returns the set of removed roots that should be in memory for a given node changeset to be applied.
+ */
+export type RelevantRemovedRootsFromChild = (child: NodeId) => Iterable<DeltaDetachedNodeId>;
 
 export interface RebaseRevisionMetadata extends RevisionMetadataSource {
 	readonly getRevisionToRebase: () => RevisionTag | undefined;
@@ -218,20 +258,6 @@ export interface RebaseRevisionMetadata extends RevisionMetadataSource {
 
 export interface FieldChangeEncodingContext {
 	readonly baseContext: ChangeEncodingContext;
-	readonly rootNodeChanges: ChangeAtomIdBTree<NodeId>;
-	readonly rootRenames: ChangeAtomIdRangeMap<ChangeAtomId>;
 	encodeNode(nodeId: NodeId): EncodedNodeChangeset;
-	getInputRootId(
-		outputRootId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<ChangeAtomId | undefined>;
-
-	isAttachId(id: ChangeAtomId, count: number): RangeQueryResult<boolean>;
-	isDetachId(id: ChangeAtomId, count: number): RangeQueryResult<boolean>;
-
 	decodeNode(encodedNode: EncodedNodeChangeset): NodeId;
-	decodeRootNodeChange(detachId: ChangeAtomId, encodedNode: EncodedNodeChangeset): void;
-	decodeRootRename(oldId: ChangeAtomId, newId: ChangeAtomId, count: number): void;
-	decodeMoveAndDetach(detachId: ChangeAtomId, count: number): void;
-	generateId(): ChangeAtomId;
 }

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

@@ -4,6 +4,7 @@
  */
 
 import type { FieldKindIdentifier } from "../../core/index.js";
+
 import type { FlexFieldKind } from "./fieldKind.js";
 
 /**