@fluidframework/tree 2.81.0-374083 → 2.81.1

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

@@ -4,13 +4,13 @@
  */
 export { allowsRepoSuperset, allowsTreeSchemaIdentifierSuperset, allowsFieldSuperset, allowsTreeSuperset, allowsMultiplicitySuperset, } from "./comparison.js";
 export { isNeverField, isNeverTree } from "./isNeverTree.js";
-export { CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
+export { addCrossFieldQuery, CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
 export { ChangesetLocalIdSchema, EncodedChangeAtomId, EncodedRevisionInfo, EncodedModularChangesetV1, EncodedNodeChangeset, } from "./modularChangeFormatV1.js";
 export { EncodedModularChangesetV2 } from "./modularChangeFormatV2.js";
 export { FlexFieldKind } from "./fieldKind.js";
 export { referenceFreeFieldChangeRebaser, NodeAttachState, } from "./fieldChangeHandler.js";
 export { convertGenericChange, genericChangeHandler, genericFieldKind, } from "./genericFieldKind.js";
-export { ModularChangeFamily, ModularEditBuilder, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, getBuildIds, updateRefreshers, } from "./modularChangeFamily.js";
+export { ModularChangeFamily, ModularEditBuilder, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, updateRefreshers, } from "./modularChangeFamily.js";
 export { makeModularChangeCodecFamily } from "./modularChangeCodecs.js";
 export { DefaultRevisionReplacer } from "./defaultRevisionReplacer.js";
 //# sourceMappingURL=index.js.map

package/lib/feature-libraries/modular-schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,kBAAkB,EAClB,kCAAkC,EAClC,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAON,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,oBAAoB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAQN,+BAA+B,EAG/B,eAAe,GAGf,MAAM,yBAAyB,CAAC;AAajC,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAIlB,8BAA8B,EAC9B,SAAS,EACT,oBAAoB,EACpB,WAAW,EACX,gBAAgB,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAKxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport {\n\tallowsRepoSuperset,\n\tallowsTreeSchemaIdentifierSuperset,\n\tallowsFieldSuperset,\n\tallowsTreeSuperset,\n\tallowsMultiplicitySuperset,\n} from \"./comparison.js\";\nexport { isNeverField, isNeverTree } from \"./isNeverTree.js\";\nexport {\n\ttype InvertNodeManager,\n\ttype RebaseNodeManager,\n\ttype ComposeNodeManager,\n\ttype CrossFieldMap,\n\ttype CrossFieldQuerySet,\n\ttype DetachedNodeEntry,\n\tCrossFieldTarget,\n\tsetInCrossFieldMap,\n} from \"./crossFieldQueries.js\";\nexport {\n\tChangesetLocalIdSchema,\n\tEncodedChangeAtomId,\n\tEncodedRevisionInfo,\n\tEncodedModularChangesetV1,\n\tEncodedNodeChangeset,\n} from \"./modularChangeFormatV1.js\";\nexport { EncodedModularChangesetV2 } from \"./modularChangeFormatV2.js\";\nexport { FlexFieldKind, type FullSchemaPolicy } from \"./fieldKind.js\";\nexport {\n\ttype FieldChangeHandler,\n\ttype FieldChangeRebaser,\n\ttype FieldEditor,\n\ttype NodeChangeComposer,\n\ttype NodeChangeInverter,\n\ttype NodeChangeRebaser,\n\ttype NodeChangePruner,\n\treferenceFreeFieldChangeRebaser,\n\ttype RebaseRevisionMetadata,\n\ttype ToDelta,\n\tNodeAttachState,\n\ttype FieldChangeEncodingContext,\n\ttype NestedChangesIndices,\n} from \"./fieldChangeHandler.js\";\nexport {\n\ttype CrossFieldKey,\n\ttype CrossFieldKeyRange,\n\ttype FieldChange,\n\ttype FieldChangeMap,\n\ttype FieldChangeset,\n\ttype HasFieldChanges,\n\ttype ModularChangeset,\n\ttype NodeExistsConstraint,\n\ttype NodeId,\n\ttype RebaseVersion,\n} from \"./modularChangeTypes.js\";\nexport {\n\tconvertGenericChange,\n\tgenericChangeHandler,\n\tgenericFieldKind,\n} from \"./genericFieldKind.js\";\nexport type { GenericChangeset } from \"./genericFieldKindTypes.js\";\nexport {\n\tModularChangeFamily,\n\tModularEditBuilder,\n\ttype EditDescription,\n\ttype GlobalEditDescription,\n\ttype FieldEditDescription,\n\trebaseRevisionMetadataFromInfo,\n\tintoDelta,\n\trelevantRemovedRoots,\n\tgetBuildIds,\n\tupdateRefreshers,\n} from \"./modularChangeFamily.js\";\nexport { makeModularChangeCodecFamily } from \"./modularChangeCodecs.js\";\nexport type {\n\tFieldKindConfiguration,\n\tFieldKindConfigurationEntry,\n} from \"./fieldKindConfiguration.js\";\nexport { DefaultRevisionReplacer } from \"./defaultRevisionReplacer.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,kBAAkB,EAClB,kCAAkC,EAClC,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,kBAAkB,EAIlB,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,oBAAoB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EASN,+BAA+B,EAI/B,eAAe,GAGf,MAAM,yBAAyB,CAAC;AAajC,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAIlB,8BAA8B,EAC9B,SAAS,EACT,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAKxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport {\n\tallowsRepoSuperset,\n\tallowsTreeSchemaIdentifierSuperset,\n\tallowsFieldSuperset,\n\tallowsTreeSuperset,\n\tallowsMultiplicitySuperset,\n} from \"./comparison.js\";\nexport { isNeverField, isNeverTree } from \"./isNeverTree.js\";\nexport {\n\taddCrossFieldQuery,\n\ttype CrossFieldManager,\n\ttype CrossFieldMap,\n\ttype CrossFieldQuerySet,\n\tCrossFieldTarget,\n\tsetInCrossFieldMap,\n} from \"./crossFieldQueries.js\";\nexport {\n\tChangesetLocalIdSchema,\n\tEncodedChangeAtomId,\n\tEncodedRevisionInfo,\n\tEncodedModularChangesetV1,\n\tEncodedNodeChangeset,\n} from \"./modularChangeFormatV1.js\";\nexport { EncodedModularChangesetV2 } from \"./modularChangeFormatV2.js\";\nexport { FlexFieldKind, type FullSchemaPolicy } from \"./fieldKind.js\";\nexport {\n\ttype FieldChangeHandler,\n\ttype FieldChangeDelta,\n\ttype FieldChangeRebaser,\n\ttype FieldEditor,\n\ttype NodeChangeComposer,\n\ttype NodeChangeInverter,\n\ttype NodeChangeRebaser,\n\ttype NodeChangePruner,\n\treferenceFreeFieldChangeRebaser,\n\ttype RebaseRevisionMetadata,\n\ttype RelevantRemovedRootsFromChild,\n\ttype ToDelta,\n\tNodeAttachState,\n\ttype FieldChangeEncodingContext,\n\ttype NestedChangesIndices,\n} from \"./fieldChangeHandler.js\";\nexport type {\n\tCrossFieldKey,\n\tCrossFieldKeyRange,\n\tFieldChange,\n\tFieldChangeMap,\n\tFieldChangeset,\n\tHasFieldChanges,\n\tModularChangeset,\n\tNoChangeConstraint,\n\tNodeExistsConstraint,\n\tNodeId,\n} from \"./modularChangeTypes.js\";\nexport {\n\tconvertGenericChange,\n\tgenericChangeHandler,\n\tgenericFieldKind,\n} from \"./genericFieldKind.js\";\nexport type { GenericChangeset } from \"./genericFieldKindTypes.js\";\nexport {\n\tModularChangeFamily,\n\tModularEditBuilder,\n\ttype EditDescription,\n\ttype GlobalEditDescription,\n\ttype FieldEditDescription,\n\trebaseRevisionMetadataFromInfo,\n\tintoDelta,\n\trelevantRemovedRoots,\n\tupdateRefreshers,\n} from \"./modularChangeFamily.js\";\nexport { makeModularChangeCodecFamily } from \"./modularChangeCodecs.js\";\nexport type {\n\tFieldKindConfiguration,\n\tFieldKindConfigurationEntry,\n} from \"./fieldKindConfiguration.js\";\nexport { DefaultRevisionReplacer } from \"./defaultRevisionReplacer.js\";\n"]}

