@fluidframework/tree 2.90.0-378676 → 2.91.0

package/lib/feature-libraries/modular-schema/modularChangeCodecV1.js

@@ -2,65 +2,37 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert, fail, oob } from "@fluidframework/core-utils/internal";
+import { assert, oob, fail } from "@fluidframework/core-utils/internal";
 import { extractJsonValidator, withSchemaValidation, } from "../../codec/index.js";
-import { newChangeAtomIdTransform, } from "../../core/index.js";
 import { brand, idAllocatorFromMaxId, } from "../../util/index.js";
-import { newChangeAtomIdBTree, setInChangeAtomIdMap, } from "../changeAtomIdBTree.js";
+import { newChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import { chunkFieldSingle, defaultChunkPolicy, } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 import { genericFieldKind } from "./genericFieldKind.js";
-import { addNodeRename, getFirstAttachField, getFirstDetachField, newFieldIdKeyBTree, newRootTable, normalizeFieldId, validateChangeset, } from "./modularChangeFamily.js";
-import { EncodedModularChangesetV1 } from "./modularChangeFormatV1.js";
-import { newCrossFieldRangeTable, } from "./modularChangeTypes.js";
-export function getFieldChangesetCodecs(fieldKinds, revisionTagCodec, codecOptions) {
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    const getMapEntry = ({ kind, formatVersion }) => {
-        const codec = kind.changeHandler.codecsFactory(revisionTagCodec).resolve(formatVersion);
-        return {
-            codec,
-            compiledSchema: codec.encodedSchema
-                ? extractJsonValidator(codecOptions.jsonValidator).compile(codec.encodedSchema)
-                : undefined,
-        };
+import { EncodedModularChangesetV1, } from "./modularChangeFormatV1.js";
+import { newCrossFieldKeyTable, } from "./modularChangeTypes.js";
+export function getFieldChangesetCodec(fieldKind, fieldChangesetCodecs) {
+    const entry = fieldChangesetCodecs.get(fieldKind);
+    assert(entry !== undefined, 0x5ea /* Tried to encode unsupported fieldKind */);
+    return entry;
+}
+export function encodeFieldChangesForJson(change, context, nodeChanges, fieldChangesetCodecs) {
+    const fieldContext = {
+        baseContext: context,
+        encodeNode: (nodeId) => {
+            const node = nodeChanges.get([nodeId.revision, nodeId.localId]);
+            assert(node !== undefined, 0x92e /* Unknown node ID */);
+            return encodeNodeChangesForJson(node, fieldContext, fieldChangesetCodecs);
+        },
+        decodeNode: () => fail(0xb1e /* Should not decode nodes during field encoding */),
     };
-    /**
-     * The codec version for the generic field kind.
-     */
-    const genericFieldKindFormatVersion = 1;
-    const fieldChangesetCodecs = new Map([
-        [
-            genericFieldKind.identifier,
-            getMapEntry({ kind: genericFieldKind, formatVersion: genericFieldKindFormatVersion }),
-        ],
-    ]);
-    // 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));
-    });
-    return fieldChangesetCodecs;
+    return encodeFieldChangesForJsonI(change, fieldContext, fieldChangesetCodecs);
 }
-function encodeFieldChangesForJson(change, parentId, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, getCellIdForMove, fieldChangesetCodecs) {
+export function encodeFieldChangesForJsonI(change, context, fieldChangesetCodecs) {
     const encodedFields = [];
     for (const [field, fieldChange] of change) {
         const { codec, compiledSchema } = getFieldChangesetCodec(fieldChange.fieldKind, fieldChangesetCodecs);
-        const rootChanges = fieldToRoots.get([parentId?.revision, parentId?.localId, field]);
-        const fieldContext = {
-            baseContext: context,
-            rootNodeChanges: rootChanges?.nodeChanges ?? newChangeAtomIdBTree(),
-            rootRenames: rootChanges?.renames ?? newChangeAtomIdTransform(),
-            encodeNode,
-            getInputRootId,
-            isAttachId,
-            isDetachId,
-            getCellIdForMove,
-            decodeNode: () => fail(0xb1e /* Should not decode nodes during field encoding */),
-            decodeRootNodeChange: () => fail("Should not be called during encoding"),
-            decodeRootRename: () => fail("Should not be called during encoding"),
-            decodeMoveAndDetach: () => fail("Should not be called during encoding"),
-            generateId: () => fail("Should not be called during encoding"),
-        };
-        const encodedChange = codec.encode(fieldChange.change, fieldContext);
+        const encodedChange = codec.encode(fieldChange.change, context);
         if (compiledSchema !== undefined && !compiledSchema.check(encodedChange)) {
             fail(0xb1f /* Encoded change didn't pass schema validation. */);
         }
@@ -74,24 +46,19 @@ function encodeFieldChangesForJson(change, parentId, fieldToRoots, context, enco
     }
     return encodedFields;
 }
-function encodeNodeChangesForJson(change, id, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, getCellIdForMove, fieldChangesetCodecs) {
+export function encodeNodeChangesForJson(change, context, fieldChangesetCodecs) {
     const encodedChange = {};
     // Note: revert constraints are ignored for now because they would only be needed if we supported reverting changes made by peers.
     const { fieldChanges, nodeExistsConstraint } = change;
     if (fieldChanges !== undefined) {
-        encodedChange.fieldChanges = encodeFieldChangesForJson(fieldChanges, id, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, getCellIdForMove, fieldChangesetCodecs);
+        encodedChange.fieldChanges = encodeFieldChangesForJsonI(fieldChanges, context, fieldChangesetCodecs);
     }
     if (nodeExistsConstraint !== undefined) {
         encodedChange.nodeExistsConstraint = nodeExistsConstraint;
     }
     return encodedChange;
 }
-function getFieldChangesetCodec(fieldKind, fieldChangesetCodecs) {
-    const entry = fieldChangesetCodecs.get(fieldKind);
-    assert(entry !== undefined, 0x5ea /* Tried to encode unsupported fieldKind */);
-    return entry;
-}
-function decodeFieldChangesFromJson(encodedChange, parentId, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator, fieldKinds, fieldChangesetCodecs) {
+export function decodeFieldChangesFromJson(encodedChange, parentId, decoded, context, idAllocator, fieldKinds, fieldChangesetCodecs) {
     const decodedFields = new Map();
     for (const field of encodedChange) {
         const { codec, compiledSchema } = getFieldChangesetCodec(field.fieldKind, fieldChangesetCodecs);
@@ -104,35 +71,22 @@ function decodeFieldChangesFromJson(encodedChange, parentId, decodedCrossFieldKe
         };
         const fieldContext = {
             baseContext: context,
-            rootNodeChanges: newChangeAtomIdBTree(),
-            rootRenames: newChangeAtomIdTransform(),
             encodeNode: () => fail(0xb21 /* Should not encode nodes during field decoding */),
-            getInputRootId: () => fail("Should not query during decoding"),
-            isAttachId: () => fail("Should not query during decoding"),
-            isDetachId: () => fail("Should not query during decoding"),
-            getCellIdForMove: () => fail("Should not query during decoding"),
             decodeNode: (encodedNode) => {
-                return decodeNode(encodedNode, { field: fieldId });
-            },
-            decodeRootNodeChange: (detachId, encodedNode) => {
-                setInChangeAtomIdMap(decodedRootTable.nodeChanges, detachId, decodeNode(encodedNode, { root: detachId }));
-                decodedRootTable.detachLocations.set(detachId, 1, fieldId);
-            },
-            decodeRootRename: (oldId, newId, count) => {
-                addNodeRename(decodedRootTable, oldId, newId, count, fieldId);
-            },
-            decodeMoveAndDetach: (detachId, count) => {
-                decodedRootTable.outputDetachLocations.set(detachId, count, fieldId);
+                const nodeId = {
+                    revision: context.revision,
+                    localId: brand(idAllocator.allocate()),
+                };
+                const node = decodeNodeChangesetFromJson(encodedNode, nodeId, decoded, context, idAllocator, fieldKinds, fieldChangesetCodecs);
+                decoded.nodeChanges.set([nodeId.revision, nodeId.localId], node);
+                decoded.nodeToParent.set([nodeId.revision, nodeId.localId], fieldId);
+                return nodeId;
             },
-            generateId: () => ({
-                revision: context.revision,
-                localId: brand(idAllocator.allocate()),
-            }),
         };
         const fieldChangeset = codec.decode(field.change, fieldContext);
         const crossFieldKeys = getChangeHandler(fieldKinds, field.fieldKind).getCrossFieldKeys(fieldChangeset);
         for (const { key, count } of crossFieldKeys) {
-            decodedCrossFieldKeys.set(key, count, fieldId);
+            decoded.crossFieldKeys.set(key, count, fieldId);
         }
         const fieldKey = brand(field.fieldKey);
         decodedFields.set(fieldKey, {
@@ -142,17 +96,51 @@ function decodeFieldChangesFromJson(encodedChange, parentId, decodedCrossFieldKe
     }
     return decodedFields;
 }
-function decodeNodeChangesetFromJson(encodedChange, id, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator, fieldKinds, fieldChangesetCodecs) {
+export function decodeNodeChangesetFromJson(encodedChange, id, decoded, context, idAllocator, fieldKinds, fieldChangesetCodecs) {
     const decodedChange = {};
     const { fieldChanges, nodeExistsConstraint } = encodedChange;
     if (fieldChanges !== undefined) {
-        decodedChange.fieldChanges = decodeFieldChangesFromJson(fieldChanges, id, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator, fieldKinds, fieldChangesetCodecs);
+        decodedChange.fieldChanges = decodeFieldChangesFromJson(fieldChanges, id, decoded, context, idAllocator, fieldKinds, fieldChangesetCodecs);
     }
     if (nodeExistsConstraint !== undefined) {
         decodedChange.nodeExistsConstraint = nodeExistsConstraint;
     }
     return decodedChange;
 }
+export function encodeDetachedNodes(detachedNodes, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
+    if (detachedNodes === undefined) {
+        return undefined;
+    }
+    const treesToEncode = [];
+    const buildsArray = [];
+    let buildsForRevision;
+    for (const [[revision, id], chunk] of detachedNodes.entries()) {
+        const encodedRevision = encodeRevisionOpt(revisionTagCodec, revision, context);
+        if (buildsForRevision === undefined || buildsForRevision[1] !== encodedRevision) {
+            if (buildsForRevision !== undefined) {
+                buildsArray.push(buildsForRevision);
+            }
+            buildsForRevision = encodedRevision === undefined ? [[]] : [[], encodedRevision];
+        }
+        treesToEncode.push(chunk.cursor());
+        const treeIndexInBatch = treesToEncode.length - 1;
+        buildsForRevision?.[0].push([id, treeIndexInBatch]);
+    }
+    if (buildsForRevision !== undefined) {
+        buildsArray.push(buildsForRevision);
+    }
+    return buildsArray.length === 0
+        ? undefined
+        : {
+            builds: buildsArray,
+            trees: fieldsCodec.encode(treesToEncode, {
+                encodeType: chunkCompressionStrategy,
+                schema: context.schema,
+                originatorId: context.originatorId,
+                idCompressor: context.idCompressor,
+            }),
+        };
+}
 export function decodeDetachedNodes(encoded, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
     if (encoded === undefined || encoded.builds.length === 0) {
         return undefined;
@@ -184,67 +172,6 @@ export function decodeDetachedNodes(encoded, context, revisionTagCodec, fieldsCo
     });
     return map;
 }
-export function decodeRevisionInfos(revisions, context, revisionTagCodec) {
-    if (revisions === undefined) {
-        return context.revision === undefined ? undefined : [{ revision: context.revision }];
-    }
-    const decodedRevisions = [];
-    for (const revision of revisions) {
-        const decodedRevision = {
-            revision: revisionTagCodec.decode(revision.revision, context),
-        };
-        if (revision.rollbackOf !== undefined) {
-            decodedRevision.rollbackOf = revisionTagCodec.decode(revision.rollbackOf, context);
-        }
-        decodedRevisions.push(decodedRevision);
-    }
-    return decodedRevisions;
-}
-export function makeModularChangeCodecV1(fieldKinds, revisionTagCodec, fieldsCodec, codecOptions, chunkCompressionStrategy = TreeCompressionStrategy.Compressed) {
-    const fieldChangesetCodecs = getFieldChangesetCodecs(fieldKinds, revisionTagCodec, codecOptions);
-    const modularChangeCodec = {
-        encode: (change, context) => encodeChange(change, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
-        decode: (encodedChange, context) => decodeChange(encodedChange, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
-    };
-    return withSchemaValidation(EncodedModularChangesetV1, modularChangeCodec, codecOptions.jsonValidator);
-}
-export function encodeChange(change, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
-    const fieldToRoots = getFieldToRoots(change.rootNodes, change.nodeAliases);
-    const isAttachId = (id, count) => {
-        const attachEntry = getFirstAttachField(change.crossFieldKeys, id, count);
-        return { ...attachEntry, value: attachEntry.value !== undefined };
-    };
-    const isDetachId = (id, count) => {
-        const detachEntry = getFirstDetachField(change.crossFieldKeys, id, count);
-        const renameEntry = change.rootNodes.oldToNewId.getFirst(id, detachEntry.length);
-        const isDetach = (detachEntry.value ?? renameEntry.value) !== undefined;
-        return { start: id, value: isDetach, length: renameEntry.length };
-    };
-    const moveIdToCellId = getMoveIdToCellId(change, fieldKinds, fieldToRoots);
-    const getCellIdForMove = (id, count) => moveIdToCellId.getFirst(id, count);
-    const getInputRootId = (id, count) => {
-        return change.rootNodes.newToOldId.getFirst(id, count);
-    };
-    const encodeNode = (nodeId) => {
-        // TODO: Handle node aliasing.
-        const node = change.nodeChanges.get([nodeId.revision, nodeId.localId]);
-        assert(node !== undefined, 0x92e /* Unknown node ID */);
-        return encodeNodeChangesForJson(node, nodeId, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, getCellIdForMove, fieldChangesetCodecs);
-    };
-    // Destroys only exist in rollback changesets, which are never sent.
-    assert(change.destroys === undefined, 0x899 /* Unexpected changeset with destroys */);
-    const encoded = {
-        maxId: change.maxId,
-        revisions: change.revisions === undefined
-            ? undefined
-            : encodeRevisionInfos(change.revisions, context, revisionTagCodec),
-        changes: encodeFieldChangesForJson(change.fieldChanges, undefined, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, getCellIdForMove, fieldChangesetCodecs),
-        builds: encodeDetachedNodes(change.builds, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
-        refreshers: encodeDetachedNodes(change.refreshers, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
-        violations: change.constraintViolationCount,
-    };
-    return encoded;
-}
 export function encodeRevisionInfos(revisions, context, revisionTagCodec) {
     if (context.revision !== undefined) {
         assert(
@@ -268,135 +195,45 @@ export function encodeRevisionInfos(revisions, context, revisionTagCodec) {
     }
     return encodedRevisions;
 }
-export function encodeDetachedNodes(detachedNodes, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
-    if (detachedNodes === undefined) {
-        return undefined;
-    }
-    const treesToEncode = [];
-    const buildsArray = [];
-    let buildsForRevision;
-    for (const [[revision, id], chunk] of detachedNodes.entries()) {
-        const encodedRevision = encodeRevisionOpt(revisionTagCodec, revision, context);
-        if (buildsForRevision === undefined || buildsForRevision[1] !== encodedRevision) {
-            if (buildsForRevision !== undefined) {
-                buildsArray.push(buildsForRevision);
-            }
-            buildsForRevision = encodedRevision === undefined ? [[]] : [[], encodedRevision];
-        }
-        treesToEncode.push(chunk.cursor());
-        const treeIndexInBatch = treesToEncode.length - 1;
-        buildsForRevision?.[0].push([id, treeIndexInBatch]);
-    }
-    if (buildsForRevision !== undefined) {
-        buildsArray.push(buildsForRevision);
+export function decodeRevisionInfos(revisions, context, revisionTagCodec) {
+    if (revisions === undefined) {
+        return context.revision === undefined ? undefined : [{ revision: context.revision }];
     }
-    return buildsArray.length === 0
-        ? undefined
-        : {
-            builds: buildsArray,
-            trees: fieldsCodec.encode(treesToEncode, {
-                encodeType: chunkCompressionStrategy,
-                schema: context.schema,
-                originatorId: context.originatorId,
-                idCompressor: context.idCompressor,
-            }),
+    const decodedRevisions = [];
+    for (const revision of revisions) {
+        const decodedRevision = {
+            revision: revisionTagCodec.decode(revision.revision, context),
         };
-}
-function getChangeHandler(fieldKinds, fieldKind) {
-    if (fieldKind === genericFieldKind.identifier) {
-        return genericFieldKind.changeHandler;
-    }
-    const handler = fieldKinds.get(fieldKind)?.kind.changeHandler;
-    assert(handler !== undefined, 0x9c1 /* Unknown field kind */);
-    return handler;
-}
-function encodeRevisionOpt(revisionCodec, revision, context) {
-    if (revision === undefined) {
-        return undefined;
-    }
-    return revision === context.revision ? undefined : revisionCodec.encode(revision, context);
-}
-function getFieldToRoots(rootTable, aliases) {
-    const fieldToRoots = newFieldIdKeyBTree();
-    for (const [[revision, localId], nodeId] of rootTable.nodeChanges.entries()) {
-        const detachId = { revision, localId };
-        const fieldId = rootTable.detachLocations.getFirst(detachId, 1).value;
-        if (fieldId === undefined) {
-            fail("Untracked root change");
-        }
-        else {
-            setInChangeAtomIdMap(getOrAddInFieldRootMap(fieldToRoots, normalizeFieldId(fieldId, aliases)).nodeChanges, detachId, nodeId);
-        }
-    }
-    for (const entry of rootTable.oldToNewId.entries()) {
-        const fieldId = rootTable.detachLocations.getFirst(entry.start, 1).value;
-        if (fieldId === undefined) {
-            fail("Untracked root change");
-        }
-        else {
-            getOrAddInFieldRootMap(fieldToRoots, normalizeFieldId(fieldId, aliases)).renames.set(entry.start, entry.length, entry.value);
+        if (revision.rollbackOf !== undefined) {
+            decodedRevision.rollbackOf = revisionTagCodec.decode(revision.rollbackOf, context);
         }
+        decodedRevisions.push(decodedRevision);
     }
-    return fieldToRoots;
+    return decodedRevisions;
 }
-function getOrAddInFieldRootMap(map, fieldId) {
-    const key = [fieldId.nodeId?.revision, fieldId.nodeId?.localId, fieldId.field];
-    const rootChanges = map.get(key);
-    if (rootChanges !== undefined) {
-        return rootChanges;
-    }
-    const newRootChanges = {
-        nodeChanges: newChangeAtomIdBTree(),
-        renames: newChangeAtomIdTransform(),
+export function encodeChange(change, context, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
+    // Destroys only exist in rollback changesets, which are never sent.
+    assert(change.destroys === undefined, 0x899 /* Unexpected changeset with destroys */);
+    return {
+        maxId: change.maxId,
+        revisions: change.revisions === undefined
+            ? undefined
+            : encodeRevisionInfos(change.revisions, context, revisionTagCodec),
+        changes: encodeFieldChangesForJson(change.fieldChanges, context, change.nodeChanges, fieldChangesetCodecs),
+        builds: encodeDetachedNodes(change.builds, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
+        refreshers: encodeDetachedNodes(change.refreshers, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
+        violations: change.constraintViolationCount,
     };
-    map.set(key, newRootChanges);
-    return newRootChanges;
-}
-export function getMoveIdToCellId(change, fieldKinds, fieldToRoot) {
-    const map = newChangeAtomIdTransform();
-    getMoveIdToCellIdsForFieldChanges(change.fieldChanges, undefined, fieldKinds, fieldToRoot, map);
-    for (const [nodeId, nodeChange] of change.nodeChanges.entries()) {
-        if (nodeChange.fieldChanges !== undefined) {
-            getMoveIdToCellIdsForFieldChanges(nodeChange.fieldChanges, { revision: nodeId[0], localId: nodeId[1] }, fieldKinds, fieldToRoot, map);
-        }
-    }
-    return map;
-}
-function getMoveIdToCellIdsForFieldChanges(changes, nodeId, fieldKinds, fieldToRoots, moveIdToCellId) {
-    for (const [fieldKey, field] of changes.entries()) {
-        for (const entry of getChangeHandler(fieldKinds, field.fieldKind).getDetachCellIds(field.change, fieldToRoots.get([nodeId?.revision, nodeId?.localId, fieldKey])?.renames ??
-            newChangeAtomIdTransform())) {
-            moveIdToCellId.set(entry.detachId, entry.count, entry.cellId);
-        }
-    }
 }
 export function decodeChange(encodedChange, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
-    const idAllocator = idAllocatorFromMaxId(encodedChange.maxId);
-    const nodeChanges = newChangeAtomIdBTree();
-    const nodeToParent = newChangeAtomIdBTree();
-    const crossFieldKeys = newCrossFieldRangeTable();
-    const rootNodes = newRootTable();
-    const decodeNode = (encodedNode, fieldId) => {
-        const nodeId = {
-            revision: context.revision,
-            localId: brand(idAllocator.allocate()),
-        };
-        const node = decodeNodeChangesetFromJson(encodedNode, nodeId, crossFieldKeys, rootNodes, context, decodeNode, idAllocator, fieldKinds, fieldChangesetCodecs);
-        nodeChanges.set([nodeId.revision, nodeId.localId], node);
-        if (fieldId !== undefined) {
-            nodeToParent.set([nodeId.revision, nodeId.localId], fieldId);
-        }
-        return nodeId;
-    };
     const decoded = {
-        rebaseVersion: 1,
-        fieldChanges: decodeFieldChangesFromJson(encodedChange.changes, undefined, crossFieldKeys, rootNodes, context, decodeNode, idAllocator, fieldKinds, fieldChangesetCodecs),
-        nodeChanges,
-        rootNodes,
-        nodeToParent,
+        fieldChanges: new Map(),
+        nodeChanges: newChangeAtomIdBTree(),
+        nodeToParent: newChangeAtomIdBTree(),
         nodeAliases: newChangeAtomIdBTree(),
-        crossFieldKeys,
+        crossFieldKeys: newCrossFieldKeyTable(),
     };
+    decoded.fieldChanges = decodeFieldChangesFromJson(encodedChange.changes, undefined, decoded, context, idAllocatorFromMaxId(encodedChange.maxId), fieldKinds, fieldChangesetCodecs);
     if (encodedChange.builds !== undefined) {
         decoded.builds = decodeDetachedNodes(encodedChange.builds, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy);
     }
@@ -413,15 +250,55 @@ export function decodeChange(encodedChange, context, fieldKinds, fieldChangesetC
     if (encodedChange.maxId !== undefined) {
         decoded.maxId = encodedChange.maxId;
     }
-    // XXX: This is an expensive assert which should be removed before merging.
-    validateChangeset(decoded, fieldKindsFromConfiguration(fieldKinds));
     return decoded;
 }
-function fieldKindsFromConfiguration(configuration) {
-    const map = new Map();
-    for (const [id, entry] of configuration.entries()) {
-        map.set(id, entry.kind);
+export function getFieldChangesetCodecs(fieldKinds, revisionTagCodec, codecOptions) {
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    const getMapEntry = ({ kind, formatVersion }) => {
+        const codec = kind.changeHandler.codecsFactory(revisionTagCodec).resolve(formatVersion);
+        return {
+            codec,
+            compiledSchema: codec.encodedSchema
+                ? extractJsonValidator(codecOptions.jsonValidator).compile(codec.encodedSchema)
+                : undefined,
+        };
+    };
+    /**
+     * The codec version for the generic field kind.
+     */
+    const genericFieldKindFormatVersion = 1;
+    const fieldChangesetCodecs = new Map([
+        [
+            genericFieldKind.identifier,
+            getMapEntry({ kind: genericFieldKind, formatVersion: genericFieldKindFormatVersion }),
+        ],
+    ]);
+    // 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));
+    });
+    return fieldChangesetCodecs;
+}
+export function makeModularChangeCodecV1(fieldKinds, revisionTagCodec, fieldsCodec, codecOptions, chunkCompressionStrategy = TreeCompressionStrategy.Compressed) {
+    const fieldChangesetCodecs = getFieldChangesetCodecs(fieldKinds, revisionTagCodec, codecOptions);
+    const modularChangeCodec = {
+        encode: (change, context) => encodeChange(change, context, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
+        decode: (encodedChange, context) => decodeChange(encodedChange, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy),
+    };
+    return withSchemaValidation(EncodedModularChangesetV1, modularChangeCodec, codecOptions.jsonValidator);
+}
+function getChangeHandler(fieldKinds, fieldKind) {
+    if (fieldKind === genericFieldKind.identifier) {
+        return genericFieldKind.changeHandler;
     }
-    return map;
+    const handler = fieldKinds.get(fieldKind)?.kind.changeHandler;
+    assert(handler !== undefined, 0x9c1 /* Unknown field kind */);
+    return handler;
+}
+function encodeRevisionOpt(revisionCodec, revision, context) {
+    if (revision === undefined) {
+        return undefined;
+    }
+    return revision === context.revision ? undefined : revisionCodec.encode(revision, context);
 }
 //# sourceMappingURL=modularChangeCodecV1.js.map