@fluidframework/tree 2.91.0 → 2.92.0

package/src/shared-tree-core/editManagerCodecs.ts

@@ -3,176 +3,151 @@
  * Licensed under the MIT License.
  */
 
-import { unreachableCase } from "@fluidframework/core-utils/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
-import {
-	getConfigForMinVersionForCollab,
-	lowestMinVersionForCollab,
-} from "@fluidframework/runtime-utils/internal";
+import { lowestMinVersionForCollab } from "@fluidframework/runtime-utils/internal";
 
 import {
+	ClientVersionDispatchingCodecBuilder,
 	type CodecTree,
-	type CodecWriteOptions,
+	type CodecVersion,
 	type DependentFormatVersion,
 	FluidClientVersion,
-	type FormatVersion,
 	type ICodecFamily,
 	type ICodecOptions,
 	type IJsonCodec,
-	makeCodecFamily,
-	makeDiscontinuedCodecVersion,
+	makeDiscontinuedCodecAndSchema,
 } from "../codec/index.js";
-import { makeVersionDispatchingCodec } from "../codec/index.js";
 import type {
 	ChangeEncodingContext,
 	EncodedRevisionTag,
 	RevisionTag,
 	SchemaAndPolicy,
 } from "../core/index.js";
-import { brand, unbrand, type JsonCompatibleReadOnly } from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
-import { makeV1CodecWithVersion } from "./editManagerCodecsV1toV4.js";
+import { makeV1toV4andV6CodecWithVersion } from "./editManagerCodecsV1toV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./editManagerCodecsVSharedBranches.js";
-import {
-	EditManagerFormatVersion,
-	editManagerFormatVersions,
-} from "./editManagerFormatCommons.js";
+import { EditManagerFormatVersion } from "./editManagerFormatCommons.js";
 
+/**
+ * Context required for encoding/decoding the {@link EditManager}'s {@link SummaryData}.
+ */
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;
 	readonly schema?: SchemaAndPolicy;
 }
 
 /**
- * Convert a MinimumVersionForCollab to an EditManagerFormatVersion.
- * @param clientVersion - The MinimumVersionForCollab to convert.
- * @returns The EditManagerFormatVersion that corresponds to the provided MinimumVersionForCollab.
+ * Codec name used to identify the {@link EditManager} codec, see {@link makeEditManagerCodecBuilder}.
  */
-export function clientVersionToEditManagerFormatVersion(
-	clientVersion: MinimumVersionForCollab,
-	writeVersionOverride?: EditManagerFormatVersion,
-): EditManagerFormatVersion {
-	const compatibleVersion: EditManagerFormatVersion = brand(
-		getConfigForMinVersionForCollab(clientVersion, {
-			[lowestMinVersionForCollab]: EditManagerFormatVersion.v3,
-			[FluidClientVersion.v2_43]: EditManagerFormatVersion.v4,
-			[FluidClientVersion.v2_80]: EditManagerFormatVersion.v6,
-		}),
-	);
-
-	return writeVersionOverride ?? compatibleVersion;
-}
+export const editManagerCodecName = "EditManager";
 
 /**
- * Returns the version that should be used for testing shared branches.
+ * Options for constructing an {@link EditManager} codec, see {@link makeEditManagerCodecBuilder}.
  */