package/lib/feature-libraries/modular-schema/modularChangeCodecV1.d.ts

@@ -2,31 +2,48 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import type { TAnySchema } from "@sinclair/typebox";
 import { type ICodecOptions, type IJsonCodec, type IMultiFormatCodec, type SchemaValidationFunction } from "../../codec/index.js";
-import { type ChangeEncodingContext, type EncodedRevisionTag, type FieldKindIdentifier, type RevisionTag } from "../../core/index.js";
-import { type JsonCompatibleReadOnly, type Mutable } from "../../util/index.js";
-import { type FieldBatchCodec } from "../chunked-forest/index.js";
+import type { ChangeEncodingContext, EncodedRevisionTag, FieldKindIdentifier, RevisionInfo, RevisionTag } from "../../core/index.js";
+import { type IdAllocator, type JsonCompatibleReadOnly, type Mutable } from "../../util/index.js";
+import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
+import { type FieldBatchCodec, type TreeChunk } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
-import type { FieldKindConfiguration } from "./fieldKindConfiguration.js";
-import { type FieldChangeset, type ModularChangeset } from "./modularChangeTypes.js";
-import { EncodedModularChangesetV1 } from "./modularChangeFormatV1.js";
 import type { FieldChangeEncodingContext } from "./fieldChangeHandler.js";
