@fluidframework/tree 2.80.0 → 2.81.0

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

@@ -5,6 +5,7 @@
 
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
+import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	getConfigForMinVersionForCollab,
 	lowestMinVersionForCollab,
@@ -41,10 +42,9 @@ import {
 	EncodedFieldBatchV1,
 	EncodedFieldBatchV2,
 } from "./format.js";
-import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import type { IncrementalEncodingPolicy } from "./incrementalEncodingPolicy.js";
-import { uncompressedEncodeV1, uncompressedEncodeV2 } from "./uncompressedEncode.js";
 import { schemaCompressedEncodeV1, schemaCompressedEncodeV2 } from "./schemaBasedEncode.js";
+import { uncompressedEncodeV1, uncompressedEncodeV2 } from "./uncompressedEncode.js";
 
 /**
  * Reference ID for a chunk that is incrementally encoded.

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

@@ -26,6 +26,7 @@ import {
 	Shape as ShapeGeneric,
 	updateShapesAndIdentifiersEncoding,
 } from "./chunkEncodingGeneric.js";
+import type { IncrementalEncoder } from "./codecs.js";
 import type { FieldBatch } from "./fieldBatch.js";
 import {
 	type EncodedAnyShape,
@@ -36,7 +37,6 @@ import {
 	FieldBatchFormatVersion,
 	SpecialField,
 } from "./format.js";
-import type { IncrementalEncoder } from "./codecs.js";
 
 /**
  * Encode data from `FieldBatch` into an `EncodedFieldBatch`.
@@ -590,6 +590,7 @@ class LazyFieldEncoder implements FieldEncoder {
 	}
 
 	private get encoder(): FieldEncoder {
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- using ??= could change behavior if value is falsy
 		if (this.encoderLazy === undefined) {
 			this.encoderLazy = this.fieldEncoderFromPolicy(this.nodeBuilder, this.fieldSchema);
 		}

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

@@ -6,6 +6,7 @@
 import { type Static, Type } from "@sinclair/typebox";
 
 import { unionOptions } from "../../../codec/index.js";
+import { strictEnum, type Values } from "../../../util/index.js";
 
 import {
 	Count,
@@ -13,7 +14,6 @@ import {
 	IdentifierOrIndex,
 	ShapeIndex,
 } from "./formatGeneric.js";
-import { strictEnum, type Values } from "../../../util/index.js";
 
 /**
  * The format version for the field batch.

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

@@ -4,6 +4,7 @@
  */
 
 import { type Static, type TSchema, Type } from "@sinclair/typebox";
