@fluidframework/tree 2.90.0-378676 → 2.91.0

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

@@ -3,12 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import type {
-	ChangeAtomId,
-	ChangeAtomIdRangeMap,
-	ChangesetLocalId,
-	RevisionTag,
-} from "../../core/index.js";
+import type { ChangeAtomIdRangeMap, ChangesetLocalId, RevisionTag } from "../../core/index.js";
 import type { RangeQueryResult } from "../../util/index.js";
 
 import type { NodeId } from "./modularChangeTypes.js";
@@ -16,13 +11,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>(
@@ -34,163 +39,56 @@ export function getFirstFromCrossFieldMap<T>(
 	return map.getFirst({ revision, localId: id }, count);
 }
 
-export enum NodeMoveType {
-	Detach,
-	Attach,
-}
-
-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 reverting a 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 reverting a 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 enum CrossFieldTarget {
+	Source,
+	Destination,
 }
 
-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 need 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<T | undefined>;
 
-	// 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/defaultRevisionReplacer.ts

@@ -60,14 +60,13 @@ export class DefaultRevisionReplacer implements RevisionReplacer {
 				const prior = this.updatedLocalIds.getFirst(remainderStart, remainderCount);
 				if (prior.value === undefined) {
 					const defaultOutputId = continuingOutputId ?? remainderStart.localId;
-					const newLocalId =
-						this.localIds.getAll(defaultOutputId, prior.length).length > 0
-							? // Some of the IDs in this range have already been used in the scope of the updated revision.
-								// We need to allocate new local IDs.
-								brand<ChangesetLocalId>(this.maxSeen + 1)
-							: // This change atom ID uses a local ID that has not yet been used in the scope of the updated revision.
-								// We reuse it as is to minimize the number of IDs that need to be updated.
-								defaultOutputId;
+					const newLocalId = this.areAllUnallocated(defaultOutputId, prior.length)
+						? // This change atom ID uses a local ID that has not yet been used in the scope of the updated revision.
+							// We reuse it as is to minimize the number of IDs that need to be updated.
+							defaultOutputId
+						: // Some of the IDs in this range have already been used in the scope of the updated revision.
+							// We need to allocate new local IDs.
+							brand<ChangesetLocalId>(this.maxSeen + 1);
 
 					this.maxSeen = brand(Math.max(this.maxSeen, newLocalId + prior.length - 1));
 					this.localIds.set(newLocalId, prior.length, true);
@@ -93,4 +92,13 @@ export class DefaultRevisionReplacer implements RevisionReplacer {
 		}
 		return id;
 	}
+
+	private areAllUnallocated(id: ChangesetLocalId, count: number): boolean {
+		for (const entry of this.localIds.getAll(id, count)) {
+			if (entry.value !== undefined) {
+				return false;
+			}
+		}
+		return true;
+	}
 }

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,18 +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 { IdAllocator, Invariant } from "../../util/index.js";
 
-import type {
-	ComposeNodeManager,
-	InvertNodeManager,
-	RebaseNodeManager,
-} from "./crossFieldQueries.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 = readonly (readonly [NodeId, inputIndex: number])[];
+/**
+ * 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
@@ -47,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
@@ -76,12 +114,6 @@ export interface FieldChangeHandler<
 	 */
 	getCrossFieldKeys(change: TChangeset): CrossFieldKeyRange[];
 
-	// XXX: Document
-	getDetachCellIds(
-		change: TChangeset,
-		rootRenames: ChangeAtomIdRangeMap<ChangeAtomId>,
-	): { detachId: ChangeAtomId; cellId: ChangeAtomId; count: number }[];
-
 	createEmpty(): TChangeset;
 }
 
@@ -98,7 +130,7 @@ export interface FieldChangeRebaser<TChangeset> {
 		change2: TChangeset,
 		composeChild: NodeChangeComposer,
 		genId: IdAllocator,
-		nodeManager: ComposeNodeManager,
+		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RevisionMetadataSource,
 	): TChangeset;
 
