@fluidframework/tree 2.81.1 → 2.83.0

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

@@ -3,28 +3,38 @@
  * Licensed under the MIT License.
  */
 
-import type {
-	ChangeAtomId,
-	ChangesetLocalId,
-	RevisionReplacer,
-	RevisionTag,
+import { assert, fail } from "@fluidframework/core-utils/internal";
+
+import {
+	newChangeAtomIdRangeMap,
+	offsetChangeAtomId,
+	type ChangeAtomId,
+	type ChangeAtomIdRangeMap,
+	type ChangesetLocalId,
+	type RevisionReplacer,
+	type RevisionTag,
 } from "../../core/index.js";
-import { brand, brandConst, newTupleBTree, type Mutable } from "../../util/index.js";
 import {
-	getFromChangeAtomIdMap,
-	setInChangeAtomIdMap,
-	type ChangeAtomIdBTree,
-} from "../changeAtomIdBTree.js";
+	brand,
+	brandConst,
+	newIntegerRangeMap,
+	type RangeMap,
+	type Mutable,
+} from "../../util/index.js";
+
+const offsetChangesetLocalId = (value: ChangesetLocalId, offset: number): ChangesetLocalId =>
+	brand(value + offset);
 
 export class DefaultRevisionReplacer implements RevisionReplacer {
 	/**
 	 * Mapping from (obsolete revision tag, original local id) to the updated local id.
 	 */
-	private readonly updatedLocalIds: ChangeAtomIdBTree<ChangesetLocalId> = newTupleBTree();
+	private readonly updatedLocalIds: ChangeAtomIdRangeMap<ChangesetLocalId> =
+		newChangeAtomIdRangeMap(offsetChangesetLocalId);
 	/**
 	 * The set of local IDs already used in the scope of the updated revision.
 	 */
-	private readonly localIds: Set<ChangesetLocalId> = new Set();
+	private readonly localIds: RangeMap<ChangesetLocalId, true> = newIntegerRangeMap();
 	/**
 	 * The maximum local ID seen so far in the scope of the updated revision.
 	 */
@@ -39,29 +49,45 @@ export class DefaultRevisionReplacer implements RevisionReplacer {
 		return this.obsoleteRevisions.has(revision);
 	}
 
-	public getUpdatedAtomId<T extends ChangeAtomId>(id: T): T {
+	public getUpdatedAtomId<T extends ChangeAtomId>(id: T, count: number = 1): T {
+		assert(count >= 1, 0xcc9 /* Count must be at least 1 */);
 		if (this.isObsolete(id.revision)) {
 			const updated: Mutable<T> = { ...id, revision: this.updatedRevision };
-			const prior: ChangesetLocalId | undefined = getFromChangeAtomIdMap(
-				this.updatedLocalIds,
-				id,
-			);
-			if (prior === undefined) {
-				let localId: ChangesetLocalId;
-				if (this.localIds.has(id.localId)) {
-					this.maxSeen = brand(this.maxSeen + 1);
-					localId = this.maxSeen;
+			let continuingOutputId: ChangesetLocalId | undefined;
+			let remainderCount = count;
+			let remainderStart = id;
+			while (remainderCount > 0) {
+				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;
+
+					this.maxSeen = brand(Math.max(this.maxSeen, newLocalId + prior.length - 1));
+					this.localIds.set(newLocalId, prior.length, true);
+					this.updatedLocalIds.set(remainderStart, prior.length, newLocalId);
+					if (continuingOutputId === undefined) {
+						updated.localId = newLocalId;
+					} else if (newLocalId !== continuingOutputId) {
+						fail(0xcca /* TODO: Handle non-contiguous ranges */);
+					}
+					continuingOutputId = offsetChangesetLocalId(newLocalId, prior.length);
 				} else {
-					// 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.
-					localId = id.localId;
-					this.maxSeen = brand(Math.max(this.maxSeen, localId));
-					this.localIds.add(id.localId);
+					if (continuingOutputId === undefined) {
+						updated.localId = prior.value;
+					} else if (prior.value !== continuingOutputId) {
+						fail(0xccb /* TODO: Handle non-contiguous ranges */);
+					}
+					continuingOutputId = offsetChangesetLocalId(prior.value, prior.length);
 				}
-				setInChangeAtomIdMap(this.updatedLocalIds, id, localId);
-				updated.localId = localId;
-			} else {
-				updated.localId = prior;
+				remainderStart = offsetChangeAtomId(remainderStart, prior.length);
+				remainderCount -= prior.length;
 			}
 			return updated;
 		}

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

@@ -60,7 +60,7 @@ export const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {
 			markList.push({ count: 1, fields: deltaFromChild(nodeChange) });
 			nodeIndex += 1;
 		}
-		return { local: markList };
+		return { local: { marks: markList } };
 	},
 	relevantRemovedRoots,
 	isEmpty: (change: GenericChangeset): boolean => change.length === 0,

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

@@ -74,7 +74,10 @@ export {
 	relevantRemovedRoots,
 	updateRefreshers,
 } from "./modularChangeFamily.js";
-export { makeModularChangeCodecFamily } from "./modularChangeCodecs.js";
+export {
+	ModularChangeFormatVersion,
+	makeModularChangeCodecFamily,
+} from "./modularChangeCodecs.js";
 export type {
 	FieldKindConfiguration,
 	FieldKindConfigurationEntry,

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

@@ -9,7 +9,6 @@ import type { TAnySchema } from "@sinclair/typebox";
 import {
 	type ICodecOptions,
 	type IJsonCodec,
-	type IMultiFormatCodec,
 	type SchemaValidationFunction,
 	extractJsonValidator,
 	withSchemaValidation,
@@ -30,9 +29,8 @@ import {
 	type Mutable,
 	brand,
 	idAllocatorFromMaxId,
-	newTupleBTree,
 } from "../../util/index.js";
-import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
+import { newChangeAtomIdBTree, type ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import {
 	type FieldBatchCodec,
 	type TreeChunk,
@@ -73,7 +71,7 @@ type ModularChangeCodec = IJsonCodec<
 	ChangeEncodingContext
 >;
 
-type FieldCodec = IMultiFormatCodec<
+type FieldCodec = IJsonCodec<
 	FieldChangeset,
 	JsonCompatibleReadOnly,
 	JsonCompatibleReadOnly,
@@ -133,7 +131,7 @@ export function encodeFieldChangesForJsonI(
 			fieldChange.fieldKind,
 			fieldChangesetCodecs,
 		);
-		const encodedChange = codec.json.encode(fieldChange.change, context);
+		const encodedChange = codec.encode(fieldChange.change, context);
 		if (compiledSchema !== undefined && !compiledSchema.check(encodedChange)) {
 			fail(0xb1f /* Encoded change didn't pass schema validation. */);
 		}
@@ -226,7 +224,7 @@ export function decodeFieldChangesFromJson(
 			},
 		};
 
-		const fieldChangeset = codec.json.decode(field.change, fieldContext);
+		const fieldChangeset = codec.decode(field.change, fieldContext);
 
 		const crossFieldKeys = getChangeHandler(fieldKinds, field.fieldKind).getCrossFieldKeys(
 			fieldChangeset,
@@ -364,7 +362,7 @@ export function decodeDetachedNodes(
 		});
 	};
 
-	const map: ModularChangeset["builds"] = newTupleBTree();
+	const map: ModularChangeset["builds"] = newChangeAtomIdBTree();
 	// eslint-disable-next-line unicorn/no-array-for-each -- Codec internals: minimizing changes to serialization logic
 	encoded.builds.forEach((build) => {
 		// EncodedRevisionTag cannot be an array so this ensures that we can isolate the tuple
@@ -396,7 +394,9 @@ export function encodeRevisionInfos(
 ): EncodedRevisionInfo[] | undefined {
 	if (context.revision !== undefined) {
 		assert(
+			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- Using optional chaining here would change behavior: `revisions[0]?.rollbackOf === undefined` is true when revisions[0] is undefined, but this check requires revisions[0] to be defined. As currently written, such a change would be safe because context.revision is included in the check and from a couple lines above is confirmed not undefined. But this more verbose form is clearer.
 			revisions.length === 1 &&
+				// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
 				revisions[0] !== undefined &&
 				revisions[0].revision === context.revision &&
 				revisions[0].rollbackOf === undefined,
@@ -525,9 +525,9 @@ export function decodeChange(
 ): Mutable<ModularChangeset> {
 	const decoded: Mutable<ModularChangeset> = {
 		fieldChanges: new Map(),
-		nodeChanges: newTupleBTree(),
-		nodeToParent: newTupleBTree(),
-		nodeAliases: newTupleBTree(),
+		nodeChanges: newChangeAtomIdBTree(),
+		nodeToParent: newChangeAtomIdBTree(),
+		nodeAliases: newChangeAtomIdBTree(),
 		crossFieldKeys: newCrossFieldKeyTable(),
 	};
 
@@ -596,8 +596,8 @@ export function getFieldChangesetCodecs(
 		const codec = kind.changeHandler.codecsFactory(revisionTagCodec).resolve(formatVersion);
 		return {
 			codec,
-			compiledSchema: codec.json.encodedSchema
-				? extractJsonValidator(codecOptions.jsonValidator).compile(codec.json.encodedSchema)
+			compiledSchema: codec.encodedSchema
+				? extractJsonValidator(codecOptions.jsonValidator).compile(codec.encodedSchema)
 				: undefined,
 		};
 	};

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

@@ -16,6 +16,7 @@ import type {
 	EncodedRevisionTag,
 	RevisionTag,
 } from "../../core/index.js";
+import { strictEnum, type Values } from "../../util/index.js";
 import type { FieldBatchCodec } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 
@@ -25,7 +26,7 @@ import { makeModularChangeCodecV2 } from "./modularChangeCodecV2.js";
 import type { ModularChangeset } from "./modularChangeTypes.js";
 
 export function makeModularChangeCodecFamily(
-	fieldKindConfigurations: ReadonlyMap<number, FieldKindConfiguration>,
+	fieldKindConfigurations: ReadonlyMap<ModularChangeFormatVersion, FieldKindConfiguration>,
 	revisionTagCodec: IJsonCodec<
 		RevisionTag,
 		EncodedRevisionTag,
@@ -39,11 +40,8 @@ export function makeModularChangeCodecFamily(
 	return makeCodecFamily(
 		Array.from(fieldKindConfigurations.entries(), ([version, fieldKinds]) => {
 			switch (version) {
-				case 1:
-				case 2:
-				case 3:
-				case 4:
-				case 6: {
+				case ModularChangeFormatVersion.v3:
+				case ModularChangeFormatVersion.v4: {
 					return [
 						version,
 						makeModularChangeCodecV1(
@@ -55,7 +53,7 @@ export function makeModularChangeCodecFamily(
 						),
 					];
 				}
-				case 5: {
+				case ModularChangeFormatVersion.v5: {
 					return [
 						version,
 						makeModularChangeCodecV2(
@@ -74,3 +72,30 @@ export function makeModularChangeCodecFamily(
 		}),
 	);
 }
+
+/**
+ * The format version for `ModularChangeset`.
+ */
+export const ModularChangeFormatVersion = strictEnum("ModularChangeFormatVersion", {
+	/**
+	 * Introduced prior to 2.0 and used beyond.
+	 * Reading capability must be maintained for backwards compatibility.
+	 * Writing capability needs to be maintained so long as {@link lowestMinVersionForCollab} is less than 2.2.0.
+	 */
+	v3: 3,
+	/**
+	 * Introduced in 2.2.0.
+	 * Was inadvertently made usable for writing in 2.43.0 (through configuredSharedTree) and remains available.
+	 * Reading capability must be maintained for backwards compatibility.
+	 * Writing capability could be dropped in favor of {@link ModularChangeFormatVersion.v3},
+	 * but doing so would make the pattern of writable versions more complex and gain little
+	 * because the logic for this format is shared with {@link ModularChangeFormatVersion.v3}.
+	 */
+	v4: 4,
+	/**
+	 * Introduced and made available for writing in 2.80.0
+	 * Adds support for "no change" constraints.
+	 */
+	v5: 5,
+});
+export type ModularChangeFormatVersion = Values<typeof ModularChangeFormatVersion>;

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

@@ -46,6 +46,8 @@ import {
 	type DeltaDetachedNodeRename,
 	mapTaggedChange,
 	type RevisionReplacer,
+	comparePartialRevisions,
+	comparePartialChangesetLocalIds,
 } from "../../core/index.js";
 import {
 	type IdAllocationState,
@@ -56,14 +58,17 @@ import {
 	idAllocatorFromState,
 	type RangeQueryResult,
 	getOrCreate,
-	newTupleBTree,
 	mergeTupleBTrees,
 	type TupleBTree,
 	RangeMap,
 	balancedReduce,
+	newTupleBTree,
+	compareStrings,
+	createTupleComparator,
 } from "../../util/index.js";
 import {
 	getFromChangeAtomIdMap,
+	newChangeAtomIdBTree,
 	setInChangeAtomIdMap,
 	type ChangeAtomIdBTree,
 } from "../changeAtomIdBTree.js";
@@ -732,7 +737,7 @@ export class ModularChangeFamily
 			revisionForInvert,
 		);
 
-		const invertedNodes: ChangeAtomIdBTree<NodeChangeset> = newTupleBTree();
+		const invertedNodes = newChangeAtomIdBTree<NodeChangeset>();
 		change.change.nodeChanges.forEachPair(([revision, localId], nodeChangeset) => {
 			invertedNodes.set(
 				[revision, localId],
@@ -897,12 +902,12 @@ export class ModularChangeFamily
 			newChange: change,
 			baseChange: over.change,
 			baseFieldToContext: new Map(),
-			baseToRebasedNodeId: newTupleBTree(),
+			baseToRebasedNodeId: newChangeAtomIdBTree(),
 			rebasedFields: new Set(),
 			rebasedNodeToParent: brand(change.nodeToParent.clone()),
 			rebasedCrossFieldKeys: change.crossFieldKeys.clone(),
 			nodeIdPairs: [],
-			affectedBaseFields: newTupleBTree(),
+			affectedBaseFields: newFieldIdKeyBTree(),
 			fieldsWithUnattachedChild: new Set(),
 		};
 
@@ -1365,7 +1370,7 @@ export class ModularChangeFamily
 		const change = nodeChangeFromId(crossFieldTable.newChange.nodeChanges, newId);
 		const over = nodeChangeFromId(crossFieldTable.baseChange.nodeChanges, baseId);
 
-		const baseMap: FieldChangeMap = over?.fieldChanges ?? new Map();
+		const baseMap: FieldChangeMap = over?.fieldChanges ?? new Map<FieldKey, FieldChange>();
 
 		const fieldChanges =
 			change.fieldChanges !== undefined && over.fieldChanges !== undefined
@@ -1522,8 +1527,11 @@ export class ModularChangeFamily
 	}
 
 	public getRevisions(change: ModularChangeset): Set<RevisionTag | undefined> {
+		if (change.revisions === undefined || change.revisions.length === 0) {
+			return new Set([undefined]);
+		}
 		const aggregated: Set<RevisionTag | undefined> = new Set();
-		for (const revInfo of change.revisions ?? [{ revision: undefined }]) {
+		for (const revInfo of change.revisions) {
 			aggregated.add(revInfo.revision);
 		}
 		return aggregated;
@@ -1551,7 +1559,7 @@ export class ModularChangeFamily
 			nodeToParent: updatedNodeToParent,
 
 			// We've updated all references to old node IDs, so we no longer need an alias table.
-			nodeAliases: newTupleBTree(),
+			nodeAliases: newChangeAtomIdBTree(),
 			crossFieldKeys: replaceCrossFieldKeyTableRevisions(
 				change.crossFieldKeys,
 				replacer,
@@ -1763,7 +1771,7 @@ function replaceCrossFieldKeyTableRevisions(
 	const updated: CrossFieldKeyTable = newCrossFieldKeyTable();
 	for (const entry of table.entries()) {
 		const key = entry.start;
-		const updatedKey: CrossFieldKey = replacer.getUpdatedAtomId(key);
+		const updatedKey: CrossFieldKey = replacer.getUpdatedAtomId(key, entry.length);
 
 		const field = entry.value;
 		const normalizedFieldId = normalizeFieldId(field, nodeAliases);
@@ -1788,7 +1796,7 @@ function replaceIdMapRevisions<T>(
 	replacer: RevisionReplacer,
 	valueMapper: (value: T) => T = (value) => value,
 ): ChangeAtomIdBTree<T> {
-	const updated: ChangeAtomIdBTree<T> = newTupleBTree();
+	const updated = newChangeAtomIdBTree<T>();
 	for (const [[revision, localId], value] of map.entries()) {
 		const newAtom = replacer.getUpdatedAtomId({ revision, localId });
 		updated.set([newAtom.revision, newAtom.localId], valueMapper(value));
@@ -1819,20 +1827,23 @@ function composeBuildsDestroysAndRefreshers(
 	// care to support at this time.
 	const allBuilds: ChangeAtomIdBTree<TreeChunk> = brand(
 		mergeTupleBTrees(
-			change1.builds ?? newTupleBTree(),
-			change2.builds ?? newTupleBTree(),
+			change1.builds ?? newChangeAtomIdBTree(),
+			change2.builds ?? newChangeAtomIdBTree(),
 			true,
 		),
 	);
 
 	const allDestroys: ChangeAtomIdBTree<number> = brand(
-		mergeTupleBTrees(change1.destroys ?? newTupleBTree(), change2.destroys ?? newTupleBTree()),
+		mergeTupleBTrees(
+			change1.destroys ?? newChangeAtomIdBTree(),
+			change2.destroys ?? newChangeAtomIdBTree(),
+		),
 	);
 
 	const allRefreshers: ChangeAtomIdBTree<TreeChunk> = brand(
 		mergeTupleBTrees(
-			change1.refreshers ?? newTupleBTree(),
-			change2.refreshers ?? newTupleBTree(),
+			change1.refreshers ?? newChangeAtomIdBTree(),
+			change2.refreshers ?? newChangeAtomIdBTree(),
 			true,
 		),
 	);
@@ -1942,7 +1953,7 @@ export function updateRefreshers(
 	removedRoots: Iterable<DeltaDetachedNodeId>,
 	requireRefreshers: boolean = true,
 ): ModularChangeset {
-	const refreshers: ChangeAtomIdBTree<TreeChunk> = newTupleBTree();
+	const refreshers = newChangeAtomIdBTree<TreeChunk>();
 	const chunkLengths: Map<RevisionTag | undefined, BTree<number, number>> = new Map();
 
 	if (change.builds !== undefined) {
@@ -2103,7 +2114,7 @@ function intoDeltaImpl(
 				return deltaFromNodeChange(nodeChange, nodeChanges, fieldKinds, global, rename);
 			},
 		);
-		if (fieldChanges !== undefined && fieldChanges.length > 0) {
+		if (fieldChanges !== undefined && fieldChanges.marks.length > 0) {
 			delta.set(field, fieldChanges);
 		}
 		for (const c of fieldGlobal ?? []) {
@@ -2235,7 +2246,7 @@ interface RebaseTable extends CrossFieldTable<FieldChange> {
 	readonly fieldsWithUnattachedChild: Set<FieldChange>;
 }
 
-type FieldIdKey = [RevisionTag | undefined, ChangesetLocalId | undefined, FieldKey];
+type FieldIdKey = readonly [RevisionTag | undefined, ChangesetLocalId | undefined, FieldKey];
 
 interface RebaseFieldContext {
 	baseChange: FieldChange;
@@ -2261,13 +2272,13 @@ function newComposeTable(
 		newChange,
 		fieldToContext: new Map(),
 		newFieldToBaseField: new Map(),
-		newToBaseNodeId: newTupleBTree(),
+		newToBaseNodeId: newChangeAtomIdBTree(),
 		composedNodes: new Set(),
 		composedNodeToParent,
 		pendingCompositions: {
 			nodeIdsToCompose: [],
-			affectedBaseFields: newTupleBTree(),
-			affectedNewFields: newTupleBTree(),
+			affectedBaseFields: newFieldIdKeyBTree(),
+			affectedNewFields: newFieldIdKeyBTree(),
 		},
 	};
 }
@@ -2625,10 +2636,10 @@ function makeModularChangeset(props?: {
 }): ModularChangeset {
 	const p = props ?? { maxId: -1 };
 	const changeset: Mutable<ModularChangeset> = {
-		fieldChanges: p.fieldChanges ?? new Map(),
-		nodeChanges: p.nodeChanges ?? newTupleBTree(),
-		nodeToParent: p.nodeToParent ?? newTupleBTree(),
-		nodeAliases: p.nodeAliases ?? newTupleBTree(),
+		fieldChanges: p.fieldChanges ?? new Map<FieldKey, FieldChange>(),
+		nodeChanges: p.nodeChanges ?? newChangeAtomIdBTree(),
+		nodeToParent: p.nodeToParent ?? newChangeAtomIdBTree(),
+		nodeAliases: p.nodeAliases ?? newChangeAtomIdBTree(),
 		crossFieldKeys: p.crossFieldKeys ?? newCrossFieldKeyTable(),
 	};
 
@@ -2717,7 +2728,7 @@ export class ModularEditBuilder extends EditBuilder<ModularChangeset> {
 		// This content will be added to a GlobalEditDescription whose lifetime exceeds the scope of this function.
 		content.referenceAdded();
 
-		const builds: ChangeAtomIdBTree<TreeChunk> = newTupleBTree();
+		const builds = newChangeAtomIdBTree<TreeChunk>();
 		builds.set([revision, firstId], content);
 
 		return {
@@ -2747,8 +2758,8 @@ export class ModularEditBuilder extends EditBuilder<ModularChangeset> {
 		const modularChange = buildModularChangesetFromField({
 			path: field,
 			fieldChange: { fieldKind, change },
-			nodeChanges: newTupleBTree(),
-			nodeToParent: newTupleBTree(),
+			nodeChanges: newChangeAtomIdBTree(),
+			nodeToParent: newChangeAtomIdBTree(),
 			crossFieldKeys: newCrossFieldKeyTable(),
 			idAllocator: this.idAllocator,
 			localCrossFieldKeys,
@@ -2779,8 +2790,8 @@ export class ModularEditBuilder extends EditBuilder<ModularChangeset> {
 								fieldKind: change.fieldKind,
 								change: change.change,
 							},
-							nodeChanges: newTupleBTree(),
-							nodeToParent: newTupleBTree(),
+							nodeChanges: newChangeAtomIdBTree(),
+							nodeToParent: newChangeAtomIdBTree(),
 							crossFieldKeys: newCrossFieldKeyTable(),
 							idAllocator: this.idAllocator,
 							localCrossFieldKeys: getChangeHandler(
@@ -2818,8 +2829,8 @@ export class ModularEditBuilder extends EditBuilder<ModularChangeset> {
 				buildModularChangesetFromNode({
 					path,
 					nodeChange,
-					nodeChanges: newTupleBTree(),
-					nodeToParent: newTupleBTree(),
+					nodeChanges: newChangeAtomIdBTree(),
+					nodeToParent: newChangeAtomIdBTree(),
 					crossFieldKeys: newCrossFieldKeyTable(),
 					idAllocator: this.idAllocator,
 					revision,
@@ -2839,8 +2850,8 @@ export class ModularEditBuilder extends EditBuilder<ModularChangeset> {
 				buildModularChangesetFromNode({
 					path,
 					nodeChange,
-					nodeChanges: newTupleBTree(),
-					nodeToParent: newTupleBTree(),
+					nodeChanges: newChangeAtomIdBTree(),
+					nodeToParent: newChangeAtomIdBTree(),
 					crossFieldKeys: newCrossFieldKeyTable(),
 					idAllocator: this.idAllocator,
 					revision,
@@ -3197,3 +3208,13 @@ interface ModularChangesetContent {
 function areEqualFieldIds(a: FieldId, b: FieldId): boolean {
 	return areEqualChangeAtomIdOpts(a.nodeId, b.nodeId) && a.field === b.field;
 }
+
+function newFieldIdKeyBTree<V>(): TupleBTree<FieldIdKey, V> {
+	return newTupleBTree(compareFieldIdKeys);
+}
+
+const compareFieldIdKeys = createTupleComparator([
+	comparePartialRevisions,
+	comparePartialChangesetLocalIds,
+	compareStrings<FieldKey>,
+]);

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

@@ -11,7 +11,6 @@ import {
 	JsonCompatibleReadOnlySchema,
 	brandedNumberType,
 } from "../../util/index.js";
-import { EncodedFieldBatch } from "../chunked-forest/index.js";
 
 const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 
@@ -115,10 +114,9 @@ export const EncodedBuilds = Type.Object(
 	{
 		builds: EncodedBuildsArray,
 		/**
-		 * Fields indexed by the EncodedTreeIndexes above.
-		 * TODO: Strongly typing this here may result in redundant schema validation of this data.
+		 * FieldBatch codec encoded data indexed by the EncodedTreeIndexes above.
 		 */
-		trees: EncodedFieldBatch,
+		trees: JsonCompatibleReadOnlySchema,
 	},
 	noAdditionalProps,
 );

package/src/feature-libraries/optional-field/optionalField.ts

@@ -710,7 +710,7 @@ export function optionalFieldIntoDelta(
 	}
 
 	if (!markIsANoop) {
-		delta.local = [mark];
+		delta.local = { marks: [mark] };
 	}
 
 	return delta;

package/src/feature-libraries/optional-field/requiredField.ts

@@ -36,10 +36,8 @@ export interface RequiredFieldEditor extends FieldEditor<OptionalChangeset> {
 
 export const requiredFieldEditor: RequiredFieldEditor = {
 	...optionalFieldEditor,
-	set: (ids: {
-		fill: ChangeAtomId;
-		detach: ChangeAtomId;
-	}): OptionalChangeset => optionalFieldEditor.set(false, ids),
+	set: (ids: { fill: ChangeAtomId; detach: ChangeAtomId }): OptionalChangeset =>
+		optionalFieldEditor.set(false, ids),
 };
 
 export const requiredFieldChangeHandler: FieldChangeHandler<

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

@@ -80,7 +80,7 @@ function encodeNodeSchema<TFormat>(
 	repo: TreeStoredSchema,
 	encodeValue: (schema: TreeNodeStoredSchema) => TFormat,
 ): Record<string, TFormat> {
-	const nodeSchema: Record<string, TFormat> = Object.create(null);
+	const nodeSchema: Record<string, TFormat> = Object.create(null) as Record<string, TFormat>;
 	for (const name of [...repo.nodeSchema.keys()].sort()) {
 		const schema = repo.nodeSchema.get(name) ?? fail(0xb28 /* missing schema */);
 		Object.defineProperty(nodeSchema, name, {
@@ -125,8 +125,9 @@ function decodeV2(f: FormatV2): TreeStoredSchema {
 /**
  * Creates a codec which performs synchronous monolithic encoding of schema content.
  */
-export const schemaCodecBuilder = ClientVersionDispatchingCodecBuilder.build("Schema", {
-	[lowestMinVersionForCollab]: {
+export const schemaCodecBuilder = ClientVersionDispatchingCodecBuilder.build("Schema", [
+	{
+		minVersionForCollab: lowestMinVersionForCollab,
 		formatVersion: SchemaFormatVersion.v1,
 		codec: {
 			encode: (data: TreeStoredSchema) => encodeRepoV1(data),
@@ -134,7 +135,8 @@ export const schemaCodecBuilder = ClientVersionDispatchingCodecBuilder.build("Sc
 			schema: FormatV1,
 		},
 	},
-	[FluidClientVersion.v2_43]: {
+	{
+		minVersionForCollab: FluidClientVersion.v2_43,
 		formatVersion: SchemaFormatVersion.v2,
 		codec: {
 			encode: (data: TreeStoredSchema) => encodeRepoV2(data),
@@ -142,4 +144,4 @@ export const schemaCodecBuilder = ClientVersionDispatchingCodecBuilder.build("Sc
 			schema: FormatV2,
 		},
 	},
-});
+]);

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

@@ -130,7 +130,7 @@ export class SchemaSummarizer
 			0x3da /* there should not already be stored schema when loading stored schema */,
 		);
 
-		const schemaString = bufferToString(schemaBuffer, "utf-8");
+		const schemaString = bufferToString(schemaBuffer, "utf8");
 		// Currently no Fluid handles are used, so just use JSON.parse.
 		const decoded = this.codec.decode(JSON.parse(schemaString));
 		this.schema.apply(decoded);

package/src/feature-libraries/sequence-field/invert.ts

@@ -189,7 +189,7 @@ function invertMark(
 			if (mark.finalEndpoint !== undefined) {
 				moveIn.finalEndpoint = {
 					localId: mark.finalEndpoint.localId,
-					revision: mark.revision,
+					revision,
 				};
 			}
 			let effect: MarkEffect = moveIn;
@@ -228,7 +228,7 @@ function invertMark(
 			if (mark.finalEndpoint) {
 				invertedMark.finalEndpoint = {
 					localId: mark.finalEndpoint.localId,
-					revision: mark.revision,
+					revision,
 				};
 			}
 			return applyMovedChanges(invertedMark, mark.revision, crossFieldManager);