+
 import type { FieldBatchFormatVersion } from "./format.js";
 
 /**

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

@@ -18,7 +18,9 @@ import {
 	identifierFieldKindIdentifier,
 	type SchemaPolicy,
 } from "../../../core/index.js";
+import { brand, oneFromIterable } from "../../../util/index.js";
 
+import type { IncrementalEncoder } from "./codecs.js";
 import {
 	EncoderContext,
 	type FieldEncoder,
@@ -39,10 +41,8 @@ import {
 	FieldBatchFormatVersion,
 	SpecialField,
 } from "./format.js";
-import type { IncrementalEncoder } from "./codecs.js";
-import { NodeShapeBasedEncoder } from "./nodeEncoder.js";
 import { defaultIncrementalEncodingPolicy } from "./incrementalEncodingPolicy.js";
-import { brand, oneFromIterable } from "../../../util/index.js";
+import { NodeShapeBasedEncoder } from "./nodeEncoder.js";
 
 /**
  * Encode data from `fieldBatch` in into an `EncodedChunk` using {@link FieldBatchFormatVersion.v1}.

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

@@ -36,15 +36,10 @@ import {
 	intoDelta as intoModularDelta,
 	relevantRemovedRoots as relevantModularRemovedRoots,
 } from "../modular-schema/index.js";
-import type { OptionalChangeset } from "../optional-field/index.js";
-import type { CellId } from "../sequence-field/index.js";
+import { optional, type OptionalChangeset, required } from "../optional-field/index.js";
+import { sequence, type CellId } from "../sequence-field/index.js";
 
-import {
-	fieldKinds,
-	optional,
-	sequence,
-	required as valueFieldKind,
-} from "./defaultFieldKinds.js";
+import { fieldKinds } from "./defaultFieldKinds.js";
 
 export type DefaultChangeset = ModularChangeset;
 
@@ -247,7 +242,7 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 				const detach: ChangeAtomId = { localId: this.modularBuilder.generateId(), revision };
 				const build = this.modularBuilder.buildTrees(fill.localId, newContent, revision);
 				const change: FieldChangeset = brand(
-					valueFieldKind.changeHandler.editor.set({
+					required.changeHandler.editor.set({
 						fill,
 						detach,
 					}),
@@ -256,7 +251,7 @@ export class DefaultEditBuilder implements ChangeFamilyEditor, IDefaultEditBuild
 				const edit: FieldEditDescription = {
 					type: "field",
 					field,
-					fieldKind: valueFieldKind.identifier,
+					fieldKind: required.identifier,
 					change,
 					revision,
 				};

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

@@ -5,13 +5,15 @@
 
 import { fail } from "@fluidframework/core-utils/internal";
 
+import type { CodecTree } from "../../codec/index.js";
 import {
-	type ChangeAtomId,
 	type DeltaDetachedNodeId,
 	type FieldKindIdentifier,
 	forbiddenFieldKindIdentifier,
 	Multiplicity,
 } from "../../core/index.js";
+import { brand, type Brand } from "../../util/index.js";
+import { identifierFieldIdentifier } from "../fieldKindIdentifiers.js";
 import {
 	type FieldChangeDelta,
 	type FieldChangeHandler,
@@ -23,20 +25,10 @@ import {
 	type ToDelta,
 	referenceFreeFieldChangeRebaser,
 } from "../modular-schema/index.js";
-import {
-	type OptionalChangeset,
-	type OptionalFieldEditor,
-	optionalChangeHandler,
-	optionalFieldEditor,
-} from "../optional-field/index.js";
-import {
-	sequenceFieldChangeHandler,
-	type SequenceFieldEditor,
-} from "../sequence-field/index.js";
+import { optional, required } from "../optional-field/index.js";
+import { sequence } from "../sequence-field/index.js";
 
 import { noChangeCodecFamily } from "./noChangeCodecs.js";
-import type { CodecTree } from "../../codec/index.js";
-import { brand, brandConst, type Brand } from "../../util/index.js";
 
 /**
  * ChangeHandler that only handles no-op / identity changes.
@@ -58,88 +50,22 @@ export const noChangeHandler: FieldChangeHandler<0> = {
 	getCrossFieldKeys: () => [],
 };
 
-/**
- * {@link FieldEditor} for required fields (always contain exactly 1 child).
- * @remarks
- * This shares code with optional fields, since they are the same edit wise except setting to empty is not allowed,
- * and the content is always assumed to not be empty.
- * This means the actual edits implemented for optional fields are sufficient to support required fields
- * which is why this is defined and implemented in terms of optional fields.
- */
-export interface RequiredFieldEditor extends FieldEditor<OptionalChangeset> {
-	/**
-	 * Creates a change which replaces the current value of the field with `newValue`.
-	 * @param ids - The ids for the fill and detach fields.
-	 */
-	set(ids: { fill: ChangeAtomId; detach: ChangeAtomId }): OptionalChangeset;
-}
-
-const optionalIdentifier = brandConst("Optional")<FieldKindIdentifier>();
-const requiredIdentifier = brandConst("Value")<FieldKindIdentifier>();
-const sequenceIdentifier = brandConst("Sequence")<FieldKindIdentifier>();
-const identifierFieldIdentifier = brandConst("Identifier")<FieldKindIdentifier>();
-
-/**
- * 0 or 1 items.
- */
-export const optional = new FlexFieldKind(optionalIdentifier, Multiplicity.Optional, {
-	changeHandler: optionalChangeHandler,
-	allowMonotonicUpgradeFrom: new Set([
-		identifierFieldIdentifier,
-		requiredIdentifier,
-		forbiddenFieldKindIdentifier,
-	]),
-});
-
-export const requiredFieldEditor: RequiredFieldEditor = {
-	...optionalFieldEditor,
-	set: (ids: {
-		fill: ChangeAtomId;
-		detach: ChangeAtomId;
-	}): OptionalChangeset => optionalFieldEditor.set(false, ids),
-};
-
-export const requiredFieldChangeHandler: FieldChangeHandler<
-	OptionalChangeset,
-	RequiredFieldEditor
-> = {
-	...optionalChangeHandler,
-	editor: requiredFieldEditor,
-};
-
-/**
- * Exactly one item.
- */
-export const required = new FlexFieldKind(requiredIdentifier, Multiplicity.Single, {
-	changeHandler: requiredFieldChangeHandler,
-	allowMonotonicUpgradeFrom: new Set([identifierFieldIdentifier]),
-});
-
-/**
- * 0 or more items.
- */
-export const sequence = new FlexFieldKind(sequenceIdentifier, Multiplicity.Sequence, {
-	changeHandler: sequenceFieldChangeHandler,
-	allowMonotonicUpgradeFrom: new Set([
-		required.identifier,
-		optional.identifier,
-		identifierFieldIdentifier,
-		forbiddenFieldKindIdentifier,
-	]),
-});
-
 /**
  * Exactly one identifier.
  */