@@ -111,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.
@@ -125,9 +156,8 @@ export interface FieldChangeRebaser<TChangeset> {
 		over: TChangeset,
 		rebaseChild: NodeChangeRebaser,
 		genId: IdAllocator,
-		nodeManager: RebaseNodeManager,
+		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RebaseRevisionMetadata,
-		rebaseVersion: RebaseVersion,
 	): TChangeset;
 
 	/**
@@ -216,6 +246,11 @@ export type NodeChangeComposer = (
 
 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.
+ */
+export type RelevantRemovedRootsFromChild = (child: NodeId) => Iterable<DeltaDetachedNodeId>;
+
 export interface RebaseRevisionMetadata extends RevisionMetadataSource {
 	readonly getRevisionToRebase: () => RevisionTag | undefined;
 	readonly getBaseRevisions: () => RevisionTag[];
@@ -223,96 +258,6 @@ export interface RebaseRevisionMetadata extends RevisionMetadataSource {
 
 export interface FieldChangeEncodingContext {
 	readonly baseContext: ChangeEncodingContext;
-
-	/**
-	 * A map from root ID to node ID, containing all roots which were last detached from this field.
-	 * The field must encode these root node changes.
-	 * This is only needed when encoding to a ModularChangeFormat older than v3,
-	 * as in those versions, changes to root nodes were represented in the field they were last detached from.
-	 * This should only be used during encoding.
-	 */
-	readonly rootNodeChanges: ChangeAtomIdBTree<NodeId>;
-
-	/**
-	 * A map from input context root ID to output context root ID, containing all roots which were last detached from this field.
-	 * The field must encode these renames.
-	 * This is only needed when encoding to a ModularChangeFormat older than v3,
-	 * as in those versions, root node renames were represented in the field they were last detached from.
-	 * This should only be used during encoding.
-	 */
-	readonly rootRenames: ChangeAtomIdRangeMap<ChangeAtomId>;
-
-	// This should only be called during encoding.
 	encodeNode(nodeId: NodeId): EncodedNodeChangeset;
-
-	/**
-	 * Returns the input context root ID from an output context root ID.
-	 * This is only needed for encoding to sequence field format v3 and older.
-	 * This should only be called during encoding.
-	 */
-	getInputRootId(
-		outputRootId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<ChangeAtomId | undefined>;
-
-	/**
-	 * Returns the input context root ID from an output context root ID.
-	 * This is only needed for encoding to sequence field format v3 and older.
-	 * This should only be called during encoding.
-	 */
-	isAttachId(id: ChangeAtomId, count: number): RangeQueryResult<boolean>;
-
-	/**
-	 * Returns whether `id` is used as a detach ID in this changeset.
-	 * This is only needed for encoding to sequence field format v3 and older.
-	 * This should only be called during encoding.
-	 */
-	isDetachId(id: ChangeAtomId, count: number): RangeQueryResult<boolean>;
-
-	/**
-	 * Returns the detach cell ID for the attach associated with `moveId`.
-	 * If there is no associated detach cell ID, or the ID is the same as `moveId`,
-	 * this will return undefined.
-	 * This is only needed for encoding to sequence field format v3 and older.
-	 * This should only be called during encoding.
-	 */
-	getCellIdForMove(
-		moveId: ChangeAtomId,
-		count: number,
-	): RangeQueryResult<ChangeAtomId | undefined>;
-
-	// This should only be called during decoding.
 	decodeNode(encodedNode: EncodedNodeChangeset): NodeId;
-
-	/**
-	 * Must be called for each root node changeset encoded in this field.
-	 * This is only needed when encoding to a ModularChangeFormat older than v3,
-	 * as in those versions, changes to root node were represented in the field they were last detached from.
-	 * This should only be called during decoding.
-	 */
-	decodeRootNodeChange(detachId: ChangeAtomId, encodedNode: EncodedNodeChangeset): void;
-
-	/**
-	 * Must be called for each root node rename encoded in this field.
-	 * This is only needed when encoding to a ModularChangeFormat older than v3,
-	 * as in those versions, root node renames were represented in the field they were last detached from.
-	 * This should only be called during decoding.
-	 */
-	decodeRootRename(oldId: ChangeAtomId, newId: ChangeAtomId, count: number): void;
-
-	/**
-	 * Must be called for each node which has its detach location changed to this field.
-	 * The node may be either detached by this change, or already detached in this change's input context.
-	 * This is only needed when encoding to a ModularChangeFormat older than v3,
-	 * as in those versions, root node locations were represented in the field they were last detached from.
-	 * This should only be called during decoding.
-	 */
-	decodeMoveAndDetach(detachId: ChangeAtomId, count: number): void;
-
-	/**
-	 * Generates a new ChangeAtomId which has not been used in this changeset.
-	 * This is only needed for decoding optional field format v2 and older.
-	 * This should only be called during decoding.
-	 */
-	generateId(): ChangeAtomId;
 }

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

@@ -7,20 +7,22 @@ import { assert } from "@fluidframework/core-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 
 import {
+	type DeltaDetachedNodeId,
 	type DeltaMark,
 	type FieldKindIdentifier,
 	Multiplicity,
-	type DeltaFieldChanges,
 	type RevisionReplacer,
 } from "../../core/index.js";
 import { brandConst } from "../../util/index.js";
 
 import type {
+	FieldChangeDelta,
 	FieldChangeHandler,
 	NestedChangesIndices,
 	NodeChangeComposer,
 	NodeChangePruner,
 	NodeChangeRebaser,
+	RelevantRemovedRootsFromChild,
 	ToDelta,
 } from "./fieldChangeHandler.js";
 import { FlexFieldKind } from "./fieldKind.js";
@@ -34,7 +36,7 @@ import type { NodeId } from "./modularChangeTypes.js";
 export const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {
 	rebaser: {
 		compose,
-		invert: (change): GenericChangeset => change,
+		invert: (change: GenericChangeset): GenericChangeset => change,
 		rebase: rebaseGenericChange,
 		prune: pruneGenericChange,
 		replaceRevisions,
@@ -46,7 +48,7 @@ export const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {
 			return newGenericChangeset([...changes]);
 		},
 	},
-	intoDelta: (change: GenericChangeset, deltaFromChild: ToDelta): DeltaFieldChanges => {
+	intoDelta: (change: GenericChangeset, deltaFromChild: ToDelta): FieldChangeDelta => {
 		let nodeIndex = 0;
 		const markList: DeltaMark[] = [];
 		for (const [index, nodeChange] of change.entries()) {
@@ -58,13 +60,13 @@ export const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {
 			markList.push({ count: 1, fields: deltaFromChild(nodeChange) });
 			nodeIndex += 1;
 		}
-		return { marks: markList };
+		return { local: { marks: markList } };
 	},
+	relevantRemovedRoots,
 	isEmpty: (change: GenericChangeset): boolean => change.length === 0,
 	getNestedChanges,
 	createEmpty: newGenericChangeset,
 	getCrossFieldKeys: (_change) => [],
-	getDetachCellIds: (_change) => [],
 };
 
 function compose(
@@ -84,7 +86,7 @@ function compose(
 
 function getNestedChanges(change: GenericChangeset): NestedChangesIndices {
 	// For generic changeset, the indices in the input and output contexts are the same.
-	return change.toArray().map(([index, nodeChange]) => [nodeChange, index]);
+	return change.toArray().map(([index, nodeChange]) => [nodeChange, index, index]);
 }
 
 function rebaseGenericChange(
@@ -146,7 +148,7 @@ function pruneGenericChange(
 	for (const [index, node] of changeset.entries()) {
 		const prunedNode = pruneChild(node);
 		if (prunedNode !== undefined) {
-			pruned.set(index, prunedNode);
+			pruned.set(index, node);
 		}
 	}
 	return pruned;
@@ -184,3 +186,12 @@ export function convertGenericChange<TChange>(
 ): TChange {
 	return target.editor.buildChildChanges(changeset.entries());
 }
+
+function* relevantRemovedRoots(
+	change: GenericChangeset,
+	relevantRemovedRootsFromChild: RelevantRemovedRootsFromChild,
+): Iterable<DeltaDetachedNodeId> {
+	for (const nodeChange of change.values()) {
+		yield* relevantRemovedRootsFromChild(nodeChange);
+	}
+}

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

@@ -12,13 +12,11 @@ export {
 } from "./comparison.js";
 export { isNeverField, isNeverTree } from "./isNeverTree.js";
 export {
-	type InvertNodeManager,
-	type RebaseNodeManager,
-	type ComposeNodeManager,
+	addCrossFieldQuery,
+	type CrossFieldManager,
 	type CrossFieldMap,
 	type CrossFieldQuerySet,
-	type DetachedNodeEntry,
-	NodeMoveType,
+	CrossFieldTarget,
 	setInCrossFieldMap,
 } from "./crossFieldQueries.js";
 export {
@@ -32,6 +30,7 @@ export { EncodedModularChangesetV2 } from "./modularChangeFormatV2.js";
 export { FlexFieldKind, type FullSchemaPolicy } from "./fieldKind.js";
 export {
 	type FieldChangeHandler,
+	type FieldChangeDelta,
 	type FieldChangeRebaser,
 	type FieldEditor,
 	type NodeChangeComposer,
@@ -40,22 +39,23 @@ export {
 	type NodeChangePruner,
 	referenceFreeFieldChangeRebaser,
 	type RebaseRevisionMetadata,
+	type RelevantRemovedRootsFromChild,
 	type ToDelta,
 	NodeAttachState,
 	type FieldChangeEncodingContext,
 	type NestedChangesIndices,
 } from "./fieldChangeHandler.js";
-export {
-	type CrossFieldKey,
-	type CrossFieldKeyRange,
-	type FieldChange,
-	type FieldChangeMap,
-	type FieldChangeset,
-	type HasFieldChanges,
-	type ModularChangeset,
-	type NodeExistsConstraint,
-	type NodeId,
-	type RebaseVersion,
+export type {
+	CrossFieldKey,
+	CrossFieldKeyRange,
+	FieldChange,
+	FieldChangeMap,
+	FieldChangeset,
+	HasFieldChanges,
+	ModularChangeset,
+	NoChangeConstraint,
+	NodeExistsConstraint,
+	NodeId,
 } from "./modularChangeTypes.js";
 export {
 	convertGenericChange,