@fluidframework/tree 2.4.0-294316 → 2.4.0-297385

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.4.0-294316",
+  "version": "2.4.0-297385",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -87,17 +87,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.4.0-294316",
-    "@fluidframework/container-runtime": "2.4.0-294316",
-    "@fluidframework/core-interfaces": "2.4.0-294316",
-    "@fluidframework/core-utils": "2.4.0-294316",
-    "@fluidframework/datastore-definitions": "2.4.0-294316",
-    "@fluidframework/driver-definitions": "2.4.0-294316",
-    "@fluidframework/id-compressor": "2.4.0-294316",
-    "@fluidframework/runtime-definitions": "2.4.0-294316",
-    "@fluidframework/runtime-utils": "2.4.0-294316",
-    "@fluidframework/shared-object-base": "2.4.0-294316",
-    "@fluidframework/telemetry-utils": "2.4.0-294316",
+    "@fluid-internal/client-utils": "2.4.0-297385",
+    "@fluidframework/container-runtime": "2.4.0-297385",
+    "@fluidframework/core-interfaces": "2.4.0-297385",
+    "@fluidframework/core-utils": "2.4.0-297385",
+    "@fluidframework/datastore-definitions": "2.4.0-297385",
+    "@fluidframework/driver-definitions": "2.4.0-297385",
+    "@fluidframework/id-compressor": "2.4.0-297385",
+    "@fluidframework/runtime-definitions": "2.4.0-297385",
+    "@fluidframework/runtime-utils": "2.4.0-297385",
+    "@fluidframework/shared-object-base": "2.4.0-297385",
+    "@fluidframework/telemetry-utils": "2.4.0-297385",
     "@sinclair/typebox": "^0.32.29",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "@ungap/structured-clone": "^1.2.0",
@@ -106,20 +106,20 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "~1.8.3",
-    "@fluid-internal/mocha-test-setup": "2.4.0-294316",
-    "@fluid-private/stochastic-test-utils": "2.4.0-294316",
-    "@fluid-private/test-dds-utils": "2.4.0-294316",
-    "@fluid-private/test-drivers": "2.4.0-294316",
+    "@fluid-internal/mocha-test-setup": "2.4.0-297385",
+    "@fluid-private/stochastic-test-utils": "2.4.0-297385",
+    "@fluid-private/test-dds-utils": "2.4.0-297385",
+    "@fluid-private/test-drivers": "2.4.0-297385",
     "@fluid-tools/benchmark": "^0.50.0",
     "@fluid-tools/build-cli": "^0.46.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.46.0",
-    "@fluidframework/container-definitions": "2.4.0-294316",
-    "@fluidframework/container-loader": "2.4.0-294316",
+    "@fluidframework/container-definitions": "2.4.0-297385",
+    "@fluidframework/container-loader": "2.4.0-297385",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
-    "@fluidframework/test-runtime-utils": "2.4.0-294316",
-    "@fluidframework/test-utils": "2.4.0-294316",
-    "@fluidframework/tree-previous": "npm:@fluidframework/tree@2.3.0",
+    "@fluidframework/test-runtime-utils": "2.4.0-297385",
+    "@fluidframework/test-utils": "2.4.0-297385",
+    "@fluidframework/tree-previous": "npm:@fluidframework/tree@~2.3.0",
     "@microsoft/api-extractor": "7.47.8",
     "@types/diff": "^3.5.1",
     "@types/easy-table": "^0.0.32",
@@ -163,6 +163,12 @@
   },
   "typeValidation": {
     "broken": {
+      "TypeAlias_MapNodeInsertableData": {
+        "backCompat": false
+      },
+      "Interface_InternalTypes_TreeNodeSchemaNonClass": {
+        "backCompat": false
+      },
       "Interface_FieldSchemaUnsafe": {
         "forwardCompat": false
       },
@@ -171,9 +177,12 @@
       },
       "TypeAlias_ImplicitFieldSchema": {
         "forwardCompat": false
+      },
+      "TypeAlias_ImplicitAllowedTypes": {
+        "forwardCompat": false
       }
     },