-import type { TAnySchema } from "@sinclair/typebox";
+import type { FieldKindConfiguration } from "./fieldKindConfiguration.js";
+import { type EncodedBuilds, type EncodedFieldChangeMap, EncodedModularChangesetV1, type EncodedNodeChangeset, type EncodedRevisionInfo } from "./modularChangeFormatV1.js";
+import { type FieldChangeset, type FieldChangeMap, type ModularChangeset, type NodeChangeset, type NodeId } from "./modularChangeTypes.js";
 type ModularChangeCodec = IJsonCodec<ModularChangeset, EncodedModularChangesetV1, EncodedModularChangesetV1, ChangeEncodingContext>;
 type FieldCodec = IMultiFormatCodec<FieldChangeset, JsonCompatibleReadOnly, JsonCompatibleReadOnly, FieldChangeEncodingContext>;
 type FieldChangesetCodecs = Map<FieldKindIdentifier, {
     compiledSchema?: SchemaValidationFunction<TAnySchema>;
     codec: FieldCodec;
 }>;
-export declare function getFieldChangesetCodecs(fieldKinds: FieldKindConfiguration, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, codecOptions: ICodecOptions): Map<FieldKindIdentifier, {
+export declare function getFieldChangesetCodec(fieldKind: FieldKindIdentifier, fieldChangesetCodecs: FieldChangesetCodecs): {
     compiledSchema?: SchemaValidationFunction<TAnySchema>;
     codec: FieldCodec;
-}>;
-export declare function makeModularChangeCodecV1(fieldKinds: FieldKindConfiguration, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, codecOptions: ICodecOptions, chunkCompressionStrategy?: TreeCompressionStrategy): ModularChangeCodec;
-export declare function encodeChange(change: ModularChangeset, context: ChangeEncodingContext, fieldChangesetCodecs: FieldChangesetCodecs, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, chunkCompressionStrategy: TreeCompressionStrategy): EncodedModularChangesetV1;
+};
+export declare function encodeFieldChangesForJson(change: FieldChangeMap, context: ChangeEncodingContext, nodeChanges: ChangeAtomIdBTree<NodeChangeset>, fieldChangesetCodecs: FieldChangesetCodecs): EncodedFieldChangeMap;
+export declare function encodeFieldChangesForJsonI(change: FieldChangeMap, context: FieldChangeEncodingContext, fieldChangesetCodecs: FieldChangesetCodecs): EncodedFieldChangeMap;
+export declare function encodeNodeChangesForJson(change: NodeChangeset, context: FieldChangeEncodingContext, fieldChangesetCodecs: FieldChangesetCodecs): EncodedNodeChangeset;
+export declare function decodeFieldChangesFromJson(encodedChange: EncodedFieldChangeMap, parentId: NodeId | undefined, decoded: ModularChangeset, context: ChangeEncodingContext, idAllocator: IdAllocator, fieldKinds: FieldKindConfiguration, fieldChangesetCodecs: FieldChangesetCodecs): FieldChangeMap;
+export declare function decodeNodeChangesetFromJson(encodedChange: EncodedNodeChangeset, id: NodeId, decoded: ModularChangeset, context: ChangeEncodingContext, idAllocator: IdAllocator, fieldKinds: FieldKindConfiguration, fieldChangesetCodecs: FieldChangesetCodecs): NodeChangeset;
+export declare function encodeDetachedNodes(detachedNodes: ChangeAtomIdBTree<TreeChunk> | undefined, context: ChangeEncodingContext, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, chunkCompressionStrategy: TreeCompressionStrategy): EncodedBuilds | undefined;
+export declare function decodeDetachedNodes(encoded: EncodedBuilds | undefined, context: ChangeEncodingContext, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, chunkCompressionStrategy: TreeCompressionStrategy): ChangeAtomIdBTree<TreeChunk> | undefined;
+export declare function encodeRevisionInfos(revisions: readonly RevisionInfo[], context: ChangeEncodingContext, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): EncodedRevisionInfo[] | undefined;
+export declare function decodeRevisionInfos(revisions: readonly EncodedRevisionInfo[] | undefined, context: ChangeEncodingContext, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): RevisionInfo[] | undefined;
+export declare function encodeChange(change: ModularChangeset, context: ChangeEncodingContext, fieldChangesetCodecs: Map<FieldKindIdentifier, {
+    compiledSchema?: SchemaValidationFunction<TAnySchema>;
+    codec: FieldCodec;
+}>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, chunkCompressionStrategy: TreeCompressionStrategy): EncodedModularChangesetV1;
 export declare function decodeChange(encodedChange: EncodedModularChangesetV1, context: ChangeEncodingContext, fieldKinds: FieldKindConfiguration, fieldChangesetCodecs: Map<FieldKindIdentifier, {
     compiledSchema?: SchemaValidationFunction<TAnySchema>;
     codec: FieldCodec;
 }>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, chunkCompressionStrategy: TreeCompressionStrategy): Mutable<ModularChangeset>;