-export const identifier = new FlexFieldKind(identifierFieldIdentifier, Multiplicity.Single, {
-	changeHandler: noChangeHandler,
-	// By omitting required here,
-	// this is making a policy choice that a schema upgrade cannot be done from required to identifier.
-	// Since an identifier can be upgraded into a required field,
-	// preventing the inverse helps ensure that schema upgrades are monotonic.
-	// Which direction is allowed is a subjective policy choice.
-	allowMonotonicUpgradeFrom: new Set([]),
-});
+export const identifier: Identifier = new FlexFieldKind(
+	identifierFieldIdentifier,
+	Multiplicity.Single,
+	{
+		changeHandler: noChangeHandler,
+		// By omitting required here,
+		// this is making a policy choice that a schema upgrade cannot be done from required to identifier.
+		// Since an identifier can be upgraded into a required field,
+		// preventing the inverse helps ensure that schema upgrades are monotonic.
+		// Which direction is allowed is a subjective policy choice.
+		allowMonotonicUpgradeFrom: new Set([]),
+	},
+);
 
 /**
  * Exactly 0 items.
@@ -169,7 +95,7 @@ export const identifier = new FlexFieldKind(identifierFieldIdentifier, Multiplic
  *
  * See {@link emptyField} for a constant, reusable field using Forbidden.
  */