-export function editManagerFormatVersionSelectorForSharedBranches(
-	clientVersion: MinimumVersionForCollab,
-): EditManagerFormatVersion {
-	return brand(EditManagerFormatVersion.vSharedBranches);
-}
-
-export interface EditManagerCodecOptions {
-	readonly editManagerFormatSelector?: (
-		minVersionForCollab: MinimumVersionForCollab,
-	) => EditManagerFormatVersion;
-}
-
-function editManagerFormatVersionFromOptions(
-	options: EditManagerCodecOptions & CodecWriteOptions,
-): EditManagerFormatVersion {
-	const selector =
-		options.editManagerFormatSelector ?? clientVersionToEditManagerFormatVersion;
-	return selector(options.minVersionForCollab);
-}
-
-export function makeEditManagerCodec<TChangeset>(
-	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
-	dependentChangeFormatVersion: DependentFormatVersion<EditManagerFormatVersion>,
+interface EditManagerCodecOptions<TChangeset> extends ICodecOptions {
+	/** Codecs for encoding changesets. */
+	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>;
+	/** Maps each EditManager format version to the corresponding changeset format version. */
+	dependentChangeFormatVersion: DependentFormatVersion<EditManagerFormatVersion>;
+	/** Codec for encoding revision tags within changesets. */
 	revisionTagCodec: IJsonCodec<
 		RevisionTag,
 		EncodedRevisionTag,
 		EncodedRevisionTag,
 		ChangeEncodingContext
-	>,
-	options: EditManagerCodecOptions & CodecWriteOptions,
-): IJsonCodec<
+	>;
+}
+
+/**
+ * Creates a {@link ClientVersionDispatchingCodecBuilder} encoding for {@link SummaryData}.
+ */
+export function makeEditManagerCodecBuilder<
+	TChangeset,
+>(): ClientVersionDispatchingCodecBuilder<
+	EditManagerCodecOptions<TChangeset>,
 	SummaryData<TChangeset>,
-	JsonCompatibleReadOnly,
-	JsonCompatibleReadOnly,
-	EditManagerEncodingContext
+	EditManagerEncodingContext,
+	EditManagerFormatVersion,
+	typeof editManagerCodecName
 > {
-	const family = makeEditManagerCodecs(
-		changeCodecs,
-		dependentChangeFormatVersion,
-		revisionTagCodec,
-		options,
-	);
-	const writeVersion = editManagerFormatVersionFromOptions(options);
-	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
-}
+	// See EditManagerFormatVersion and its members for documentation on what changed in each version.
+	const versions: CodecVersion<
+		SummaryData<TChangeset>,
+		EditManagerEncodingContext,
+		EditManagerFormatVersion,
+		EditManagerCodecOptions<TChangeset>
+	>[] = [
+		makeDiscontinuedCodecAndSchema(EditManagerFormatVersion.v1, "2.73.0"),
+		makeDiscontinuedCodecAndSchema(EditManagerFormatVersion.v2, "2.73.0"),
+		{
+			minVersionForCollab: lowestMinVersionForCollab,
+			formatVersion: EditManagerFormatVersion.v3,
+			codec: (options: EditManagerCodecOptions<TChangeset>) =>
+				makeV1toV4andV6CodecWithVersion(
+					options.changeCodecs.resolve(
+						options.dependentChangeFormatVersion.lookup(EditManagerFormatVersion.v3),
+					),
+					options.revisionTagCodec,
+					EditManagerFormatVersion.v3,
+				),
+		},
+		{
+			minVersionForCollab: FluidClientVersion.v2_43,
+			formatVersion: EditManagerFormatVersion.v4,
+			codec: (options: EditManagerCodecOptions<TChangeset>) =>
+				makeV1toV4andV6CodecWithVersion(
+					options.changeCodecs.resolve(
+						options.dependentChangeFormatVersion.lookup(EditManagerFormatVersion.v4),
+					),
+					options.revisionTagCodec,
+					EditManagerFormatVersion.v4,
+				),
+		},
+		makeDiscontinuedCodecAndSchema(EditManagerFormatVersion.v5, "2.74.0"),
+		{
+			minVersionForCollab: FluidClientVersion.v2_80,
+			formatVersion: EditManagerFormatVersion.v6,
+			codec: (options: EditManagerCodecOptions<TChangeset>) =>
+				makeV1toV4andV6CodecWithVersion(
+					options.changeCodecs.resolve(
+						options.dependentChangeFormatVersion.lookup(EditManagerFormatVersion.v6),
+					),
+					options.revisionTagCodec,
+					EditManagerFormatVersion.v6,
+				),
+		},
+		{
+			minVersionForCollab: undefined,
+			formatVersion: EditManagerFormatVersion.vSharedBranches,
+			codec: (options: EditManagerCodecOptions<TChangeset>) =>
+				makeSharedBranchesCodecWithVersion(
+					options.changeCodecs.resolve(
+						options.dependentChangeFormatVersion.lookup(
+							EditManagerFormatVersion.vSharedBranches,
+						),
+					),
+					options.revisionTagCodec,
+					EditManagerFormatVersion.vSharedBranches,
+				),
+		},
+	];
 