-    "entrypoint": "internal"
+    "entrypoint": "public"
   },
   "scripts": {
     "api": "fluid-build . --task api",
@@ -235,7 +244,7 @@
     "test:snapshots:regen": "pnpm test:mocha:esm --snapshot",
     "test:stress": "cross-env FUZZ_TEST_COUNT=20 FUZZ_STRESS_RUN=true mocha --ignore \"lib/test/memory/**/*\" --recursive \"lib/test/**/*.spec.js\"",
     "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
-    "typetests:gen": "flub generate typetests --dir . -v --level public",
+    "typetests:gen": "flub generate typetests --dir . -v",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }
 }

package/src/core/change-family/changeFamily.ts

@@ -8,10 +8,13 @@ import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 import type { ICodecFamily, IJsonCodec } from "../../codec/index.js";
 import type { SchemaAndPolicy } from "../../core/index.js";
 import type { JsonCompatibleReadOnly } from "../../util/index.js";
-import type { ChangeRebaser, RevisionTag } from "../rebase/index.js";
+import type { ChangeRebaser, RevisionTag, TaggedChange } from "../rebase/index.js";
 
 export interface ChangeFamily<TEditor extends ChangeFamilyEditor, TChange> {
-	buildEditor(changeReceiver: (change: TChange) => void): TEditor;
+	buildEditor(
+		mintRevisionTag: () => RevisionTag,
+		changeReceiver: (change: TaggedChange<TChange>) => void,
+	): TEditor;
 
 	readonly rebaser: ChangeRebaser<TChange>;
 	readonly codecs: ICodecFamily<TChange, ChangeEncodingContext>;

package/src/core/change-family/editBuilder.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
+import type { TaggedChange } from "../rebase/index.js";
 import type { ChangeFamily, ChangeFamilyEditor } from "./changeFamily.js";
 
 export abstract class EditBuilder<TChange> implements ChangeFamilyEditor {
 	public constructor(
 		protected readonly changeFamily: ChangeFamily<ChangeFamilyEditor, TChange>,
-		private readonly changeReceiver: (change: TChange) => void,
+		private readonly changeReceiver: (change: TaggedChange<TChange>) => void,
 	) {}
 
 	/**
@@ -16,7 +17,7 @@ export abstract class EditBuilder<TChange> implements ChangeFamilyEditor {
 	 *
 	 * @sealed
 	 */
-	protected applyChange(change: TChange): void {
+	protected applyChange(change: TaggedChange<TChange>): void {
 		this.changeReceiver(change);
 	}
 

package/src/core/rebase/changeRebaser.ts

@@ -51,6 +51,7 @@ export interface ChangeRebaser<TChangeset> {
 	 * @param changes - The changes to invert.
 	 * @param isRollback - Whether the inverted change is meant to rollback a change on a branch as is the case when
 	 * performing a sandwich rebase.
+	 * @param revision - The revision for the invert changeset.
 	 * This flag is relevant to merge semantics that are dependent on edit sequencing order:
 	 * - In the context of an undo, this function inverts a change that is sequenced and applied before the produced inverse.
 	 * - In the context of a rollback, this function inverts a change that is sequenced after but applied before the produced inverse.
@@ -59,7 +60,11 @@ export interface ChangeRebaser<TChangeset> {
 	 * `compose([changes, inverse(changes)])` be equal to `compose([])`:
 	 * See {@link ChangeRebaser} for details.
 	 */
-	invert(changes: TaggedChange<TChangeset>, isRollback: boolean): TChangeset;
+	invert(
+		changes: TaggedChange<TChangeset>,
+		isRollback: boolean,
+		revision: RevisionTag,
+	): TChangeset;
 
 	/**
 	 * Rebase `change` over `over`.

package/src/core/rebase/utils.ts

@@ -444,8 +444,8 @@ function rollbackFromCommit<TChange>(
 	if (commit.rollback !== undefined) {
 		return commit.rollback;
 	}
-	const untagged = changeRebaser.invert(commit, true);
 	const tag = mintRevisionTag();
+	const untagged = changeRebaser.invert(commit, true, tag);
 	const deeplyTaggedRollback = changeRebaser.changeRevision(untagged, tag, commit.revision);
 	const fullyTaggedRollback = tagRollbackInverse(deeplyTaggedRollback, tag, commit.revision);
 

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

@@ -166,6 +166,11 @@ export abstract class TreeNodeStoredSchema {
 	 * and is runtime validated by the codec.
 	 */
 	public abstract encode(): ErasedTreeNodeSchemaDataFormat;
+
+	/**
+	 * Returns the schema for the provided field.
+	 */
+	public abstract getFieldSchema(field: FieldKey): TreeFieldStoredSchema;
 }
 
 /**
@@ -202,6 +207,10 @@ export class ObjectNodeStoredSchema extends TreeNodeStoredSchema {
 			object: fieldsObject,
 		});
 	}
+
+	public override getFieldSchema(field: FieldKey): TreeFieldStoredSchema {
+		return this.objectNodeFields.get(field) ?? storedEmptyFieldSchema;
+	}
 }
 
 /**
@@ -225,6 +234,10 @@ export class MapNodeStoredSchema extends TreeNodeStoredSchema {
 			map: encodeFieldSchema(this.mapFields),
 		});
 	}
+
+	public override getFieldSchema(field: FieldKey): TreeFieldStoredSchema {
+		return this.mapFields;
+	}
 }
 
 /**
@@ -252,6 +265,10 @@ export class LeafNodeStoredSchema extends TreeNodeStoredSchema {
 			leaf: encodeValueSchema(this.leafValue),
 		});
 	}
+
+	public override getFieldSchema(field: FieldKey): TreeFieldStoredSchema {
+		return storedEmptyFieldSchema;
+	}
 }
 
 export const storedSchemaDecodeDispatcher: DiscriminatedUnionDispatcher<

package/src/core/tree/anchorSet.ts

@@ -128,7 +128,6 @@ export interface AnchorEvents {
 	 * Compare to {@link AnchorEvents.childrenChanged} which is emitted in the middle of the batch/delta-visit.
 	 */
 	childrenChangedAfterBatch(arg: {
-		anchor: AnchorNode;
 		changedFields: ReadonlySet<FieldKey>;
 	}): void;
 
@@ -179,7 +178,7 @@ export interface AnchorEvents {
 	 * subtree changed, compared to {@link AnchorEvents.subtreeChanged} or {@link AnchorEvents.subtreeChanging} which
 	 * fire when something _may_ have changed or _may_ be about to change.
 	 */
-	subtreeChangedAfterBatch(anchor: AnchorNode): void;
+	subtreeChangedAfterBatch(): void;
 }
 
 /**
@@ -775,9 +774,9 @@ export class AnchorSet implements Listenable<AnchorSetRootEvents>, AnchorLocator
 									e.changedField ??
 									fail("childrenChangedAfterBatch events should have a changedField"),
 							);
-						node.events.emit(event, { anchor: node, changedFields: new Set(fieldKeys) });
+						node.events.emit(event, { changedFields: new Set(fieldKeys) });
 					} else {
-						node.events.emit(event, node);
+						node.events.emit(event);
 					}
 				}
 			},

package/src/core/tree/detachedFieldIndex.ts

@@ -150,7 +150,15 @@ export class DetachedFieldIndex {
 					});
 				}
 				this.latestRelevantRevisionToFields.delete(current);
-				this.latestRelevantRevisionToFields.set(updated, inner);
+
+				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);
+				}
 			}
 		}
 
@@ -349,10 +357,13 @@ export class DetachedFieldIndex {
 			0x9bd /* revisions should only be set once using this function after loading data from a summary */,
 		);
 
-		const newDetachedNodeToField = new Map();
+		const newDetachedNodeToField: NestedMap<Major, Minor, DetachedField> = new Map();
 		const rootMap = new Map();
 		forEachInNestedMap(this.detachedNodeToField, ({ root }, major, minor) => {
-			setInNestedMap(newDetachedNodeToField, major, minor, { root, latestRevision });
+			setInNestedMap(newDetachedNodeToField, major, minor, {
+				root,
+				latestRelevantRevision: latestRevision,
+			});
 			rootMap.set(root, { major, minor });
 		});
 

package/src/core/tree/detachedFieldIndexTypes.ts

@@ -27,7 +27,7 @@ export type ForestRootId = Brand<number, "tree.ForestRootId">;
 export interface DetachedField {
 	/**
 	 * The atomic ID that the `DetachedFieldIndex` uses to uniquely identify the first (and only) root in the field.
-	 * This ID is scoped to the specific `DetachedFieldIndex` from witch this object was retrieved.
+	 * This ID is scoped to the specific `DetachedFieldIndex` from which this object was retrieved.
 	 *
 	 * The current implementation only supports a single root per field.
 	 * This will be changed in the future for performance reasons.

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

@@ -8,16 +8,17 @@ import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import type { ICodecFamily } from "../../codec/index.js";
 import {
+	type ChangeAtomId,
 	type ChangeEncodingContext,
 	type ChangeFamily,
 	type ChangeFamilyEditor,
 	type ChangeRebaser,
-	type ChangesetLocalId,
 	CursorLocationType,
 	type DeltaDetachedNodeId,
 	type DeltaRoot,
 	type FieldUpPath,
 	type ITreeCursorSynchronous,
+	type RevisionTag,
 	type TaggedChange,
 	type UpPath,
 	compareFieldUpPaths,
@@ -43,6 +44,7 @@ import {
 	required as valueFieldKind,
 } from "./defaultFieldKinds.js";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
+import type { CellId } from "../sequence-field/index.js";
 
 export type DefaultChangeset = ModularChangeset;
 
@@ -68,8 +70,11 @@ export class DefaultChangeFamily
 		return this.modularFamily.codecs;
 	}
 
-	public buildEditor(changeReceiver: (change: DefaultChangeset) => void): DefaultEditBuilder {
-		return new DefaultEditBuilder(this, changeReceiver);
+	public buildEditor(
+		mintRevisionTag: () => RevisionTag,
+		changeReceiver: (change: TaggedChange<DefaultChangeset>) => void,
+	): DefaultEditBuilder {
+		return new DefaultEditBuilder(this, mintRevisionTag, changeReceiver);
 	}
 }
 
@@ -168,7 +173,8 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 
 	public constructor(
 		family: ChangeFamily<ChangeFamilyEditor, DefaultChangeset>,
-		changeReceiver: (change: DefaultChangeset) => void,
+		private readonly mintRevisionTag: () => RevisionTag,
+		changeReceiver: (change: TaggedChange<DefaultChangeset>) => void,
 		private readonly idCompressor?: IIdCompressor,
 	) {
 		this.modularBuilder = new ModularEditBuilder(family, fieldKinds, changeReceiver);
@@ -182,19 +188,25 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 	}
 
 	public addNodeExistsConstraint(path: UpPath): void {
-		this.modularBuilder.addNodeExistsConstraint(path);
+		this.modularBuilder.addNodeExistsConstraint(path, this.mintRevisionTag());
 	}
 
 	public valueField(field: FieldUpPath): ValueFieldEditBuilder<ITreeCursorSynchronous> {
 		return {
 			set: (newContent: ITreeCursorSynchronous): void => {
-				const fillId = this.modularBuilder.generateId();
-
-				const build = this.modularBuilder.buildTrees(fillId, newContent, this.idCompressor);
+				const revision = this.mintRevisionTag();
+				const fill: ChangeAtomId = { localId: this.modularBuilder.generateId(), revision };
+				const detach: ChangeAtomId = { localId: this.modularBuilder.generateId(), revision };
+				const build = this.modularBuilder.buildTrees(
+					fill.localId,
+					newContent,
+					revision,
+					this.idCompressor,
+				);
 				const change: FieldChangeset = brand(
 					valueFieldKind.changeHandler.editor.set({
-						fill: fillId,
-						detach: this.modularBuilder.generateId(),
+						fill,
+						detach,
 					}),
 				);
 
@@ -203,8 +215,9 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 					field,
 					fieldKind: valueFieldKind.identifier,
 					change,
+					revision,
 				};
-				this.modularBuilder.submitChanges([build, edit]);
+				this.modularBuilder.submitChanges([build, edit], revision);
 			},
 		};
 	}
@@ -212,21 +225,26 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 	public optionalField(field: FieldUpPath): OptionalFieldEditBuilder<ITreeCursorSynchronous> {
 		return {
 			set: (newContent: ITreeCursorSynchronous | undefined, wasEmpty: boolean): void => {
-				const detachId = this.modularBuilder.generateId();
-				let fillId: ChangesetLocalId | undefined;
 				const edits: EditDescription[] = [];
 				let optionalChange: OptionalChangeset;
+				const revision = this.mintRevisionTag();
+				const detach: ChangeAtomId = { localId: this.modularBuilder.generateId(), revision };
 				if (newContent !== undefined) {
-					fillId = this.modularBuilder.generateId();
-					const build = this.modularBuilder.buildTrees(fillId, newContent, this.idCompressor);
+					const fill: ChangeAtomId = { localId: this.modularBuilder.generateId(), revision };
+					const build = this.modularBuilder.buildTrees(
+						fill.localId,
+						newContent,
+						revision,
+						this.idCompressor,
+					);
 					edits.push(build);
 
 					optionalChange = optional.changeHandler.editor.set(wasEmpty, {
-						fill: fillId,
-						detach: detachId,
+						fill,
+						detach,
 					});
 				} else {
-					optionalChange = optional.changeHandler.editor.clear(wasEmpty, detachId);
+					optionalChange = optional.changeHandler.editor.clear(wasEmpty, detach);
 				}
 
 				const change: FieldChangeset = brand(optionalChange);
@@ -235,10 +253,11 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 					field,
 					fieldKind: optional.identifier,
 					change,
+					revision,
 				};
 				edits.push(edit);
 
-				this.modularBuilder.submitChanges(edits);
+				this.modularBuilder.submitChanges(edits, revision);
 			},
 		};
 	}
@@ -255,17 +274,24 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 		} else if (count < 0 || !Number.isSafeInteger(count)) {
 			throw new UsageError(`Expected non-negative integer count, got ${count}.`);
 		}
-		const detachId = this.modularBuilder.generateId(count);
-		const attachId = this.modularBuilder.generateId(count);
+		const revision = this.mintRevisionTag();
+		const detachCellId = this.modularBuilder.generateId(count);
+		const attachCellId: CellId = { localId: this.modularBuilder.generateId(count), revision };
 		if (compareFieldUpPaths(sourceField, destinationField)) {
 			const change = sequence.changeHandler.editor.move(
 				sourceIndex,
 				count,
 				destIndex,
-				detachId,
-				attachId,
+				detachCellId,
+				attachCellId,
+				revision,
+			);
+			this.modularBuilder.submitChange(
+				sourceField,
+				sequence.identifier,
+				brand(change),
+				revision,
 			);
-			this.modularBuilder.submitChange(sourceField, sequence.identifier, brand(change));
 		} else {
 			const detachPath = topDownPath(sourceField.parent);
 			const attachPath = topDownPath(destinationField.parent);
@@ -307,27 +333,38 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 					}
 				}
 			}
-			const moveOut = sequence.changeHandler.editor.moveOut(sourceIndex, count, detachId);
+			const moveOut = sequence.changeHandler.editor.moveOut(
+				sourceIndex,
+				count,
+				detachCellId,
+				revision,
+			);
 			const moveIn = sequence.changeHandler.editor.moveIn(
 				destIndex,
 				count,
-				detachId,
-				attachId,
+				detachCellId,
+				attachCellId,
+				revision,
+			);
+			this.modularBuilder.submitChanges(
+				[
+					{
+						type: "field",
+						field: sourceField,
+						fieldKind: sequence.identifier,
+						change: brand(moveOut),
+						revision,
+					},
+					{
+						type: "field",
+						field: adjustedAttachField,
+						fieldKind: sequence.identifier,
+						change: brand(moveIn),
+						revision,
+					},
+				],
+				revision,
 			);
-			this.modularBuilder.submitChanges([
-				{
-					type: "field",
-					field: sourceField,
-					fieldKind: sequence.identifier,
-					change: brand(moveOut),
-				},
-				{
-					type: "field",
-					field: adjustedAttachField,
-					fieldKind: sequence.identifier,
-					change: brand(moveIn),
-				},
-			]);
 		}
 	}
 
@@ -340,30 +377,38 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 					return;
 				}
 
-				const firstId = this.modularBuilder.generateId(length);
-				const build = this.modularBuilder.buildTrees(firstId, content, this.idCompressor);
+				const revision = this.mintRevisionTag();
+				const firstId: CellId = { localId: this.modularBuilder.generateId(length), revision };
+				const build = this.modularBuilder.buildTrees(
+					firstId.localId,
+					content,
+					revision,
+					this.idCompressor,
+				);
 				const change: FieldChangeset = brand(
-					sequence.changeHandler.editor.insert(index, length, firstId),
+					sequence.changeHandler.editor.insert(index, length, firstId, revision),
 				);
 				const attach: FieldEditDescription = {
 					type: "field",
 					field,
 					fieldKind: sequence.identifier,
 					change,
+					revision,
 				};
 				// 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]);
+				this.modularBuilder.submitChanges([build, attach], revision);
 			},
 			remove: (index: number, count: number): void => {
 				if (count === 0) {
 					return;
 				}
+				const revision = this.mintRevisionTag();
 				const id = this.modularBuilder.generateId(count);
 				const change: FieldChangeset = brand(
-					sequence.changeHandler.editor.remove(index, count, id),
+					sequence.changeHandler.editor.remove(index, count, id, revision),
 				);
-				this.modularBuilder.submitChange(field, sequence.identifier, change);
+				this.modularBuilder.submitChange(field, sequence.identifier, change, revision);
 			},
 		};
 	}

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

@@ -4,7 +4,7 @@
  */
 
 import {
-	type ChangesetLocalId,
+	type ChangeAtomId,
 	type DeltaDetachedNodeId,
 	type DeltaFieldChanges,
 	type FieldKindIdentifier,
@@ -54,11 +54,9 @@ export const noChangeHandler: FieldChangeHandler<0> = {
 export interface ValueFieldEditor extends FieldEditor<OptionalChangeset> {
 	/**
 	 * Creates a change which replaces the current value of the field with `newValue`.
-	 * @param newContent - the new content for the field
-	 * @param changeId - the ID associated with the replacement of the current content.
-	 * @param buildId - the ID associated with the creation of the `newContent`.
+	 * @param ids - The ids for the fill and detach fields.
 	 */
-	set(ids: { fill: ChangesetLocalId; detach: ChangesetLocalId }): OptionalChangeset;
+	set(ids: { fill: ChangeAtomId; detach: ChangeAtomId }): OptionalChangeset;
 }
 
 const optionalIdentifier = "Optional";
@@ -77,8 +75,10 @@ export const optional = new FieldKindWithEditor(
 
 export const valueFieldEditor: ValueFieldEditor = {
 	...optionalFieldEditor,
-	set: (ids: { fill: ChangesetLocalId; detach: ChangesetLocalId }): OptionalChangeset =>
-		optionalFieldEditor.set(false, ids),
+	set: (ids: {
+		fill: ChangeAtomId;
+		detach: ChangeAtomId;
+	}): OptionalChangeset => optionalFieldEditor.set(false, ids),
 };
 
 export const valueChangeHandler: FieldChangeHandler<OptionalChangeset, ValueFieldEditor> = {