-export const forbidden = new FlexFieldKind(
+export const forbidden: Forbidden = new FlexFieldKind(
 	forbiddenFieldKindIdentifier,
 	Multiplicity.Forbidden,
 	{
@@ -249,20 +175,6 @@ export const fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind> = new M
 // TODO: Find a way to make docs like {@inheritDoc required} work in vscode.
 // TODO: ensure thy work in generated docs.
 // TODO: add these comments to the rest of the cases below.
-export interface Required
-	extends FlexFieldKind<RequiredFieldEditor, typeof requiredIdentifier, Multiplicity.Single> {}
-export interface Optional
-	extends FlexFieldKind<
-		OptionalFieldEditor,
-		typeof optionalIdentifier,
-		Multiplicity.Optional
-	> {}
-export interface Sequence
-	extends FlexFieldKind<
-		SequenceFieldEditor,
-		typeof sequenceIdentifier,
-		Multiplicity.Sequence
-	> {}
 export interface Identifier
 	extends FlexFieldKind<
 		FieldEditor<0>,
@@ -281,9 +193,9 @@ export interface Forbidden
  */
 export const FieldKinds: {
 	// TODO: inheritDoc for these somehow
-	readonly required: Required;
-	readonly optional: Optional;
-	readonly sequence: Sequence;
+	readonly required: typeof required;
+	readonly optional: typeof optional;
+	readonly sequence: typeof sequence;
 	readonly identifier: Identifier;
 	readonly forbidden: Forbidden;
 } = { required, optional, sequence, identifier, forbidden };

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

@@ -5,11 +5,6 @@
 
 export {
 	FieldKinds,
-	type Required,
-	type Optional,
-	type Sequence,
-	type Identifier,
-	type Forbidden,
 	fieldKinds,
 	fieldKindConfigurations,
 	getCodecTreeForModularChangeFormat,

package/src/feature-libraries/fieldKindIdentifiers.ts

@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { FieldKindIdentifier } from "../core/index.js";
+import { brandConst } from "../util/index.js";
+
+// A collection of identifiers for FieldKinds.
+// These are declared before the field kinds that use them are declared to avoid direct (possibly cyclic) dependencies between FieldKinds .
+// Fieldkinds refer to each-other via these identifiers for schema evolution purposes, so without this indirection they would likely form dependency cycles.
+
+export const optionalIdentifier = brandConst("Optional")<FieldKindIdentifier>();
+export const requiredIdentifier = brandConst("Value")<FieldKindIdentifier>();
+export const sequenceIdentifier = brandConst("Sequence")<FieldKindIdentifier>();
+export const identifierFieldIdentifier = brandConst("Identifier")<FieldKindIdentifier>();

package/src/feature-libraries/flex-tree/lazyField.ts

@@ -23,6 +23,7 @@ import {
 	rootFieldKey,
 } from "../../core/index.js";
 import { disposeSymbol, getOrCreate } from "../../util/index.js";
+import { combineChunks } from "../chunked-forest/index.js";
 import {
 	FieldKinds,
 	MappedEditBuilder,
@@ -53,7 +54,6 @@ import {
 import { LazyEntity } from "./lazyEntity.js";
 import { type LazyTreeNode, getOrCreateHydratedFlexTreeNode } from "./lazyNode.js";
 import { indexForAt, treeStatusFromAnchorCache } from "./utilities.js";
-import { combineChunks } from "../chunked-forest/index.js";
 
 /**
  * Reuse fields.

package/src/feature-libraries/flex-tree/observer.ts

@@ -4,9 +4,11 @@
  */
 
 import { debugAssert } from "@fluidframework/core-utils/internal";
-import type { FlexTreeNode } from "./flexTreeTypes.js";
+
 import type { FieldKey } from "../../core/index.js";
 
+import type { FlexTreeNode } from "./flexTreeTypes.js";
+
 /*
  * This file sets up a static observation tracking system.
  *

package/src/feature-libraries/forest-summary/codec.ts

@@ -18,6 +18,7 @@ import {
 	makeVersionedValidatedCodec,
 } from "../../codec/index.js";
 import type { FieldKey, ITreeCursorSynchronous } from "../../core/index.js";
+import { brand } from "../../util/index.js";
 import type { FieldBatchCodec, FieldBatchEncodingContext } from "../chunked-forest/index.js";
 
 import {
@@ -26,7 +27,6 @@ import {
 	type Format,
 	FormatCommon,
 } from "./formatCommon.js";
-import { brand } from "../../util/index.js";
 
 /**
  * Uses field cursors

package/src/feature-libraries/forest-summary/forestSummarizer.ts

@@ -41,27 +41,27 @@ import {
 	type FieldBatchEncodingContext,
 	type IncrementalEncodingPolicy,
 } from "../chunked-forest/index.js";
+import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 
 import {
 	clientVersionToForestFormatVersion,
 	type ForestCodec,
 	makeForestSummarizerCodec,
 } from "./codec.js";
+import { ForestFormatVersion } from "./formatCommon.js";
 import {
 	ForestIncrementalSummaryBehavior,
 	ForestIncrementalSummaryBuilder,
 } from "./incrementalSummaryBuilder.js";
-import {
-	minVersionToForestSummaryFormatVersion,
-	getForestRootSummaryContentKey,
-} from "./summaryTypes.js";
-import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
-import { ForestFormatVersion } from "./formatCommon.js";
 import {
 	ForestSummaryFormatVersion,
 	forestSummaryKey,
 	supportedForestSummaryFormatVersions,
 } from "./summaryFormatCommon.js";
+import {
+	minVersionToForestSummaryFormatVersion,
+	getForestRootSummaryContentKey,
+} from "./summaryTypes.js";
 
 /**
  * Provides methods for summarizing and loading a forest.
@@ -171,7 +171,9 @@ export class ForestSummarizer
 					: undefined,
 		};
 		const encoded = this.codec.encode(fieldMap, encoderContext);
-		fieldMap.forEach((value) => value.free());
+		for (const value of fieldMap.values()) {
+			value.free();
+		}
 
 		this.incrementalSummaryBuilder.completeSummary({
 			incrementalSummaryContext,

package/src/feature-libraries/forest-summary/formatV1.ts

@@ -6,6 +6,7 @@
 import type { Static } from "@sinclair/typebox";
 
 import { brand } from "../../util/index.js";
+
 import { FormatCommon, ForestFormatVersion } from "./formatCommon.js";
 
 export const FormatV1 = FormatCommon(brand<ForestFormatVersion>(ForestFormatVersion.v1));

package/src/feature-libraries/forest-summary/formatV2.ts

@@ -6,6 +6,7 @@
 import type { Static } from "@sinclair/typebox";
 
 import { brand } from "../../util/index.js";
+
 import { FormatCommon, ForestFormatVersion } from "./formatCommon.js";
 
 export const FormatV2 = FormatCommon(brand<ForestFormatVersion>(ForestFormatVersion.v2));

package/src/feature-libraries/forest-summary/incrementalSummaryBuilder.ts

@@ -3,9 +3,17 @@
  * Licensed under the MIT License.
  */
 
+import type { IFluidHandle } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
+import { SummaryType } from "@fluidframework/driver-definitions";
+import type { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 import type { IExperimentalIncrementalSummaryContext } from "@fluidframework/runtime-definitions/internal";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
+import { LoggingError } from "@fluidframework/telemetry-utils/internal";
+
+import type { ITreeCursorSynchronous } from "../../core/index.js";
+import type { SummaryElementStringifier } from "../../shared-tree-core/index.js";
 import {
 	brand,
 	setInNestedMap,
@@ -20,13 +28,7 @@ import type {
 	IncrementalEncodingPolicy,
 	TreeChunk,
 } from "../chunked-forest/index.js";
-import type { ITreeCursorSynchronous } from "../../core/index.js";
-import { SummaryType } from "@fluidframework/driver-definitions";
-import type { IChannelStorageService } from "@fluidframework/datastore-definitions/internal";
-import type { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
-import { LoggingError } from "@fluidframework/telemetry-utils/internal";
-import type { IFluidHandle } from "@fluidframework/core-interfaces";
-import type { SummaryElementStringifier } from "../../shared-tree-core/index.js";
+
 import { summaryContentBlobKey } from "./summaryFormatV3.js";
 
 /**

package/src/feature-libraries/forest-summary/summaryTypes.ts

@@ -10,6 +10,7 @@ import {
 } from "@fluidframework/runtime-utils/internal";
 
 import { FluidClientVersion } from "../../codec/index.js";
+
 import { ForestSummaryFormatVersion } from "./summaryFormatCommon.js";
 import { summaryContentBlobKey as summaryContentBlobKeyV1ToV2 } from "./summaryFormatV1ToV2.js";
 import { summaryContentBlobKey as summaryContentBlobKeyV3 } from "./summaryFormatV3.js";

package/src/feature-libraries/index.ts

@@ -126,11 +126,6 @@ export {
 
 export {
 	FieldKinds,
-	type Required,
-	type Optional,
-	type Sequence,
-	type Identifier,
-	type Forbidden,
 	type DefaultChangeset,
 	DefaultChangeFamily,
 	DefaultEditBuilder,

package/src/feature-libraries/mapTreeCursor.ts

@@ -19,6 +19,7 @@ import {
 	rootField,
 	rootFieldKey,
 } from "../core/index.js";
+import type { requireAssignableTo } from "../util/index.js";
 
 import {
 	type CursorAdapter,
@@ -27,7 +28,6 @@ import {
 	stackTreeFieldCursor,
 	stackTreeNodeCursor,
 } from "./treeCursorUtils.js";
-import type { requireAssignableTo } from "../util/index.js";
 
 /**
  * A generic variant of {@link MapTree} that can be used to strongly type trees implementing a MapTree-like API.

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

@@ -4,6 +4,7 @@
  */
 
 import type { FieldKindIdentifier } from "../../core/index.js";
+
 import type { FlexFieldKind } from "./fieldKind.js";
 
 /**

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

@@ -13,6 +13,7 @@ import {
 	Multiplicity,
 	type RevisionReplacer,
 } from "../../core/index.js";
+import { brandConst } from "../../util/index.js";
 
 import type {
 	FieldChangeDelta,
@@ -24,11 +25,10 @@ import type {
 	RelevantRemovedRootsFromChild,
 	ToDelta,
 } from "./fieldChangeHandler.js";
+import { FlexFieldKind } from "./fieldKind.js";
 import { makeGenericChangeCodec } from "./genericFieldKindCodecs.js";
 import { newGenericChangeset, type GenericChangeset } from "./genericFieldKindTypes.js";
 import type { NodeId } from "./modularChangeTypes.js";
-import { FlexFieldKind } from "./fieldKind.js";
-import { brandConst } from "../../util/index.js";
 
 /**
  * {@link FieldChangeHandler} implementation for {@link GenericChangeset}.

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

@@ -32,6 +32,7 @@ import {
 	idAllocatorFromMaxId,
 	newTupleBTree,
 } from "../../util/index.js";
+import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import {
 	type FieldBatchCodec,
 	type TreeChunk,
@@ -64,7 +65,6 @@ import {
 	type NodeChangeset,
 	type NodeId,
 } from "./modularChangeTypes.js";
-import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 
 type ModularChangeCodec = IJsonCodec<
 	ModularChangeset,
@@ -365,6 +365,7 @@ export function decodeDetachedNodes(
 	};
 
 	const map: ModularChangeset["builds"] = newTupleBTree();
+	// 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
 		const revision =
@@ -618,6 +619,7 @@ export function getFieldChangesetCodecs(
 		],
 	]);
 
+	// eslint-disable-next-line unicorn/no-array-for-each -- Map.forEach with (value, key) signature; codec initialization
 	fieldKinds.forEach((entry, identifier) => {
 		fieldChangesetCodecs.set(identifier, getMapEntry(entry));
 	});

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

@@ -17,13 +17,13 @@ import type { FieldBatchCodec } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 
 import type { FieldKindConfiguration } from "./fieldKindConfiguration.js";
-import { EncodedModularChangesetV2 } from "./modularChangeFormatV2.js";
-import type { ModularChangeset } from "./modularChangeTypes.js";
 import {
 	encodeChange,
 	decodeChange,
 	getFieldChangesetCodecs,
 } from "./modularChangeCodecV1.js";
+import { EncodedModularChangesetV2 } from "./modularChangeFormatV2.js";
+import type { ModularChangeset } from "./modularChangeTypes.js";
 
 type ModularChangeCodec = IJsonCodec<
 	ModularChangeset,

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

@@ -18,10 +18,11 @@ import type {
 } from "../../core/index.js";
 import type { FieldBatchCodec } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
+
 import type { FieldKindConfiguration } from "./fieldKindConfiguration.js";
-import type { ModularChangeset } from "./modularChangeTypes.js";
 import { makeModularChangeCodecV1 } from "./modularChangeCodecV1.js";
 import { makeModularChangeCodecV2 } from "./modularChangeCodecV2.js";
+import type { ModularChangeset } from "./modularChangeTypes.js";
 
 export function makeModularChangeCodecFamily(
 	fieldKindConfigurations: ReadonlyMap<number, FieldKindConfiguration>,
@@ -67,7 +68,7 @@ export function makeModularChangeCodecFamily(
 					];
 				}
 				default: {
-					fail(`Unsupported modular change codec version ${version}`);
+					fail(0xcc5 /* Unsupported modular change codec version */);
 				}
 			}
 		}),