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

package/src/feature-libraries/chunked-forest/codec/chunkDecoding.ts

@@ -3,23 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils";
-import { assertValidIndex } from "../../../util/index.js";
-import { FieldKey, TreeNodeSchemaIdentifier, Value } from "../../../core/index.js";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+
 import { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
-import { TreeChunk } from "../chunk.js";
+import { FieldKey, TreeNodeSchemaIdentifier, Value } from "../../../core/index.js";
+import { assertValidIndex } from "../../../util/index.js";
 import { BasicChunk } from "../basicChunk.js";
-import { SequenceChunk } from "../sequenceChunk.js";
+import { TreeChunk } from "../chunk.js";
 import { emptyChunk } from "../emptyChunk.js";
-import {
-	EncodedAnyShape,
-	EncodedChunkShape,
-	EncodedFieldBatch,
-	EncodedInlineArray,
-	EncodedNestedArray,
-	EncodedTreeShape,
-	EncodedValueShape,
-} from "./format.js";
+import { SequenceChunk } from "../sequenceChunk.js";
+
 import {
 	ChunkDecoder,
 	StreamCursor,
@@ -35,6 +28,15 @@ import {
 	decode as genericDecode,
 	readStreamIdentifier,
 } from "./chunkDecodingGeneric.js";
+import {
+	EncodedAnyShape,
+	EncodedChunkShape,
+	EncodedFieldBatch,
+	EncodedInlineArray,
+	EncodedNestedArray,
+	EncodedTreeShape,
+	EncodedValueShape,
+} from "./format.js";
 
 /**
  * Decode `chunk` into a TreeChunk.

package/src/feature-libraries/chunked-forest/codec/chunkDecodingGeneric.ts

@@ -3,12 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { BrandedType } from "../../../util/index.js";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
+import { BrandedType } from "../../../util/index.js";
 import { TreeChunk } from "../chunk.js";
-import { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
+
 import { ChunkDecoder, StreamCursor, getChecked, readStream } from "./chunkCodecUtilities.js";
+import { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
 
 /**
  * General purpose shape based tree decoder which gets its support for specific shapes from the caller.

package/src/feature-libraries/chunked-forest/codec/chunkEncodingGeneric.ts

@@ -6,13 +6,14 @@
 import { TreeValue } from "../../../core/index.js";
 import { fail } from "../../../util/index.js";
 import { FluidSerializableReadOnly } from "../../valueUtilities.js";
-import { EncodedFieldBatchGeneric } from "./formatGeneric.js";
+
 import {
 	Counter,
 	CounterFilter,
 	DeduplicationTable,
 	jsonMinimizingFilter,
 } from "./chunkCodecUtilities.js";
+import { EncodedFieldBatchGeneric } from "./formatGeneric.js";
 
 /**
  * An identifier which can be compressed using {@link Counter}.

package/src/feature-libraries/chunked-forest/codec/codecs.ts

@@ -3,16 +3,17 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils";
-import { CursorLocationType, StoredSchemaCollection } from "../../../core/index.js";
-import { JsonCompatibleReadOnly } from "../../../util/index.js";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+
 import { ICodecOptions, IJsonCodec, makeVersionedValidatedCodec } from "../../../codec/index.js";
-import { FullSchemaPolicy } from "../../modular-schema/index.js";
+import { CursorLocationType, SchemaAndPolicy } from "../../../core/index.js";
+import { JsonCompatibleReadOnly } from "../../../util/index.js";
 import { TreeCompressionStrategy } from "../../treeCompressionUtils.js";
-import { EncodedFieldBatch, validVersions } from "./format.js";
+
 import { decode } from "./chunkDecoding.js";
-import { schemaCompressedEncode } from "./schemaBasedEncoding.js";
 import { FieldBatch } from "./fieldBatch.js";
+import { EncodedFieldBatch, validVersions } from "./format.js";
+import { schemaCompressedEncode } from "./schemaBasedEncoding.js";
 import { uncompressedEncode } from "./uncompressedEncode.js";
 
 export interface FieldBatchEncodingContext {
@@ -20,11 +21,6 @@ export interface FieldBatchEncodingContext {
 	readonly schema?: SchemaAndPolicy;
 }
 
-export interface SchemaAndPolicy {
-	readonly schema: StoredSchemaCollection;
-	readonly policy: FullSchemaPolicy;
-}
-
 export type FieldBatchCodec = IJsonCodec<
 	FieldBatch,
 	EncodedFieldBatch,
@@ -32,11 +28,12 @@ export type FieldBatchCodec = IJsonCodec<
 	FieldBatchEncodingContext
 >;
 
-export function makeFieldBatchCodec(options: ICodecOptions): FieldBatchCodec {
+export function makeFieldBatchCodec(options: ICodecOptions, writeVersion: number): FieldBatchCodec {
 	// Note: it's important that the decode function is schema-agnostic for this strategy/layering to work, since
 	// the schema that an op was encoded in doesn't necessarily match the current schema for the document (e.g. if
 	// decode is being run on a client that just submitted a schema change, but the op is from another client who has
 	// yet to receive that change).
+	assert(validVersions.has(writeVersion), 0x935 /* Invalid write version for FieldBatch codec */);
 
 	return makeVersionedValidatedCodec(options, validVersions, EncodedFieldBatch, {
 		encode: (data: FieldBatch, context: FieldBatchEncodingContext): EncodedFieldBatch => {

package/src/feature-libraries/chunked-forest/codec/compressedEncode.ts

@@ -3,34 +3,36 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+
 import {
 	CursorLocationType,
 	FieldKey,
-	TreeFieldStoredSchema,
+	FieldKindIdentifier,
 	ITreeCursorSynchronous,
+	TreeFieldStoredSchema,
 	TreeNodeSchemaIdentifier,
 	Value,
 	forEachNode,
-	FieldKindIdentifier,
 } from "../../../core/index.js";
 import { fail, getOrCreate } from "../../../util/index.js";
 import { type FlexFieldKind } from "../../modular-schema/index.js";
+
+import { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
 import {
 	BufferFormat as BufferFormatGeneric,
 	Shape as ShapeGeneric,
 	handleShapesAndIdentifiers,
 } from "./chunkEncodingGeneric.js";
-import { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
+import { FieldBatch } from "./fieldBatch.js";
 import {
-	version,
-	EncodedChunkShape,
-	EncodedValueShape,
 	EncodedAnyShape,
-	EncodedNestedArray,
+	EncodedChunkShape,
 	EncodedFieldBatch,
+	EncodedNestedArray,
+	EncodedValueShape,
+	version,
 } from "./format.js";
-import { FieldBatch } from "./fieldBatch.js";
 
 /**
  * Encode data from `FieldBatch` in into an `EncodedChunk`.

package/src/feature-libraries/chunked-forest/codec/format.ts

@@ -4,11 +4,12 @@
  */
 
 import { Static, Type } from "@sinclair/typebox";
+
 import { unionOptions } from "../../../codec/index.js";
-import { EncodedFieldBatchGeneric, IdentifierOrIndex, ShapeIndex, Count } from "./formatGeneric.js";
 
-// TODO: Versions from here and schemaIndexFormat.ts should eventually be deduplicated into one version.
-export const version = 1.0;
+import { Count, EncodedFieldBatchGeneric, IdentifierOrIndex, ShapeIndex } from "./formatGeneric.js";
+
+export const version = 1;
 
 // Compatible versions used for format/version validation.
 // TODO: A proper version update policy will need to be documented.

package/src/feature-libraries/chunked-forest/codec/index.ts

@@ -5,9 +5,4 @@
 
 export { EncodedFieldBatch } from "./format.js";
 export { FieldBatch } from "./fieldBatch.js";
-export {
-	FieldBatchCodec,
-	makeFieldBatchCodec,
-	FieldBatchEncodingContext,
-	SchemaAndPolicy,
-} from "./codecs.js";
+export { FieldBatchCodec, makeFieldBatchCodec, FieldBatchEncodingContext } from "./codecs.js";

package/src/feature-libraries/chunked-forest/codec/nodeShape.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import {
 	FieldKey,
 	ITreeCursorSynchronous,
@@ -11,16 +12,17 @@ import {
 	forEachField,
 } from "../../../core/index.js";
 import { brand, fail } from "../../../util/index.js";
-import { BufferFormat, IdentifierToken, Shape } from "./chunkEncodingGeneric.js";
+
 import { Counter, DeduplicationTable } from "./chunkCodecUtilities.js";
-import { EncodedChunkShape, EncodedFieldShape, EncodedValueShape } from "./format.js";
+import { BufferFormat, IdentifierToken, Shape } from "./chunkEncodingGeneric.js";
 import {
-	NodeEncoder,
-	KeyedFieldEncoder,
-	FieldEncoder,
 	EncoderCache,
+	FieldEncoder,
+	KeyedFieldEncoder,
+	NodeEncoder,
 	encodeValue,
 } from "./compressedEncode.js";
+import { EncodedChunkShape, EncodedFieldShape, EncodedValueShape } from "./format.js";
 
 export class NodeShape extends Shape<EncodedChunkShape> implements NodeEncoder {
 	// TODO: Ensure uniform chunks, encoding and identifier generation sort fields the same.

package/src/feature-libraries/chunked-forest/codec/schemaBasedEncoding.ts

@@ -3,32 +3,34 @@
  * Licensed under the MIT License.
  */
 
-import { unreachableCase } from "@fluidframework/core-utils";
+import { unreachableCase } from "@fluidframework/core-utils/internal";
+
 import {
-	TreeFieldStoredSchema,
+	LeafNodeStoredSchema,
+	MapNodeStoredSchema,
+	ObjectNodeStoredSchema,
 	StoredSchemaCollection,
+	TreeFieldStoredSchema,
 	TreeNodeSchemaIdentifier,
 	ValueSchema,
-	ObjectNodeStoredSchema,
-	LeafNodeStoredSchema,
-	MapNodeStoredSchema,
+	Multiplicity,
 } from "../../../core/index.js";
-import { FullSchemaPolicy } from "../../modular-schema/index.js";
 import { fail } from "../../../util/index.js";
-import { Multiplicity } from "../../multiplicity.js";
-import { EncodedFieldBatch, EncodedValueShape } from "./format.js";
+import { FullSchemaPolicy } from "../../modular-schema/index.js";
+
 import {
 	EncoderCache,
 	FieldEncoder,
-	KeyedFieldEncoder,
 	FieldShaper,
+	KeyedFieldEncoder,
 	TreeShaper,
 	anyNodeEncoder,
 	asFieldEncoder,
 	compressedEncode,
 } from "./compressedEncode.js";
-import { NodeShape } from "./nodeShape.js";
 import { FieldBatch } from "./fieldBatch.js";
+import { EncodedFieldBatch, EncodedValueShape } from "./format.js";
+import { NodeShape } from "./nodeShape.js";
 
 /**
  * Encode data from `fieldBatch` in into an `EncodedChunk`.
@@ -63,7 +65,7 @@ export function fieldShaper(
 	field: TreeFieldStoredSchema,
 	cache: EncoderCache,
 ): FieldEncoder {
-	const kind = cache.fieldShapes.get(field.kind.identifier) ?? fail("missing FieldKind");
+	const kind = cache.fieldShapes.get(field.kind) ?? fail("missing FieldKind");
 	const type = oneFromSet(field.types);
 	const nodeEncoder = type !== undefined ? treeHandler.shapeFromTree(type) : anyNodeEncoder;
 	// eslint-disable-next-line unicorn/prefer-ternary

package/src/feature-libraries/chunked-forest/codec/uncompressedEncode.ts

@@ -5,8 +5,9 @@
 
 import { ITreeCursorSynchronous, forEachField, forEachNode } from "../../../core/index.js";
 import { FluidSerializableReadOnly } from "../../valueUtilities.js";
+
 import { FieldBatch } from "./fieldBatch.js";
-import { version, EncodedTreeShape, EncodedNestedArray, EncodedFieldBatch } from "./format.js";
+import { EncodedFieldBatch, EncodedNestedArray, EncodedTreeShape, version } from "./format.js";
 import { ShapeIndex } from "./formatGeneric.js";
 
 /**

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

@@ -4,16 +4,17 @@
  */
 
 import {
-	FieldKey,
 	CursorLocationType,
+	CursorMarker,
+	FieldKey,
 	FieldUpPath,
-	UpPath,
 	PathRootPrefix,
-	CursorMarker,
+	UpPath,
 } from "../../core/index.js";
 import { fail } from "../../util/index.js";
 import { prefixFieldPath } from "../treeCursorUtils.js";
-import { ChunkedCursor, cursorChunk, dummyRoot, TreeChunk } from "./chunk.js";
+
+import { ChunkedCursor, TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
 
 /**
  * Chunk that is empty.

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

@@ -20,5 +20,4 @@ export {
 	FieldBatchCodec,
 	makeFieldBatchCodec,
 	FieldBatchEncodingContext,
-	SchemaAndPolicy,
 } from "./codec/index.js";

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

@@ -4,8 +4,9 @@
  */
 
 import { ReferenceCountedBase } from "../../util/index.js";
+
 import { BasicChunkCursor } from "./basicChunk.js";
-import { ChunkedCursor, dummyRoot, TreeChunk } from "./chunk.js";
+import { ChunkedCursor, TreeChunk, dummyRoot } from "./chunk.js";
 
 /**
  * General purpose multi-node sequence chunk.
@@ -54,7 +55,7 @@ export class SequenceChunk extends ReferenceCountedBase implements TreeChunk {
 		);
 	}
 
-	protected dispose(): void {
+	protected onUnreferenced(): void {
 		for (const child of this.subChunks) {
 			child.referenceRemoved();
 		}

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

@@ -3,20 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { assert, compareArrays } from "@fluidframework/core-utils";
+import { assert, compareArrays } from "@fluidframework/core-utils/internal";
+
 import {
-	FieldKey,
-	TreeNodeSchemaIdentifier,
 	CursorLocationType,
+	FieldKey,
 	FieldUpPath,
-	UpPath,
+	PathRootPrefix,
+	TreeNodeSchemaIdentifier,
 	TreeValue,
+	UpPath,
 	Value,
-	PathRootPrefix,
 } from "../../core/index.js";
-import { fail, ReferenceCountedBase } from "../../util/index.js";
-import { prefixFieldPath, prefixPath, SynchronousCursor } from "../treeCursorUtils.js";
-import { ChunkedCursor, cursorChunk, dummyRoot, TreeChunk } from "./chunk.js";
+import { ReferenceCountedBase, fail } from "../../util/index.js";
+import { SynchronousCursor, prefixFieldPath, prefixPath } from "../treeCursorUtils.js";
+
+import { ChunkedCursor, TreeChunk, cursorChunk, dummyRoot } from "./chunk.js";
 
 /**
  * Create a tree chunk with ref count 1.
@@ -64,7 +66,7 @@ export class UniformChunk extends ReferenceCountedBase implements TreeChunk {
 		return new Cursor(this);
 	}
 
-	protected dispose(): void {}
+	protected onUnreferenced(): void {}
 }
 
 /**

package/src/feature-libraries/contextuallyTyped.ts

@@ -3,45 +3,46 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { fail, isReadonlyArray } from "../util/index.js";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import {
+	CursorLocationType,
 	EmptyKey,
 	FieldKey,
-	Value,
-	MapTree,
 	ITreeCursorSynchronous,
+	MapTree,
+	Value,
 	isCursor,
-	TreeValue,
-	CursorLocationType,
+	Multiplicity,
 } from "../core/index.js";
+import { fail, isReadonlyArray } from "../util/index.js";
+
 // TODO:
 // This module currently is assuming use of default-field-kinds.
 // The field kinds should instead come from a view schema registry thats provided somewhere.
 import { fieldKinds } from "./default-schema/index.js";
+import { TreeDataContext } from "./fieldGenerator.js";
+import { cursorForMapTreeField, cursorForMapTreeNode, mapTreeFromCursor } from "./mapTreeCursor.js";
 import { FlexFieldKind } from "./modular-schema/index.js";
+import {
+	AllowedTypesToFlexInsertableTree,
+	InsertableFlexField,
+	InsertableFlexNode,
+} from "./schema-aware/index.js";
 import {
 	AllowedTypeSet,
-	FlexAllowedTypes,
 	Any,
+	FlexAllowedTypes,
 	FlexFieldNodeSchema,
-	FlexTreeSchema,
-	LeafNodeSchema,
+	FlexFieldSchema,
 	FlexMapNodeSchema,
 	FlexObjectNodeSchema,
-	FlexFieldSchema,
 	FlexTreeNodeSchema,
+	FlexTreeSchema,
+	LeafNodeSchema,
 	allowedTypesSchemaSet,
 } from "./typed-schema/index.js";
-import { cursorForMapTreeField, cursorForMapTreeNode, mapTreeFromCursor } from "./mapTreeCursor.js";
-import {
-	AllowedTypesToFlexInsertableTree,
-	InsertableFlexField,
-	InsertableFlexNode,
-} from "./schema-aware/index.js";
-import { isFluidHandle, allowsValue } from "./valueUtilities.js";
-import { TreeDataContext } from "./fieldGenerator.js";
-import { Multiplicity } from "./multiplicity.js";
+import { allowsValue, isTreeValue } from "./valueUtilities.js";
 
 /**
  * This library defines a tree data format that can infer its types from context.
@@ -53,7 +54,7 @@ import { Multiplicity } from "./multiplicity.js";
  * APIs exposing data in this format should likely further constrain what is allowed.
  * For example guarantee which fields and nodes should be inlined, and that types will be required everywhere.
  *
- * This is from Editable tree one which has been deleted and should no longer be used!
+ * This is from Flex tree one which has been deleted and should no longer be used!
  */
 
 /**
@@ -95,20 +96,6 @@ export const typeNameSymbol: unique symbol = Symbol(`${scope}:typeName`);
  */
 export const valueSymbol: unique symbol = Symbol(`${scope}:value`);
 
-/**
- * Checks if a value is a {@link TreeValue}.
- */
-export function isTreeValue(nodeValue: unknown): nodeValue is TreeValue {
-	switch (typeof nodeValue) {
-		case "string":
-		case "number":
-		case "boolean":
-			return true;
-		default:
-			return nodeValue === null || isFluidHandle(nodeValue);
-	}
-}
-
 export function getFieldKind(fieldSchema: FlexFieldSchema): FlexFieldKind {
 	// TODO:
 	// This module currently is assuming use of defaultFieldKinds.
@@ -259,7 +246,7 @@ export interface ContextuallyTypedNodeDataObject {
 	/**
 	 * Fields of this node, indexed by their field keys.
 	 *
-	 * Allow explicit undefined for compatibility with EditableTree, and type-safety on read.
+	 * Allow explicit undefined for compatibility with FlexTree, and type-safety on read.
 	 */
 	// TODO: make sure explicit undefined is actually handled correctly.
 	[key: FieldKey]: ContextuallyTypedFieldData;
@@ -486,7 +473,7 @@ function setFieldForKey(
 	const requiredFieldSchema = schema.getFieldSchema(key);
 	const multiplicity = getFieldKind(requiredFieldSchema).multiplicity;
 	if (multiplicity === Multiplicity.Single && context.fieldSource !== undefined) {
-		const fieldGenerator = context.fieldSource(key, requiredFieldSchema);
+		const fieldGenerator = context.fieldSource(key, requiredFieldSchema.stored);
 		if (fieldGenerator !== undefined) {
 			const children = fieldGenerator();
 			fields.set(key, children);

package/src/feature-libraries/default-schema/defaultEditBuilder.ts

@@ -3,39 +3,38 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { OptionalChangeset } from "../optional-field/index.js";
-import { ICodecFamily, ICodecOptions } from "../../codec/index.js";
+import { assert } from "@fluidframework/core-utils/internal";
+
+import { ICodecFamily } from "../../codec/index.js";
 import {
+	ChangeEncodingContext,
 	ChangeFamily,
-	ChangeRebaser,
-	UpPath,
 	ChangeFamilyEditor,
-	FieldUpPath,
-	compareFieldUpPaths,
-	topDownPath,
-	TaggedChange,
-	DeltaRoot,
+	ChangeRebaser,
 	ChangesetLocalId,
-	DeltaDetachedNodeId,
-	ChangeEncodingContext,
-	RevisionTagCodec,
 	CursorLocationType,
+	DeltaDetachedNodeId,
+	DeltaRoot,
+	FieldUpPath,
 	ITreeCursorSynchronous,
+	TaggedChange,
+	UpPath,
+	compareFieldUpPaths,
+	topDownPath,
 } from "../../core/index.js";
 import { brand } from "../../util/index.js";
 import {
-	ModularChangeFamily,
-	ModularEditBuilder,
+	EditDescription,
 	FieldChangeset,
-	ModularChangeset,
 	FieldEditDescription,
+	ModularChangeFamily,
+	ModularChangeset,
+	ModularEditBuilder,
 	intoDelta as intoModularDelta,
 	relevantRemovedRoots as relevantModularRemovedRoots,
-	EditDescription,
 } from "../modular-schema/index.js";
-import { FieldBatchCodec } from "../chunked-forest/index.js";
-import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
+import { OptionalChangeset } from "../optional-field/index.js";
+
 import { fieldKinds, optional, sequence, required as valueFieldKind } from "./defaultFieldKinds.js";
 
 export type DefaultChangeset = ModularChangeset;
@@ -48,19 +47,8 @@ export type DefaultChangeset = ModularChangeset;
 export class DefaultChangeFamily implements ChangeFamily<DefaultEditBuilder, DefaultChangeset> {
 	private readonly modularFamily: ModularChangeFamily;
 
-	public constructor(
-		revisionTagCodec: RevisionTagCodec,
-		fieldBatchCodec: FieldBatchCodec,
-		codecOptions: ICodecOptions,
-		chunkCompressionStrategy?: TreeCompressionStrategy,
-	) {
-		this.modularFamily = new ModularChangeFamily(
-			fieldKinds,
-			revisionTagCodec,
-			fieldBatchCodec,
-			codecOptions,
-			chunkCompressionStrategy,
-		);
+	public constructor(codecs: ICodecFamily<ModularChangeset, ChangeEncodingContext>) {
+		this.modularFamily = new ModularChangeFamily(fieldKinds, codecs);
 	}
 
 	public get rebaser(): ChangeRebaser<DefaultChangeset> {
@@ -244,10 +232,7 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 				};
 				edits.push(edit);
 
-				this.modularBuilder.submitChanges(
-					edits,
-					newContent === undefined ? detachId : fillId,
-				);
+				this.modularBuilder.submitChanges(edits);
 			},
 		};
 	}
@@ -310,23 +295,20 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 			}
 			const moveOut = sequence.changeHandler.editor.moveOut(sourceIndex, count, moveId);
 			const moveIn = sequence.changeHandler.editor.moveIn(destIndex, count, moveId);
-			this.modularBuilder.submitChanges(
-				[
-					{
-						type: "field",
-						field: sourceField,
-						fieldKind: sequence.identifier,
-						change: brand(moveOut),
-					},
-					{
-						type: "field",
-						field: adjustedAttachField,
-						fieldKind: sequence.identifier,
-						change: brand(moveIn),
-					},
-				],
-				moveId,
-			);
+			this.modularBuilder.submitChanges([
+				{
+					type: "field",
+					field: sourceField,
+					fieldKind: sequence.identifier,
+					change: brand(moveOut),
+				},
+				{
+					type: "field",
+					field: adjustedAttachField,
+					fieldKind: sequence.identifier,
+					change: brand(moveIn),
+				},
+			]);
 		}
 	}
 
@@ -352,10 +334,7 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 				};
 				// The changes have to be submitted together, otherwise they will be assigned different revisions,
 				// which will prevent the build ID and the insert ID from matching.
-				this.modularBuilder.submitChanges(
-					[build, attach],
-					brand((firstId as number) + length - 1),
-				);
+				this.modularBuilder.submitChanges([build, attach]);
 			},
 			remove: (index: number, count: number): void => {
 				if (count === 0) {