-export function makeEditManagerCodecs<TChangeset>(
-	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
-	dependentChangeFormatVersion: DependentFormatVersion<EditManagerFormatVersion>,
-	revisionTagCodec: IJsonCodec<
-		RevisionTag,
-		EncodedRevisionTag,
-		EncodedRevisionTag,
-		ChangeEncodingContext
-	>,
-	options: ICodecOptions,
-): ICodecFamily<SummaryData<TChangeset>, EditManagerEncodingContext> {
-	const registry: [
-		FormatVersion,
-		IJsonCodec<
-			SummaryData<TChangeset>,
-			JsonCompatibleReadOnly,
-			JsonCompatibleReadOnly,
-			EditManagerEncodingContext
-		>,
-	][] = Array.from(editManagerFormatVersions, (version) => {
-		switch (version) {
-			case unbrand(EditManagerFormatVersion.v1):
-			case unbrand(EditManagerFormatVersion.v2): {
-				return [version, makeDiscontinuedCodecVersion(options, version, "2.73.0")];
-			}
-			case unbrand(EditManagerFormatVersion.v3):
-			case unbrand(EditManagerFormatVersion.v4):
-			case unbrand(EditManagerFormatVersion.v6): {
-				const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
-				return [
-					version,
-					makeV1CodecWithVersion(changeCodec, revisionTagCodec, options, version),
-				];
-			}
-			case unbrand(EditManagerFormatVersion.v5): {
-				return [version, makeDiscontinuedCodecVersion(options, version, "2.74.0")];
-			}
-			case unbrand(EditManagerFormatVersion.vSharedBranches): {
-				const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
-				return [
-					version,
-					makeSharedBranchesCodecWithVersion(changeCodec, revisionTagCodec, options, version),
-				];
-			}
-			default: {
-				unreachableCase(version);
-			}
-		}
-	});
-	return makeCodecFamily(registry);
+	return ClientVersionDispatchingCodecBuilder.build(editManagerCodecName, versions);
 }
 
+/**
+ * Returns a {@link CodecTree} for the EditManager format at the given client version,
+ * with the provided change codec tree as a child.
+ */
 export function getCodecTreeForEditManagerFormatWithChange(
 	clientVersion: MinimumVersionForCollab,
 	changeFormat: CodecTree,
 ): CodecTree {
+	const builder = makeEditManagerCodecBuilder();
 	return {
-		name: "EditManager",
-		version: clientVersionToEditManagerFormatVersion(clientVersion),
+		...builder.getCodecTree(clientVersion),
 		children: [changeFormat],
 	};
 }

package/src/shared-tree-core/editManagerCodecsCommons.ts