+export declare function getFieldChangesetCodecs(fieldKinds: FieldKindConfiguration, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, codecOptions: ICodecOptions): Map<FieldKindIdentifier, {
+    compiledSchema?: SchemaValidationFunction<TAnySchema>;
+    codec: FieldCodec;
+}>;
+export declare function makeModularChangeCodecV1(fieldKinds: FieldKindConfiguration, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, codecOptions: ICodecOptions, chunkCompressionStrategy?: TreeCompressionStrategy): ModularChangeCodec;
 export {};
 //# sourceMappingURL=modularChangeCodecV1.d.ts.map

package/lib/feature-libraries/modular-schema/modularChangeCodecV1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modularChangeCodecV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeCodecV1.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modularChangeCodecV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeCodecV1.ts"],"names":[],"mappings":"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"}

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

@@ -2,64 +2,36 @@
  * 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, newTupleBTree, } from "../../util/index.js";
 import { chunkFieldSingle, defaultChunkPolicy, } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
-import { addNodeRename, getFirstAttachField, getFirstDetachField, newRootTable, normalizeFieldId, validateChangeset, } from "./modularChangeFamily.js";
-import { newCrossFieldRangeTable, } from "./modularChangeTypes.js";
-import { EncodedModularChangesetV1 } from "./modularChangeFormatV1.js";
 import { genericFieldKind } from "./genericFieldKind.js";
-import { setInChangeAtomIdMap } from "../changeAtomIdBTree.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.json.encodedSchema
-                ? extractJsonValidator(codecOptions.jsonValidator).compile(codec.json.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, 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 ?? newTupleBTree(),
-            rootRenames: rootChanges?.renames ?? newChangeAtomIdTransform(),
-            encodeNode,
-            getInputRootId,
-            isAttachId,
-            isDetachId,
-            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.json.encode(fieldChange.change, fieldContext);
+        const encodedChange = codec.json.encode(fieldChange.change, context);
         if (compiledSchema !== undefined && !compiledSchema.check(encodedChange)) {
             fail(0xb1f /* Encoded change didn't pass schema validation. */);
         }
@@ -73,24 +45,19 @@ function encodeFieldChangesForJson(change, parentId, fieldToRoots, context, enco
     }
     return encodedFields;
 }
-function encodeNodeChangesForJson(change, id, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, 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, 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);
@@ -103,34 +70,22 @@ function decodeFieldChangesFromJson(encodedChange, parentId, decodedCrossFieldKe
         };
         const fieldContext = {
             baseContext: context,
-            rootNodeChanges: newTupleBTree(),
-            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"),
             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);
