@fluidframework/tree 2.74.0 → 2.80.0

package/src/core/index.ts

@@ -105,7 +105,7 @@ export {
 	tryGetChunk,
 	type ChunkedCursor,
 	DetachedFieldIndexFormatVersion,
-	getCodecTreeForDetachedFieldIndexFormat,
+	detachedFieldIndexCodecBuilder,
 } from "./tree/index.js";
 
 export {
@@ -204,7 +204,6 @@ export {
 	offsetChangeAtomId,
 	StableIdSchema,
 	subtractChangeAtomIds,
-	replaceAtomRevisions,
 	replaceChange,
 	type RebaseStats,
 	type RebaseStatsWithDuration,
@@ -213,6 +212,7 @@ export {
 	newChangeAtomIdRangeMap,
 	compareRevisions,
 	diffHistories,
+	type RevisionReplacer,
 } from "./rebase/index.js";
 
 export {

package/src/core/rebase/changeRebaser.ts

@@ -5,7 +5,7 @@
 
 import type { Invariant } from "../../util/index.js";
 
-import type { RevisionTag } from "./types.js";
+import type { ChangeAtomId, RevisionTag } from "./types.js";
 
 /**
  * Rebasing logic for a particular kind of change.
@@ -89,11 +89,45 @@ export interface ChangeRebaser<TChangeset> {
 		revisionMetadata: RevisionMetadataSource,
 	): TChangeset;
 
-	changeRevision(
-		change: TChangeset,
-		newRevision: RevisionTag | undefined,
-		rollBackOf?: RevisionTag,
-	): TChangeset;
+	/**
+	 * Retrieves the set of revisions associated with the given change.
+	 */
+	getRevisions(change: TChangeset): Set<RevisionTag | undefined>;
+
+	/**
+	 * Produces a changeset that is equivalent to the given `change`, but with all references to its own revisions replaced according to the given `replacer`.
+	 * @param change - The change to update. Not modified.
+	 * @param replacer - The replacer to use.
+	 * @returns A changeset equivalent to `change`, but with all references to its own revision replaced according to `replacer`.
+	 */
+	changeRevision(change: TChangeset, replacer: RevisionReplacer): TChangeset;
+}
+
+/**
+ * A type that can update references to a set of obsolete revisions across multiple changesets.
+ */
+export interface RevisionReplacer {
+	/**
+	 * The revision to use in place of the obsolete revisions.
+	 */
+	readonly updatedRevision: RevisionTag;
+
+	/**
+	 * Predicate to determine if a revision needs replacing.
+	 * @param revision - The revision that may need replacing.
+	 * @returns true iff the given `revision` needs replacing.
+	 */
+	isObsolete(revision: RevisionTag | undefined): boolean;
+
+	/**
+	 * Returns the updated ID for the given ID.
+	 * @param id - The ID to update.
+	 * @returns an updated ID iff the given `id` needs updating, otherwise returns the given `id`.
+	 * @remarks
+	 * This function always maps the same input {@link ChangeAtomId.revision | revision} and {@link ChangeAtomId.localId | local ID} to the same output revision local ID.
+	 * This means multiple references to the same atom of change will remain consistent after revision replacement.
+	 */
+	getUpdatedAtomId<T extends ChangeAtomId>(id: T): T;
 }
 
 export interface TaggedChange<TChangeset, TTag = RevisionTag | undefined> {

package/src/core/rebase/index.ts

@@ -27,7 +27,6 @@ export {
 	offsetChangeAtomId,
 	StableIdSchema,
 	subtractChangeAtomIds,
-	replaceAtomRevisions,
 	type ChangeAtomIdRangeMap,
 	newChangeAtomIdRangeMap,
 	compareRevisions,
@@ -44,6 +43,7 @@ export {
 	type TaggedChange,
 	type RevisionMetadataSource,
 	type RevisionInfo,
+	type RevisionReplacer,
 } from "./changeRebaser.js";
 export {
 	findAncestor,

package/src/core/rebase/types.ts

@@ -125,28 +125,16 @@ export function offsetChangeAtomId(id: ChangeAtomId, offset: number): ChangeAtom
 	return { ...id, localId: brand(id.localId + offset) };
 }
 
-export function replaceAtomRevisions(
-	id: ChangeAtomId,
-	oldRevisions: Set<RevisionTag | undefined>,
-	newRevision: RevisionTag | undefined,
-): ChangeAtomId {
-	return oldRevisions.has(id.revision) ? atomWithRevision(id, newRevision) : id;
-}
-
-function atomWithRevision(id: ChangeAtomId, revision: RevisionTag | undefined): ChangeAtomId {
-	const updated = { ...id, revision };
-	if (revision === undefined) {
-		delete updated.revision;
-	}
-
-	return updated;
-}
-
 /**
  * A node in a graph of commits. A commit's parent is the commit on which it was based.
  */
 export interface GraphCommit<TChange> {
-	/** The tag for this commit. If this commit is rebased, the corresponding rebased commit will retain this tag. */
+	/**
+	 * The tag for this commit.
+	 * @remarks
+	 * If this commit is rebased, the corresponding rebased commit will retain this tag.
+	 * With the exception of transaction commits (which all share the same tag), this tag is unique within a given branch history.
+	 */
 	readonly revision: RevisionTag;
 	/** The change that will result from applying this commit */
 	readonly change: TChange;

package/src/core/rebase/utils.ts

@@ -200,7 +200,7 @@ export function rebaseBranch<TChange>(
 	const sourceBranchLength = sourcePath.length;
 
 	// Find where `targetCommit` is in the target branch
-	const targetCommitIndex = targetPath.findIndex((r) => r === targetCommit);
+	const targetCommitIndex = targetPath.indexOf(targetCommit);
 	if (targetCommitIndex === -1) {
 		// If the targetCommit is not in the target path, then it is either disjoint from `target` or it is behind/at
 		// the commit where source and target diverge (ancestor), in which case there is nothing more to rebase
@@ -292,7 +292,7 @@ export function rebaseBranch<TChange>(
 	const revInfos = getRevInfoFromTaggedChanges([...targetRebasePath, ...sourcePath]);
 	// Note that the `revisionMetadata` gets updated as `revInfos` gets updated.
 	const revisionMetadata = revisionMetadataSourceFromInfo(revInfos);
-	let editsToCompose: TaggedChange<TChange>[] = targetRebasePath.slice();
+	let editsToCompose: TaggedChange<TChange>[] = [...targetRebasePath];
 	for (const c of sourcePath) {
 		const rollback = rollbackFromCommit(changeRebaser, c, mintRevisionTag, true /* cache */);
 		if (sourceSet.has(c.revision)) {
@@ -388,7 +388,7 @@ export function revisionMetadataSourceFromInfo(
 	};
 
 	const hasRollback = (revision: RevisionTag): boolean => {
-		return revInfos.find((info) => info.rollbackOf === revision) !== undefined;
+		return revInfos.some((info) => info.rollbackOf === revision);
 	};
 
 	return { getIndex, tryGetInfo, hasRollback };

package/src/core/schema-stored/schema.ts

@@ -394,9 +394,9 @@ export function encodeFieldSchemaV2(schema: TreeFieldStoredSchema): FieldSchemaF
 	const fieldSchema: FieldSchemaFormatV1 = encodeFieldSchemaV1(schema);
 
 	// Omit metadata from the output if it is undefined
-	return schema.persistedMetadata !== undefined
-		? { ...fieldSchema, metadata: schema.persistedMetadata }
-		: { ...fieldSchema };
+	return schema.persistedMetadata === undefined
+		? { ...fieldSchema }
+		: { ...fieldSchema, metadata: schema.persistedMetadata };
 }
 
 export function decodeFieldSchema(schema: FieldSchemaFormatV2): TreeFieldStoredSchema {

package/src/core/tree/anchorSet.ts

@@ -424,10 +424,8 @@ export class AnchorSet implements AnchorLocator {
 	 * Does not add a ref!
 	 */
 	public find(path: UpPath): PathNode | undefined {
-		if (path instanceof PathNode) {
-			if (path.anchorSet === this) {
-				return path;
-			}
+		if (path instanceof PathNode && path.anchorSet === this) {
+			return path;
 		}
 		const parent = path.parent ?? this.root;
 		const parentPath = this.find(parent);
@@ -1185,6 +1183,7 @@ class PathNode extends ReferenceCountedBase implements AnchorNode {
 		assert(this.status !== Status.Disposed, 0x41d /* PathNode must not be disposed */);
 		if (this.isUnreferenced() && this.children.size === 0 && !this.events.hasListeners()) {
 			if (this.status === Status.Alive) {
+				// eslint-disable-next-line unicorn/prefer-dom-node-remove -- Custom tree structure, not DOM
 				this.parentPath?.removeChild(this);
 			}
 			this.status = Status.Disposed;

package/src/core/tree/detachedFieldIndex.ts

@@ -35,7 +35,7 @@ import type {
 	Major,
 	Minor,
 } from "./detachedFieldIndexTypes.js";
-import { makeDetachedFieldIndexCodec } from "./detachedFieldIndexCodecs.js";
+import { detachedFieldIndexCodecBuilder } from "./detachedFieldIndexCodecs.js";
 
 /**
  * Readonly interface for {@link DetachedFieldIndex}.
@@ -120,7 +120,11 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 			jsonValidator: FormatValidatorNoOp,
 			minVersionForCollab: FluidClientVersion.v2_0,
 		};
-		this.codec = makeDetachedFieldIndexCodec(revisionTagCodec, this.options, idCompressor);
+		this.codec = detachedFieldIndexCodecBuilder.build({
+			...this.options,
+			revisionTagCodec,
+			idCompressor,
+		});
 	}
 
 	public clone(): DetachedFieldIndex {
@@ -165,17 +169,17 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 		id: Delta.DetachedNodeId;
 	}> {
 		for (const [major, innerMap] of this.detachedNodeToField) {
-			if (major !== undefined) {
+			if (major === undefined) {
 				for (const [minor, { root, latestRelevantRevision }] of innerMap) {
-					yield latestRelevantRevision !== undefined
-						? { id: { major, minor }, root, latestRelevantRevision }
-						: { id: { major, minor }, root };
+					yield latestRelevantRevision === undefined
+						? { id: { minor }, root }
+						: { id: { minor }, root, latestRelevantRevision };
 				}
 			} else {
 				for (const [minor, { root, latestRelevantRevision }] of innerMap) {
-					yield latestRelevantRevision !== undefined
-						? { id: { minor }, root, latestRelevantRevision }
-						: { id: { minor }, root };
+					yield latestRelevantRevision === undefined
+						? { id: { major, minor }, root }
+						: { id: { major, minor }, root, latestRelevantRevision };
 				}
 			}
 		}
@@ -189,71 +193,6 @@ export class DetachedFieldIndex implements ReadOnlyDetachedFieldIndex {
 		this.latestRelevantRevisionToFields.clear();
 	}
 
-	public updateMajor(current: Major, updated: Major): void {
-		// Update latestRelevantRevision information corresponding to `current`
-		{
-			const inner = this.latestRelevantRevisionToFields.get(current);
-			if (inner !== undefined) {
-				for (const nodeId of inner.values()) {
-					const entry = tryGetFromNestedMap(
-						this.detachedNodeToField,
-						nodeId.major,
-						nodeId.minor,
-					);
-					assert(
-						entry !== undefined,
-						0x9b8 /* Inconsistent data: missing detached node entry */,
-					);
-					setInNestedMap(this.detachedNodeToField, nodeId.major, nodeId.minor, {
-						...entry,
-						latestRelevantRevision: updated,
-					});
-				}
-				this.latestRelevantRevisionToFields.delete(current);
-
-				const updatedInner = this.latestRelevantRevisionToFields.get(updated);
-				if (updatedInner !== undefined) {
-					for (const [root, nodeId] of inner) {
-						updatedInner.set(root, nodeId);
-					}
-				} else {
-					this.latestRelevantRevisionToFields.set(updated, inner);
-				}
-			}
-		}
-
-		// Update the major keys corresponding to `current`
-		{
-			const innerCurrent = this.detachedNodeToField.get(current);
-			if (innerCurrent !== undefined) {
-				this.detachedNodeToField.delete(current);
-				const innerUpdated = this.detachedNodeToField.get(updated);
-				if (innerUpdated === undefined) {
-					this.detachedNodeToField.set(updated, innerCurrent);
-				} else {
-					for (const [minor, entry] of innerCurrent) {
-						assert(
-							innerUpdated.get(minor) === undefined,
-							0x7a9 /* Collision during index update */,
-						);
-						innerUpdated.set(minor, entry);
-					}
-				}
-
-				for (const [minor, entry] of innerCurrent) {
-					const entryInLatest = this.latestRelevantRevisionToFields.get(
-						entry.latestRelevantRevision,
-					);
-					assert(
-						entryInLatest !== undefined,
-						0x9b9 /* Inconsistent data: missing node entry in latestRelevantRevision */,
-					);
-					entryInLatest.set(entry.root, { major: updated, minor });
-				}
-			}
-		}
-	}
-
 	public toFieldKey(id: ForestRootId): FieldKey {
 		return brand(`${this.name}-${id}`);
 	}

package/src/core/tree/detachedFieldIndexCodecCommon.ts

@@ -3,11 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import {
-	type ICodecOptions,
-	type IJsonCodec,
-	makeVersionedValidatedCodec,
-} from "../../codec/index.js";
+import type { IJsonCodec } from "../../codec/index.js";
 import { hasSingle } from "../../util/index.js";
 
 import {
@@ -30,13 +26,13 @@ export function makeDetachedFieldIndexCodecFromMajorCodec<
 	TEncodedRevisionTagSchema extends TSchema,
 	TVersion extends DetachedFieldIndexFormatVersion,
 >(
-	options: ICodecOptions,
 	majorCodec: IJsonCodec<Major, TEncodedRevisionTag>,
 	version: TVersion,
 	encodedRevisionTagSchema: TEncodedRevisionTagSchema,
 ) {
 	const formatSchema = Format(version, encodedRevisionTagSchema);
-	return makeVersionedValidatedCodec(options, new Set([version]), formatSchema, {
+	return {
+		schema: formatSchema,
 		encode: (data: DetachedFieldSummaryData): Static<typeof formatSchema> => {
 			const rootsForRevisions: EncodedRootsForRevision[] = [];
 			for (const [major, innerMap] of data.data) {
@@ -84,5 +80,5 @@ export function makeDetachedFieldIndexCodecFromMajorCodec<
 				maxId: parsed.maxId,
 			};
 		},
-	});
+	};
 }

package/src/core/tree/detachedFieldIndexCodecV1.ts

@@ -6,7 +6,7 @@
 import { assert } from "@fluidframework/core-utils/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 
-import type { ICodecOptions, IJsonCodec } from "../../codec/index.js";
+import type { CodecAndSchema, IJsonCodec } from "../../codec/index.js";
 import {
 	type EncodedRevisionTag,
 	type RevisionTagCodec,
@@ -14,7 +14,6 @@ import {
 	RevisionTagSchema,
 } from "../rebase/index.js";
 
-import type { FormatV1 } from "./detachedFieldIndexFormatV1.js";
 import type { DetachedFieldSummaryData, Major } from "./detachedFieldIndexTypes.js";
 import { makeDetachedFieldIndexCodecFromMajorCodec } from "./detachedFieldIndexCodecCommon.js";
 import { DetachedFieldIndexFormatVersion } from "./detachedFieldIndexFormatCommon.js";
@@ -23,7 +22,6 @@ import { brand } from "../../util/index.js";
 class MajorCodec implements IJsonCodec<Major, EncodedRevisionTag> {
 	public constructor(
 		private readonly revisionTagCodec: RevisionTagCodec,
-		private readonly options: ICodecOptions,
 		private readonly idCompressor: IIdCompressor,
 	) {}
 
@@ -69,12 +67,10 @@ class MajorCodec implements IJsonCodec<Major, EncodedRevisionTag> {
 
 export function makeDetachedNodeToFieldCodecV1(
 	revisionTagCodec: RevisionTagCodec,
-	options: ICodecOptions,
 	idCompressor: IIdCompressor,
-): IJsonCodec<DetachedFieldSummaryData, FormatV1> {
-	const majorCodec = new MajorCodec(revisionTagCodec, options, idCompressor);
+): CodecAndSchema<DetachedFieldSummaryData> {
+	const majorCodec = new MajorCodec(revisionTagCodec, idCompressor);
 	return makeDetachedFieldIndexCodecFromMajorCodec(
-		options,
 		majorCodec,
 		brand(DetachedFieldIndexFormatVersion.v1),
 		RevisionTagSchema,

package/src/core/tree/detachedFieldIndexCodecV2.ts

@@ -6,20 +6,18 @@
 import { assert } from "@fluidframework/core-utils/internal";
 import type { IIdCompressor, StableId } from "@fluidframework/id-compressor";
 
-import type { ICodecOptions, IJsonCodec } from "../../codec/index.js";
+import type { CodecAndSchema, IJsonCodec } from "../../codec/index.js";
 import type { EncodedRevisionTag, RevisionTagCodec, RevisionTag } from "../rebase/index.js";
 
-import { type FormatV2, StableOrFinalRevisionTag } from "./detachedFieldIndexFormatV2.js";
+import { StableOrFinalRevisionTag } from "./detachedFieldIndexFormatV2.js";
 import type { DetachedFieldSummaryData, Major } from "./detachedFieldIndexTypes.js";
 import { makeDetachedFieldIndexCodecFromMajorCodec } from "./detachedFieldIndexCodecCommon.js";
 import { isStableId } from "@fluidframework/id-compressor/internal";
 import { DetachedFieldIndexFormatVersion } from "./detachedFieldIndexFormatCommon.js";
-import { brand } from "../../util/index.js";
 
 class MajorCodec implements IJsonCodec<Major> {
 	public constructor(
 		private readonly revisionTagCodec: RevisionTagCodec,
-		private readonly options: ICodecOptions,
 		private readonly idCompressor: IIdCompressor,
 	) {}
 
@@ -57,14 +55,12 @@ class MajorCodec implements IJsonCodec<Major> {
 
 export function makeDetachedNodeToFieldCodecV2(
 	revisionTagCodec: RevisionTagCodec,
-	options: ICodecOptions,
 	idCompressor: IIdCompressor,
-): IJsonCodec<DetachedFieldSummaryData, FormatV2> {
-	const majorCodec = new MajorCodec(revisionTagCodec, options, idCompressor);
+): CodecAndSchema<DetachedFieldSummaryData> {
+	const majorCodec = new MajorCodec(revisionTagCodec, idCompressor);
 	return makeDetachedFieldIndexCodecFromMajorCodec(
-		options,
 		majorCodec,
-		brand(DetachedFieldIndexFormatVersion.v2),
+		DetachedFieldIndexFormatVersion.v2,
 		StableOrFinalRevisionTag,
 	);
 }

package/src/core/tree/detachedFieldIndexCodecs.ts

@@ -4,79 +4,36 @@
  */
 
 import type { IIdCompressor } from "@fluidframework/id-compressor";
-import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
-import {
-	getConfigForMinVersionForCollab,
-	lowestMinVersionForCollab,
-} from "@fluidframework/runtime-utils/internal";
+import { lowestMinVersionForCollab } from "@fluidframework/runtime-utils/internal";
 
 import {
-	type CodecTree,
+	ClientVersionDispatchingCodecBuilder,
 	type CodecWriteOptions,
 	FluidClientVersion,
-	type ICodecFamily,
-	type IJsonCodec,
-	makeCodecFamily,
-	makeVersionDispatchingCodec,
 } from "../../codec/index.js";
 import type { RevisionTagCodec } from "../rebase/index.js";
 
 import { makeDetachedNodeToFieldCodecV1 } from "./detachedFieldIndexCodecV1.js";
 import { makeDetachedNodeToFieldCodecV2 } from "./detachedFieldIndexCodecV2.js";
-import type { DetachedFieldSummaryData } from "./detachedFieldIndexTypes.js";
 import { DetachedFieldIndexFormatVersion } from "./detachedFieldIndexFormatCommon.js";
-import { brand } from "../../util/index.js";
-
-/**
- * Convert a MinimumVersionForCollab to a version for detached field codecs.
- * @param clientVersion - The MinimumVersionForCollab to convert.
- * @returns The detached field codec version that corresponds to the provided MinimumVersionForCollab.
- */
-function clientVersionToDetachedFieldVersion(
-	clientVersion: MinimumVersionForCollab,
-): DetachedFieldIndexFormatVersion {
-	return brand(
-		getConfigForMinVersionForCollab(clientVersion, {
-			[lowestMinVersionForCollab]: DetachedFieldIndexFormatVersion.v1,
-			[FluidClientVersion.v2_52]: DetachedFieldIndexFormatVersion.v2,
-		}),
-	);
-}
-
-export function makeDetachedFieldIndexCodec(
-	revisionTagCodec: RevisionTagCodec,
-	options: CodecWriteOptions,
-	idCompressor: IIdCompressor,
-): IJsonCodec<DetachedFieldSummaryData> {
-	const family = makeDetachedFieldIndexCodecFamily(revisionTagCodec, options, idCompressor);
-	return makeVersionDispatchingCodec(family, {
-		...options,
-		writeVersion: clientVersionToDetachedFieldVersion(options.minVersionForCollab),
-	});
-}
 
-export function makeDetachedFieldIndexCodecFamily(
-	revisionTagCodec: RevisionTagCodec,
-	options: CodecWriteOptions,
-	idCompressor: IIdCompressor,
-): ICodecFamily<DetachedFieldSummaryData> {
-	return makeCodecFamily([
-		[
-			DetachedFieldIndexFormatVersion.v1,
-			makeDetachedNodeToFieldCodecV1(revisionTagCodec, options, idCompressor),
-		],
-		[
-			DetachedFieldIndexFormatVersion.v2,
-			makeDetachedNodeToFieldCodecV2(revisionTagCodec, options, idCompressor),
-		],
-	]);
-}
+type BuildData = CodecWriteOptions & {
+	revisionTagCodec: RevisionTagCodec;
+	idCompressor: IIdCompressor;
+};
 
-export function getCodecTreeForDetachedFieldIndexFormat(
-	clientVersion: MinimumVersionForCollab,
-): CodecTree {
-	return {
-		name: "DetachedFieldIndex",
-		version: clientVersionToDetachedFieldVersion(clientVersion),
-	};
-}
+export const detachedFieldIndexCodecBuilder = ClientVersionDispatchingCodecBuilder.build(
+	"DetachedFieldIndex",
+	{
+		[lowestMinVersionForCollab]: {
+			formatVersion: DetachedFieldIndexFormatVersion.v1,
+			codec: (buildData: BuildData) =>
+				makeDetachedNodeToFieldCodecV1(buildData.revisionTagCodec, buildData.idCompressor),
+		},
+		[FluidClientVersion.v2_52]: {
+			formatVersion: DetachedFieldIndexFormatVersion.v2,
+			codec: (buildData: BuildData) =>
+				makeDetachedNodeToFieldCodecV2(buildData.revisionTagCodec, buildData.idCompressor),
+		},
+	},
+);

package/src/core/tree/index.ts

@@ -123,7 +123,7 @@ export {
 	type ReadOnlyDetachedFieldIndex,
 } from "./detachedFieldIndex.js";
 
-export { getCodecTreeForDetachedFieldIndexFormat } from "./detachedFieldIndexCodecs.js";
+export { detachedFieldIndexCodecBuilder } from "./detachedFieldIndexCodecs.js";
 export { DetachedFieldIndexFormatVersion } from "./detachedFieldIndexFormatCommon.js";
 export { type FormatV1 } from "./detachedFieldIndexFormatV1.js";
 

package/src/core/tree/mapTree.ts

@@ -50,7 +50,7 @@ export function deepCopyMapTree(mapTree: MinimalMapTreeNodeView): ExclusiveMapTr
 	): ExclusiveMapTree {
 		return {
 			type: child.type,
-			...(child.value !== undefined ? { value: child.value } : {}),
+			...(child.value === undefined ? {} : { value: child.value }),
 			fields,
 		};
 	}

package/src/core/tree/sparseTree.ts

@@ -140,6 +140,7 @@ export class SparseNode<TData> implements UpPath {
 	 * Allowed when dangling (but not when disposed).
 	 */
 	private disposeThis(): void {
+		// eslint-disable-next-line unicorn/prefer-dom-node-remove -- Custom tree structure, not DOM
 		this.parentPath?.removeChild(this);
 	}
 }

package/src/core/tree/treeTextFormat.ts

@@ -165,15 +165,11 @@ export function genericTreeDeleteIfEmpty<T>(
 	removeMapObject: boolean,
 ): void {
 	const children = getGenericTreeFieldMap(node, false);
-	if (Object.prototype.hasOwnProperty.call(children, key)) {
-		if (children[key]?.length === 0) {
-			// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-			delete children[key];
-			if (removeMapObject) {
-				if (Object.keys(children).length === 0) {
-					delete node.fields;
-				}
-			}
+	if (Object.prototype.hasOwnProperty.call(children, key) && children[key]?.length === 0) {
+		// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+		delete children[key];
+		if (removeMapObject && Object.keys(children).length === 0) {
+			delete node.fields;
 		}
 	}
 }

package/src/feature-libraries/changeAtomIdBTree.ts

@@ -0,0 +1,24 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { ChangeAtomId, ChangesetLocalId, RevisionTag } from "../core/index.js";
+import type { TupleBTree } from "../util/index.js";
+
+export type ChangeAtomIdBTree<V> = TupleBTree<[RevisionTag | undefined, ChangesetLocalId], V>;
+
+export function getFromChangeAtomIdMap<T>(
+	map: ChangeAtomIdBTree<T>,
+	id: ChangeAtomId,
+): T | undefined {
+	return map.get([id.revision, id.localId]);
+}
+
+export function setInChangeAtomIdMap<T>(
+	map: ChangeAtomIdBTree<T>,
+	id: ChangeAtomId,
+	value: T,
+): void {
+	map.set([id.revision, id.localId], value);
+}

package/src/feature-libraries/chunked-forest/basicChunk.ts

@@ -471,7 +471,7 @@ export class BasicChunkCursor extends SynchronousCursor implements ChunkedCursor
 			0x55d /* can only initNestedCursor when in Nodes */,
 		);
 		const chunk = (this.siblings as TreeChunk[])[this.indexOfChunk] ?? oob();
-		this.nestedCursor = !(chunk instanceof BasicChunk) ? chunk.cursor() : undefined;
+		this.nestedCursor = chunk instanceof BasicChunk ? undefined : chunk.cursor();
 		this.nestedCursor?.enterNode(this.indexWithinChunk);
 	}
 

package/src/feature-libraries/chunked-forest/chunkedForest.ts

@@ -196,7 +196,11 @@ export class ChunkedForest implements IEditableForest {
 				assertValidRange(source, sourceField);
 				const newField = sourceField.splice(source.start, source.end - source.start);
 
-				if (destination !== undefined) {
+				if (destination === undefined) {
+					for (const child of newField) {
+						child.referenceRemoved();
+					}
+				} else {
 					assert(
 						!this.forest.roots.fields.has(destination),
 						0x7af /* Destination must be a new empty detached field */,
@@ -204,10 +208,6 @@ export class ChunkedForest implements IEditableForest {
 					if (newField.length > 0) {
 						this.forest.roots.fields.set(destination, newField);
 					}
-				} else {
-					for (const child of newField) {
-						child.referenceRemoved();
-					}
 				}
 				// This check is performed after the transfer to ensure that the field is not removed in scenarios
 				// where the source and destination are the same.