@@ -182,7 +182,6 @@ export function decodeSharedBranch<TChangeset>(
 		trunk: trunk.map(
 			(commit): SequencedCommit<TChangeset> =>
 				// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 				decodeCommit(changeCodec, revisionTagCodec, commit, {
 					originatorId: commit.sessionId,
 					idCompressor: context.idCompressor,

package/src/shared-tree-core/editManagerCodecsV1toV4.ts

@@ -5,14 +5,18 @@
 
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 
-import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
+import type { CodecAndSchema, IJsonCodec, Versioned } from "../codec/index.js";
 import type {
 	ChangeEncodingContext,
 	EncodedRevisionTag,
 	RevisionTag,
 	SchemaAndPolicy,
 } from "../core/index.js";
-import { type JsonCompatibleReadOnly, JsonCompatibleReadOnlySchema } from "../util/index.js";
+import {
+	type JsonCompatibleReadOnly,
+	type JsonCompatibleReadOnlyObject,
+	JsonCompatibleReadOnlySchema,
+} from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
 import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
@@ -23,7 +27,15 @@ export interface EditManagerEncodingContext {
 	readonly schema?: SchemaAndPolicy;
 }
 
-export function makeV1CodecWithVersion<TChangeset>(
+/**
+ * Create the provided version of the {@link EditManager} codec (which encodes it's {@link SummaryData}).
+ * @remarks
+ * The changeCodec and revisionTagCodec are not explicitly versioned, so the exact right version of them must be provided here
+ * or data will be incompatible.
+ *
+ * TODO: this file should be renamed as this is used for v6 as well.
+ */
+export function makeV1toV4andV6CodecWithVersion<TChangeset>(
 	changeCodec: IJsonCodec<
 		TChangeset,
 		JsonCompatibleReadOnly,
@@ -36,66 +48,49 @@ export function makeV1CodecWithVersion<TChangeset>(
 		EncodedRevisionTag,
 		ChangeEncodingContext
 	>,
-	options: ICodecOptions,
 	version: EncodedEditManager<TChangeset>["version"],
-): IJsonCodec<
-	SummaryData<TChangeset>,
-	JsonCompatibleReadOnly,
-	JsonCompatibleReadOnly,
-	EditManagerEncodingContext
-> {
-	const format = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
+): CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> {
+	const schema = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
 
-	const codec: IJsonCodec<
-		SummaryData<TChangeset>,
-		EncodedEditManager<TChangeset>,
-		EncodedEditManager<TChangeset>,
-		EditManagerEncodingContext
-	> = withSchemaValidation(
-		format,
-		{
-			encode: (data, context: EditManagerEncodingContext) => {
-				const mainBranch = encodeSharedBranch(
+	const codec: CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> = {
+		schema,
+		encode: (
+			data: SummaryData<TChangeset>,
+			context: EditManagerEncodingContext,
+		): EncodedEditManager<TChangeset> & Versioned & JsonCompatibleReadOnlyObject => {
+			const mainBranch = encodeSharedBranch(
+				changeCodec,
+				revisionTagCodec,
+				data.main,
+				context,
+				data.originator,
+			);
+			const encoded: EncodedEditManager<TChangeset> = {
+				trunk: mainBranch.trunk,
+				branches: mainBranch.peers,
+				version,
+			};
+			return encoded as EncodedEditManager<TChangeset> &
+				Versioned &
+				JsonCompatibleReadOnlyObject;
+		},
+		decode: (
+			json: EncodedEditManager<TChangeset> & JsonCompatibleReadOnly,
+			context: EditManagerEncodingContext,
+		): SummaryData<TChangeset> => {
+			return {
+				main: decodeSharedBranch(
 					changeCodec,
 					revisionTagCodec,
-					data.main,
+					{
+						trunk: json.trunk,
+						peers: json.branches,
+					},
 					context,
-					data.originator,
-				);
-				const json: EncodedEditManager<TChangeset> = {
-					trunk: mainBranch.trunk,
-					branches: mainBranch.peers,
-					version,
-				};
-				return json;
-			},
-			decode: (
-				json: EncodedEditManager<TChangeset>,
-				context: EditManagerEncodingContext,
-			): SummaryData<TChangeset> => {
-				return {
-					main: decodeSharedBranch(
-						changeCodec,
-						revisionTagCodec,
-						{
-							trunk: json.trunk,
-							peers: json.branches,
-						},
-						context,
-						undefined, // originatorId is not encoded in v1
-					),
-				};
-			},
+					undefined, // Non "vSharedBranches" versions do not encode the summary originatorId.
+				),
+			};
 		},
-		options.jsonValidator,
-	);
-	// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,
-	// and not leak the internal encoded format in the API surface.
-	// Fixing that would remove the need for this cast.
-	return codec as unknown as IJsonCodec<
-		SummaryData<TChangeset>,
-		JsonCompatibleReadOnly,
-		JsonCompatibleReadOnly,
-		EditManagerEncodingContext
-	>;
+	};
+	return codec;
 }

package/src/shared-tree-core/editManagerCodecsVSharedBranches.ts

@@ -6,7 +6,7 @@
 import { assert } from "@fluidframework/core-utils/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 
-import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
+import type { CodecAndSchema, IJsonCodec } from "../codec/index.js";
 import type {
 	ChangeEncodingContext,
 	EncodedRevisionTag,
@@ -15,6 +15,7 @@ import type {
 } from "../core/index.js";
 import {
 	type JsonCompatibleReadOnly,
+	type JsonCompatibleReadOnlyObject,
 	JsonCompatibleReadOnlySchema,
 	type Mutable,
 } from "../util/index.js";
@@ -43,107 +44,83 @@ export function makeSharedBranchesCodecWithVersion<TChangeset>(
 		EncodedRevisionTag,
 		ChangeEncodingContext
 	>,
-	options: ICodecOptions,
 	version: EncodedEditManager<TChangeset>["version"],
-): IJsonCodec<
-	SummaryData<TChangeset>,
-	JsonCompatibleReadOnly,
-	JsonCompatibleReadOnly,
-	EditManagerEncodingContext
-> {
-	const format = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
+): CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> {
+	const schema = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
 
-	const codec: IJsonCodec<
-		SummaryData<TChangeset>,
-		EncodedEditManager<TChangeset>,
-		EncodedEditManager<TChangeset>,
-		EditManagerEncodingContext
-	> = withSchemaValidation(
-		format,
-		{
-			encode: (data: SummaryData<TChangeset>, context: EditManagerEncodingContext) => {
-				const mainBranch = encodeSharedBranch(
-					changeCodec,
-					revisionTagCodec,
-					data.main,
-					context,
-					data.originator,
-				);
-				assert(
-					data.originator !== undefined,
-					0xca5 /* Cannot encode vSharedBranches summary without originator */,
-				);
-				const json: Mutable<EncodedEditManager<TChangeset>> = {
-					main: mainBranch,
-					originator: data.originator,
-					version,
-				};
-				if (data.branches !== undefined && data.branches.size > 0) {
-					const branches: EncodedSharedBranch<TChangeset>[] = [];
-					for (const [_, branch] of data.branches) {
-						branches.push(
-							encodeSharedBranch(
-								changeCodec,
-								revisionTagCodec,
-								branch,
-								context,
-								data.originator,
-							),
-						);
-					}
-					json.branches = branches;
-				}
-				return json;
-			},
-			decode: (
-				json: EncodedEditManager<TChangeset>,
-				context: EditManagerEncodingContext,
-			): SummaryData<TChangeset> => {
-				const mainBranch = decodeSharedBranch(
-					changeCodec,
-					revisionTagCodec,
-					json.main,
-					context,
-					json.originator,
-				);
-
-				const decoded: Mutable<SummaryData<TChangeset>> = {
-					main: mainBranch,
-					originator: json.originator,
-				};
-
-				if (json.branches !== undefined) {
-					const branches = new Map<BranchId, SharedBranchSummaryData<TChangeset>>();
-					for (const branch of json.branches) {
-						const decodedBranch = decodeSharedBranch(
+	const codec: CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> = {
+		schema,
+		encode: (data: SummaryData<TChangeset>, context: EditManagerEncodingContext) => {
+			const mainBranch = encodeSharedBranch(
+				changeCodec,
+				revisionTagCodec,
+				data.main,
+				context,
+				data.originator,
+			);
+			assert(
+				data.originator !== undefined,
+				0xca5 /* Cannot encode vSharedBranches summary without originator */,
+			);
+			const json: Mutable<EncodedEditManager<TChangeset>> = {
+				main: mainBranch,
+				originator: data.originator,
+				version,
+			};
+			if (data.branches !== undefined && data.branches.size > 0) {
+				const branches: EncodedSharedBranch<TChangeset>[] = [];
+				for (const [_, branch] of data.branches) {
+					branches.push(
+						encodeSharedBranch(
 							changeCodec,
 							revisionTagCodec,
 							branch,
 							context,
-							json.originator,
-						);
-						assert(
-							decodedBranch.id !== undefined,
-							0xc66 /* Shared branches must have an id */,
-						);
-						assert(!branches.has(decodedBranch.id), 0xc67 /* Duplicate shared branch id */);
-						branches.set(decodedBranch.id, decodedBranch);
-					}
+							data.originator,
+						),
+					);
+				}
+				json.branches = branches;
+			}
+			return json as EncodedEditManager<TChangeset> & JsonCompatibleReadOnlyObject;
+		},
+		decode: (
+			json: EncodedEditManager<TChangeset> & JsonCompatibleReadOnlyObject,
+			context: EditManagerEncodingContext,
+		): SummaryData<TChangeset> => {
+			const mainBranch = decodeSharedBranch(
+				changeCodec,
+				revisionTagCodec,
+				json.main,
+				context,
+				json.originator,
+			);
 
-					decoded.branches = branches;
+			const decoded: Mutable<SummaryData<TChangeset>> = {
+				main: mainBranch,
+				originator: json.originator,
+			};
+
+			if (json.branches !== undefined) {
+				const branches = new Map<BranchId, SharedBranchSummaryData<TChangeset>>();
+				for (const branch of json.branches) {
+					const decodedBranch = decodeSharedBranch(
+						changeCodec,
+						revisionTagCodec,
+						branch,
+						context,
+						json.originator,
+					);
+					assert(decodedBranch.id !== undefined, 0xc66 /* Shared branches must have an id */);
+					assert(!branches.has(decodedBranch.id), 0xc67 /* Duplicate shared branch id */);
+					branches.set(decodedBranch.id, decodedBranch);
 				}
-				return decoded;
-			},
+
+				decoded.branches = branches;
+			}
+			return decoded;
 		},
-		options.jsonValidator,
-	);
-	// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,
-	// and not leak the internal encoded format in the API surface.
-	// Fixing that would remove the need for this cast.
-	return codec as unknown as IJsonCodec<
-		SummaryData<TChangeset>,
-		JsonCompatibleReadOnly,
-		JsonCompatibleReadOnly,
-		EditManagerEncodingContext
-	>;
+	};
+
+	return codec;
 }

package/src/shared-tree-core/index.ts

@@ -43,11 +43,9 @@ export { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 export { type ChangeEnricher } from "./changeEnricher.js";
 
 export {
-	makeEditManagerCodec,
+	makeEditManagerCodecBuilder,
 	getCodecTreeForEditManagerFormatWithChange,
-	type EditManagerCodecOptions,
-	clientVersionToEditManagerFormatVersion,
-	editManagerFormatVersionSelectorForSharedBranches,
+	editManagerCodecName,
 } from "./editManagerCodecs.js";
 export {
 	EditManagerFormatVersion,
@@ -71,13 +69,11 @@ export type {
 export type { DecodedMessage } from "./messageTypes.js";
 export {
 	getCodecTreeForMessageFormatWithChange,
-	clientVersionToMessageFormatVersion,
-	messageFormatVersionSelectorForSharedBranches,
-	makeMessageCodec,
+	makeMessageCodecBuilder,
+	messageCodecName,
 	type MessageEncodingContext,
 } from "./messageCodecs.js";
 export {
 	MessageFormatVersion,
-	messageFormatVersions,
 	supportedMessageFormatVersions,
 } from "./messageFormat.js";