+                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;
             },
-            decodeMoveAndDetach: (detachId, count) => {
-                decodedRootTable.outputDetachLocations.set(detachId, count, fieldId);
-            },
-            generateId: () => ({
-                revision: context.revision,
-                localId: brand(idAllocator.allocate()),
-            }),
         };
         const fieldChangeset = codec.json.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, {
@@ -140,18 +95,52 @@ 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;
 }
-function decodeDetachedNodes(encoded, context, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
+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;
     }
@@ -182,7 +171,27 @@ function decodeDetachedNodes(encoded, context, revisionTagCodec, fieldsCodec, ch
     });
     return map;
 }
-function decodeRevisionInfos(revisions, context, revisionTagCodec) {
+export function encodeRevisionInfos(revisions, context, revisionTagCodec) {
+    if (context.revision !== undefined) {
+        assert(revisions.length === 1 &&
+            revisions[0] !== undefined &&
+            revisions[0].revision === context.revision &&
+            revisions[0].rollbackOf === undefined, 0x964 /* A tagged change should only contain the tagged revision */);
+        return undefined;
+    }
+    const encodedRevisions = [];
+    for (const revision of revisions) {
+        const encodedRevision = {
+            revision: revisionTagCodec.encode(revision.revision, context),
+        };
+        if (revision.rollbackOf !== undefined) {
+            encodedRevision.rollbackOf = revisionTagCodec.encode(revision.rollbackOf, context);
+        }
+        encodedRevisions.push(encodedRevision);
+    }
+    return encodedRevisions;
+}
+export function decodeRevisionInfos(revisions, context, revisionTagCodec) {
     if (revisions === undefined) {
         return context.revision === undefined ? undefined : [{ revision: context.revision }];
     }
@@ -198,180 +207,29 @@ function decodeRevisionInfos(revisions, context, revisionTagCodec) {
     }
     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, 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, 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 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, fieldChangesetCodecs);
-    };
     // Destroys only exist in rollback changesets, which are never sent.
     assert(change.destroys === undefined, 0x899 /* Unexpected changeset with destroys */);
-    const encoded = {
+    return {
         maxId: change.maxId,
         revisions: change.revisions === undefined
             ? undefined
             : encodeRevisionInfos(change.revisions, context, revisionTagCodec),
-        changes: encodeFieldChangesForJson(change.fieldChanges, undefined, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId, fieldChangesetCodecs),
+        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,
     };
-    return encoded;
-}
-function encodeRevisionInfos(revisions, context, revisionTagCodec) {
-    if (context.revision !== undefined) {
-        assert(revisions.length === 1 &&
-            revisions[0] !== undefined &&
-            revisions[0].revision === context.revision &&
-            revisions[0].rollbackOf === undefined, 0x964 /* A tagged change should only contain the tagged revision */);
-        return undefined;
-    }
-    const encodedRevisions = [];
-    for (const revision of revisions) {
-        const encodedRevision = {
-            revision: revisionTagCodec.encode(revision.revision, context),
-        };
-        if (revision.rollbackOf !== undefined) {
-            encodedRevision.rollbackOf = revisionTagCodec.encode(revision.rollbackOf, context);
-        }
-        encodedRevisions.push(encodedRevision);
-    }
-    return encodedRevisions;
-}
-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,
-            }),
-        };
-}
-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 = newTupleBTree();
-    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);
-        }
-    }
-    return fieldToRoots;
-}
-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: newTupleBTree(),
-        renames: newChangeAtomIdTransform(),
-    };
-    map.set(key, newRootChanges);
-    return newRootChanges;
 }
 export function decodeChange(encodedChange, context, fieldKinds, fieldChangesetCodecs, revisionTagCodec, fieldsCodec, chunkCompressionStrategy) {
-    const idAllocator = idAllocatorFromMaxId(encodedChange.maxId);
-    const nodeChanges = newTupleBTree();
-    const nodeToParent = newTupleBTree();
-    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: newTupleBTree(),
+        nodeToParent: newTupleBTree(),
         nodeAliases: newTupleBTree(),
-        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);
     }
@@ -388,15 +246,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.json.encodedSchema
+                ? extractJsonValidator(codecOptions.jsonValidator).compile(codec.json.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