@fluidframework/tree 2.1.0-281041 → 2.2.0

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

@@ -1 +1 @@
-{"version":3,"file":"fieldKind.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/fieldKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,OAAgB,aAAa;IAKlC;;;;OAIG;IACH,YACiB,UAAuC,EACvC,YAA2B;QAD3B,eAAU,GAAV,UAAU,CAA6B;QACvC,iBAAY,GAAZ,YAAY,CAAe;IACzC,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type {\n\tFieldKindIdentifier,\n\tFieldKindData,\n\tMultiplicity,\n\tSchemaPolicy,\n} from \"../../core/index.js\";\n\n/**\n * Functionality for FieldKinds that is stable,\n * meaning that it can not change in any measurable way without providing a new identifier.\n *\n * It is assumed that this information and policy is available on all clients interacting with a document\n * using the identifier.\n *\n * This must contain enough information to process remote edits to this FieldKind consistently with all clients.\n * All behavior must be deterministic, and not change across versions of the app/library.\n *\n * These policies include the data encoding, change encoding, change rebase and change application.\n *\n * @sealed @internal\n * @privateRemarks\n * This being @sealed is for users of this package.\n * This package itself may provide implementations.\n * This pattern was picked instead of an interface since we do not have a convention for how to mark interfaces as only allowed to be implemented by the package declaring them,\n * and using a class also gets stronger (nominal) typing for objects which will be down cast.\n */\nexport abstract class FlexFieldKind<\n\tTName extends string = string,\n\tTMultiplicity extends Multiplicity = Multiplicity,\n> implements FieldKindData\n{\n\t/**\n\t * @param identifier - Globally scoped identifier.\n\t * @param multiplicity - bound on the number of children that fields of this kind may have.\n\t * TODO: consider replacing with numeric upper and lower bounds.\n\t */\n\tprotected constructor(\n\t\tpublic readonly identifier: TName & FieldKindIdentifier,\n\t\tpublic readonly multiplicity: TMultiplicity,\n\t) {}\n}\n\n/**\n * Policy from the app for interpreting the stored schema.\n * The app must ensure consistency for all users of the document.\n * @internal\n */\nexport interface FullSchemaPolicy extends SchemaPolicy {\n\t/**\n\t * Policy information about FieldKinds:\n\t * This is typically stored as code, not in documents, and defines how to handles fields based on their kind.\n\t * It is assumed that all users of a document will have exactly the same FieldKind policies,\n\t * though older applications might be missing some,\n\t * and will be unable to process any changes that use those FieldKinds.\n\t */\n\treadonly fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>;\n}\n"]}
+{"version":3,"file":"fieldKind.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/fieldKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAgB,aAAa;IAKlC;;;;OAIG;IACH,YACiB,UAAuC,EACvC,YAA2B;QAD3B,eAAU,GAAV,UAAU,CAA6B;QACvC,iBAAY,GAAZ,YAAY,CAAe;IACzC,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type {\n\tFieldKindIdentifier,\n\tFieldKindData,\n\tMultiplicity,\n\tSchemaPolicy,\n} from \"../../core/index.js\";\n\n/**\n * Functionality for FieldKinds that is stable,\n * meaning that it can not change in any measurable way without providing a new identifier.\n *\n * It is assumed that this information and policy is available on all clients interacting with a document\n * using the identifier.\n *\n * This must contain enough information to process remote edits to this FieldKind consistently with all clients.\n * All behavior must be deterministic, and not change across versions of the app/library.\n *\n * These policies include the data encoding, change encoding, change rebase and change application.\n *\n * @sealed * @privateRemarks\n * This being @sealed is for users of this package.\n * This package itself may provide implementations.\n * This pattern was picked instead of an interface since we do not have a convention for how to mark interfaces as only allowed to be implemented by the package declaring them,\n * and using a class also gets stronger (nominal) typing for objects which will be down cast.\n */\nexport abstract class FlexFieldKind<\n\tTName extends string = string,\n\tTMultiplicity extends Multiplicity = Multiplicity,\n> implements FieldKindData\n{\n\t/**\n\t * @param identifier - Globally scoped identifier.\n\t * @param multiplicity - bound on the number of children that fields of this kind may have.\n\t * TODO: consider replacing with numeric upper and lower bounds.\n\t */\n\tprotected constructor(\n\t\tpublic readonly identifier: TName & FieldKindIdentifier,\n\t\tpublic readonly multiplicity: TMultiplicity,\n\t) {}\n}\n\n/**\n * Policy from the app for interpreting the stored schema.\n * The app must ensure consistency for all users of the document.\n */\nexport interface FullSchemaPolicy extends SchemaPolicy {\n\t/**\n\t * Policy information about FieldKinds:\n\t * This is typically stored as code, not in documents, and defines how to handles fields based on their kind.\n\t * It is assumed that all users of a document will have exactly the same FieldKind policies,\n\t * though older applications might be missing some,\n\t * and will be unable to process any changes that use those FieldKinds.\n\t */\n\treadonly fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>;\n}\n"]}

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

@@ -6,7 +6,7 @@ import { type RevisionMetadataSource } from "../../core/index.js";
 import { type IdAllocator } from "../../util/index.js";
 import type { FieldChangeHandler, NodeChangeComposer } from "./fieldChangeHandler.js";
 import { FieldKindWithEditor } from "./fieldKindWithEditor.js";
-import type { GenericChangeset } from "./genericFieldKindTypes.js";
+import { type GenericChangeset } from "./genericFieldKindTypes.js";
 /**
  * {@link FieldChangeHandler} implementation for {@link GenericChangeset}.
  */
@@ -23,5 +23,4 @@ export declare const genericFieldKind: FieldKindWithEditor;
  * @returns An equivalent changeset as represented by the `target` field-kind.
  */
 export declare function convertGenericChange<TChange>(changeset: GenericChangeset, target: FieldChangeHandler<TChange>, composeChild: NodeChangeComposer, genId: IdAllocator, revisionMetadata: RevisionMetadataSource): TChange;
-export declare function newGenericChangeset(): GenericChangeset;
 //# sourceMappingURL=genericFieldKind.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKind.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIN,KAAK,sBAAsB,EAI3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EACX,kBAAkB,EAClB,kBAAkB,EAKlB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,gBAAgB,CAyErE,CAAC;AA2EF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,mBAM9B,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAC3C,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACnC,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,gBAAgB,EAAE,sBAAsB,GACtC,OAAO,CAmBT;AAUD,wBAAgB,mBAAmB,IAAI,gBAAgB,CAEtD"}
+{"version":3,"file":"genericFieldKind.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIN,KAAK,sBAAsB,EAI3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EACX,kBAAkB,EAClB,kBAAkB,EAKlB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAIxF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,gBAAgB,CAiCrE,CAAC;AA8FF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,mBAM9B,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAC3C,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACnC,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,gBAAgB,EAAE,sBAAsB,GACtC,OAAO,CAoBT"}

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

@@ -4,51 +4,18 @@
  */
 import { Multiplicity, replaceAtomRevisions, } from "../../core/index.js";
 import { fail } from "../../util/index.js";
+import { assert } from "@fluidframework/core-utils/internal";
 import { FieldKindWithEditor } from "./fieldKindWithEditor.js";
 import { makeGenericChangeCodec } from "./genericFieldKindCodecs.js";
+import { newGenericChangeset } from "./genericFieldKindTypes.js";
+import { BTree } from "@tylerbu/sorted-btree-es6";
 /**
  * {@link FieldChangeHandler} implementation for {@link GenericChangeset}.
  */
 export const genericChangeHandler = {
     rebaser: {
-        compose: (change1, change2, composeChildren) => {
-            const composed = [];
-            let listIndex1 = 0;
-            let listIndex2 = 0;
-            while (listIndex1 < change1.length || listIndex2 < change2.length) {
-                const next1 = change1[listIndex1];
-                const next2 = change2[listIndex2];
-                const nodeIndex1 = next1?.index ?? Infinity;
-                const nodeIndex2 = next2?.index ?? Infinity;
-                if (nodeIndex1 < nodeIndex2) {
-                    composed.push({
-                        index: nodeIndex1,
-                        nodeChange: composeChildren(next1.nodeChange, undefined),
-                    });
-                    listIndex1 += 1;
-                }
-                else if (nodeIndex2 < nodeIndex1) {
-                    composed.push({
-                        index: nodeIndex2,
-                        nodeChange: composeChildren(undefined, next2.nodeChange),
-                    });
-                    listIndex2 += 1;
-                }
-                else {
-                    // Both nodes are at the same position.
-                    composed.push({
-                        index: nodeIndex1,
-                        nodeChange: composeChildren(next1.nodeChange, next2.nodeChange),
-                    });
-                    listIndex1 += 1;
-                    listIndex2 += 1;
-                }
-            }
-            return composed;
-        },
-        invert: (change) => {
-            return change;
-        },
+        compose,
+        invert: (change) => change,
         rebase: rebaseGenericChange,
         prune: pruneGenericChange,
         replaceRevisions,
@@ -56,13 +23,13 @@ export const genericChangeHandler = {
     codecsFactory: makeGenericChangeCodec,
     editor: {
         buildChildChange(index, change) {
-            return [{ index, nodeChange: change }];
+            return newGenericChangeset([[index, change]]);
         },
     },
     intoDelta: (change, deltaFromChild) => {
         let nodeIndex = 0;
         const markList = [];
-        for (const { index, nodeChange } of change) {
+        for (const [index, nodeChange] of change.entries()) {
             if (nodeIndex < index) {
                 const offset = index - nodeIndex;
                 markList.push({ count: offset });
@@ -76,66 +43,72 @@ export const genericChangeHandler = {
     relevantRemovedRoots,
     isEmpty: (change) => change.length === 0,
     getNestedChanges,
-    createEmpty: () => [],
+    createEmpty: newGenericChangeset,
     getCrossFieldKeys: (_change) => [],
 };
+function compose(change1, change2, composeChildren) {
+    const composed = change1.clone();
+    for (const [index, id2] of change2.entries()) {
+        const id1 = composed.get(index);
+        const idComposed = id1 !== undefined ? composeChildren(id1, id2) : id2;
+        composed.set(index, idComposed);
+    }
+    return composed;
+}
 function getNestedChanges(change) {
-    return change.map(({ index, nodeChange }) => [nodeChange, index]);
+    return change.toArray().map(([index, nodeChange]) => [nodeChange, index]);
 }
 function rebaseGenericChange(change, over, rebaseChild) {
-    const rebased = [];
-    let iChange = 0;
-    let iOver = 0;
-    while (iChange < change.length || iOver < over.length) {
-        const a = change[iChange];
-        const b = over[iOver];
-        const aIndex = a?.index ?? Infinity;
-        const bIndex = b?.index ?? Infinity;
-        let nodeChangeA;
-        let nodeChangeB;
+    const rebased = new BTree();
+    let nextIndex = 0;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const newEntry = change.getPairOrNextHigher(nextIndex);
+        const baseEntry = over.getPairOrNextHigher(nextIndex);
+        if (baseEntry === undefined && newEntry === undefined) {
+            break;
+        }
+        const newIndex = newEntry?.[0] ?? Infinity;
+        const baseIndex = baseEntry?.[0] ?? Infinity;
+        let newNodeChange;
+        let baseNodeChange;
         let index;
-        if (aIndex === bIndex) {
-            index = a.index;
-            nodeChangeA = a.nodeChange;
-            nodeChangeB = b.nodeChange;
-            iChange += 1;
-            iOver += 1;
+        if (newIndex === baseIndex) {
+            assert(newEntry !== undefined && baseEntry !== undefined, 0xa0d /* Entries should be defined */);
+            index = newIndex;
+            newNodeChange = newEntry[1];
+            baseNodeChange = baseEntry[1];
         }
-        else if (aIndex < bIndex) {
-            index = a.index;
-            nodeChangeA = a.nodeChange;
-            iChange += 1;
+        else if (newIndex < baseIndex) {
+            assert(newEntry !== undefined, 0xa0e /* Entry should be defined */);
+            index = newIndex;
+            newNodeChange = newEntry[1];
         }
         else {
-            index = b.index;
-            nodeChangeB = b.nodeChange;
-            iOver += 1;
+            assert(baseEntry !== undefined, 0xa0f /* Entry should be defined */);
+            index = baseIndex;
+            baseNodeChange = baseEntry[1];
         }
-        const nodeChange = rebaseChild(nodeChangeA, nodeChangeB);
+        const nodeChange = rebaseChild(newNodeChange, baseNodeChange);
         if (nodeChange !== undefined) {
-            rebased.push({
-                index,
-                nodeChange,
-            });
+            rebased.set(index, nodeChange);
         }
+        nextIndex = index + 1;
     }
     return rebased;
 }
 function pruneGenericChange(changeset, pruneChild) {
-    const pruned = [];
-    for (const change of changeset) {
-        const prunedNode = pruneChild(change.nodeChange);
+    const pruned = new BTree();
+    for (const [index, node] of changeset.entries()) {
+        const prunedNode = pruneChild(node);
         if (prunedNode !== undefined) {
-            pruned.push({ ...change, nodeChange: prunedNode });
+            pruned.set(index, node);
         }
     }
     return pruned;
 }
 function replaceRevisions(changeset, oldRevisions, newRevision) {
-    return changeset.map((change) => ({
-        ...change,
-        nodeChange: replaceAtomRevisions(change.nodeChange, oldRevisions, newRevision),
-    }));
+    return changeset.mapValues((node) => replaceAtomRevisions(node, oldRevisions, newRevision));
 }
 /**
  * {@link FieldKind} used to represent changes to elements of a field in a field-kind-agnostic format.
@@ -149,7 +122,10 @@ export const genericFieldKind = new FieldKindWithEditor("ModularEditBuilder.Gene
  * @returns An equivalent changeset as represented by the `target` field-kind.
  */
 export function convertGenericChange(changeset, target, composeChild, genId, revisionMetadata) {
-    const perIndex = changeset.map(({ index, nodeChange }) => target.editor.buildChildChange(index, nodeChange));
+    const perIndex = [];
+    for (const [index, nodeChange] of changeset.entries()) {
+        perIndex.push(target.editor.buildChildChange(index, nodeChange));
+    }
     if (perIndex.length === 0) {
         return target.createEmpty();
     }
@@ -162,11 +138,8 @@ const invalidCrossFieldManager = {
     onMoveIn: invalidFunc,
     moveKey: invalidFunc,
 };
-export function newGenericChangeset() {
-    return [];
-}
 function* relevantRemovedRoots(change, relevantRemovedRootsFromChild) {
-    for (const { nodeChange } of change) {
+    for (const nodeChange of change.values()) {
         yield* relevantRemovedRootsFromChild(nodeChange);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKind.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKind.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\ttype DeltaDetachedNodeId,\n\ttype DeltaFieldChanges,\n\ttype DeltaMark,\n\ttype RevisionMetadataSource,\n\tMultiplicity,\n\ttype RevisionTag,\n\treplaceAtomRevisions,\n} from \"../../core/index.js\";\nimport { type IdAllocator, fail } from \"../../util/index.js\";\n\nimport type { CrossFieldManager } from \"./crossFieldQueries.js\";\nimport type {\n\tFieldChangeHandler,\n\tNodeChangeComposer,\n\tNodeChangePruner,\n\tNodeChangeRebaser,\n\tRelevantRemovedRootsFromChild,\n\tToDelta,\n} from \"./fieldChangeHandler.js\";\nimport { FieldKindWithEditor } from \"./fieldKindWithEditor.js\";\nimport { makeGenericChangeCodec } from \"./genericFieldKindCodecs.js\";\nimport type { GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport type { NodeId } from \"./modularChangeTypes.js\";\n\n/**\n * {@link FieldChangeHandler} implementation for {@link GenericChangeset}.\n */\nexport const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {\n\trebaser: {\n\t\tcompose: (\n\t\t\tchange1: GenericChangeset,\n\t\t\tchange2: GenericChangeset,\n\t\t\tcomposeChildren: NodeChangeComposer,\n\t\t): GenericChangeset => {\n\t\t\tconst composed: GenericChangeset = [];\n\n\t\t\tlet listIndex1 = 0;\n\t\t\tlet listIndex2 = 0;\n\n\t\t\twhile (listIndex1 < change1.length || listIndex2 < change2.length) {\n\t\t\t\tconst next1 = change1[listIndex1];\n\t\t\t\tconst next2 = change2[listIndex2];\n\t\t\t\tconst nodeIndex1 = next1?.index ?? Infinity;\n\t\t\t\tconst nodeIndex2 = next2?.index ?? Infinity;\n\t\t\t\tif (nodeIndex1 < nodeIndex2) {\n\t\t\t\t\tcomposed.push({\n\t\t\t\t\t\tindex: nodeIndex1,\n\t\t\t\t\t\tnodeChange: composeChildren(next1.nodeChange, undefined),\n\t\t\t\t\t});\n\t\t\t\t\tlistIndex1 += 1;\n\t\t\t\t} else if (nodeIndex2 < nodeIndex1) {\n\t\t\t\t\tcomposed.push({\n\t\t\t\t\t\tindex: nodeIndex2,\n\t\t\t\t\t\tnodeChange: composeChildren(undefined, next2.nodeChange),\n\t\t\t\t\t});\n\t\t\t\t\tlistIndex2 += 1;\n\t\t\t\t} else {\n\t\t\t\t\t// Both nodes are at the same position.\n\t\t\t\t\tcomposed.push({\n\t\t\t\t\t\tindex: nodeIndex1,\n\t\t\t\t\t\tnodeChange: composeChildren(next1.nodeChange, next2.nodeChange),\n\t\t\t\t\t});\n\t\t\t\t\tlistIndex1 += 1;\n\t\t\t\t\tlistIndex2 += 1;\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn composed;\n\t\t},\n\t\tinvert: (change: GenericChangeset): GenericChangeset => {\n\t\t\treturn change;\n\t\t},\n\t\trebase: rebaseGenericChange,\n\t\tprune: pruneGenericChange,\n\t\treplaceRevisions,\n\t},\n\tcodecsFactory: makeGenericChangeCodec,\n\teditor: {\n\t\tbuildChildChange(index, change): GenericChangeset {\n\t\t\treturn [{ index, nodeChange: change }];\n\t\t},\n\t},\n\tintoDelta: (change: GenericChangeset, deltaFromChild: ToDelta): DeltaFieldChanges => {\n\t\tlet nodeIndex = 0;\n\t\tconst markList: DeltaMark[] = [];\n\t\tfor (const { index, nodeChange } of change) {\n\t\t\tif (nodeIndex < index) {\n\t\t\t\tconst offset = index - nodeIndex;\n\t\t\t\tmarkList.push({ count: offset });\n\t\t\t\tnodeIndex = index;\n\t\t\t}\n\t\t\tmarkList.push({ count: 1, fields: deltaFromChild(nodeChange) });\n\t\t\tnodeIndex += 1;\n\t\t}\n\t\treturn { local: markList };\n\t},\n\trelevantRemovedRoots,\n\tisEmpty: (change: GenericChangeset): boolean => change.length === 0,\n\tgetNestedChanges,\n\tcreateEmpty: (): GenericChangeset => [],\n\tgetCrossFieldKeys: (_change) => [],\n};\n\nfunction getNestedChanges(change: GenericChangeset): [NodeId, number | undefined][] {\n\treturn change.map(({ index, nodeChange }) => [nodeChange, index]);\n}\n\nfunction rebaseGenericChange(\n\tchange: GenericChangeset,\n\tover: GenericChangeset,\n\trebaseChild: NodeChangeRebaser,\n): GenericChangeset {\n\tconst rebased: GenericChangeset = [];\n\tlet iChange = 0;\n\tlet iOver = 0;\n\twhile (iChange < change.length || iOver < over.length) {\n\t\tconst a = change[iChange];\n\t\tconst b = over[iOver];\n\t\tconst aIndex = a?.index ?? Infinity;\n\t\tconst bIndex = b?.index ?? Infinity;\n\t\tlet nodeChangeA: NodeId | undefined;\n\t\tlet nodeChangeB: NodeId | undefined;\n\t\tlet index: number;\n\t\tif (aIndex === bIndex) {\n\t\t\tindex = a.index;\n\t\t\tnodeChangeA = a.nodeChange;\n\t\t\tnodeChangeB = b.nodeChange;\n\t\t\tiChange += 1;\n\t\t\tiOver += 1;\n\t\t} else if (aIndex < bIndex) {\n\t\t\tindex = a.index;\n\t\t\tnodeChangeA = a.nodeChange;\n\t\t\tiChange += 1;\n\t\t} else {\n\t\t\tindex = b.index;\n\t\t\tnodeChangeB = b.nodeChange;\n\t\t\tiOver += 1;\n\t\t}\n\n\t\tconst nodeChange = rebaseChild(nodeChangeA, nodeChangeB);\n\t\tif (nodeChange !== undefined) {\n\t\t\trebased.push({\n\t\t\t\tindex,\n\t\t\t\tnodeChange,\n\t\t\t});\n\t\t}\n\t}\n\n\treturn rebased;\n}\n\nfunction pruneGenericChange(\n\tchangeset: GenericChangeset,\n\tpruneChild: NodeChangePruner,\n): GenericChangeset {\n\tconst pruned: GenericChangeset = [];\n\tfor (const change of changeset) {\n\t\tconst prunedNode = pruneChild(change.nodeChange);\n\t\tif (prunedNode !== undefined) {\n\t\t\tpruned.push({ ...change, nodeChange: prunedNode });\n\t\t}\n\t}\n\treturn pruned;\n}\n\nfunction replaceRevisions(\n\tchangeset: GenericChangeset,\n\toldRevisions: Set<RevisionTag | undefined>,\n\tnewRevision: RevisionTag | undefined,\n): GenericChangeset {\n\treturn changeset.map((change) => ({\n\t\t...change,\n\t\tnodeChange: replaceAtomRevisions(change.nodeChange, oldRevisions, newRevision),\n\t}));\n}\n\n/**\n * {@link FieldKind} used to represent changes to elements of a field in a field-kind-agnostic format.\n */\nexport const genericFieldKind: FieldKindWithEditor = new FieldKindWithEditor(\n\t\"ModularEditBuilder.Generic\",\n\tMultiplicity.Sequence,\n\tgenericChangeHandler,\n\t(types, other) => false,\n\tnew Set(),\n);\n\n/**\n * Converts a {@link GenericChangeset} into a field-kind-specific `TChange`.\n * @param changeset - The generic changeset to convert.\n * @param target - The {@link FieldChangeHandler} for the `FieldKind` that the returned change should target.\n * @param composeChild - A delegate to compose {@link NodeChangeset}s.\n * @returns An equivalent changeset as represented by the `target` field-kind.\n */\nexport function convertGenericChange<TChange>(\n\tchangeset: GenericChangeset,\n\ttarget: FieldChangeHandler<TChange>,\n\tcomposeChild: NodeChangeComposer,\n\tgenId: IdAllocator,\n\trevisionMetadata: RevisionMetadataSource,\n): TChange {\n\tconst perIndex: TChange[] = changeset.map(({ index, nodeChange }) =>\n\t\ttarget.editor.buildChildChange(index, nodeChange),\n\t);\n\n\tif (perIndex.length === 0) {\n\t\treturn target.createEmpty();\n\t}\n\n\treturn perIndex.reduce((a, b) =>\n\t\ttarget.rebaser.compose(\n\t\t\ta,\n\t\t\tb,\n\t\t\tcomposeChild,\n\t\t\tgenId,\n\t\t\tinvalidCrossFieldManager,\n\t\t\trevisionMetadata,\n\t\t),\n\t);\n}\n\nconst invalidFunc = (): never => fail(\"Should not be called when converting generic changes\");\nconst invalidCrossFieldManager: CrossFieldManager = {\n\tset: invalidFunc,\n\tget: invalidFunc,\n\tonMoveIn: invalidFunc,\n\tmoveKey: invalidFunc,\n};\n\nexport function newGenericChangeset(): GenericChangeset {\n\treturn [];\n}\n\nfunction* relevantRemovedRoots(\n\tchange: GenericChangeset,\n\trelevantRemovedRootsFromChild: RelevantRemovedRootsFromChild,\n): Iterable<DeltaDetachedNodeId> {\n\tfor (const { nodeChange } of change) {\n\t\tyield* relevantRemovedRootsFromChild(nodeChange);\n\t}\n}\n"]}
+{"version":3,"file":"genericFieldKind.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKind.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\ttype DeltaDetachedNodeId,\n\ttype DeltaFieldChanges,\n\ttype DeltaMark,\n\ttype RevisionMetadataSource,\n\tMultiplicity,\n\ttype RevisionTag,\n\treplaceAtomRevisions,\n} from \"../../core/index.js\";\nimport { type IdAllocator, fail } from \"../../util/index.js\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type { CrossFieldManager } from \"./crossFieldQueries.js\";\nimport type {\n\tFieldChangeHandler,\n\tNodeChangeComposer,\n\tNodeChangePruner,\n\tNodeChangeRebaser,\n\tRelevantRemovedRootsFromChild,\n\tToDelta,\n} from \"./fieldChangeHandler.js\";\nimport { FieldKindWithEditor } from \"./fieldKindWithEditor.js\";\nimport { makeGenericChangeCodec } from \"./genericFieldKindCodecs.js\";\nimport { newGenericChangeset, type GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport type { NodeId } from \"./modularChangeTypes.js\";\nimport { BTree } from \"@tylerbu/sorted-btree-es6\";\n\n/**\n * {@link FieldChangeHandler} implementation for {@link GenericChangeset}.\n */\nexport const genericChangeHandler: FieldChangeHandler<GenericChangeset> = {\n\trebaser: {\n\t\tcompose,\n\t\tinvert: (change: GenericChangeset): GenericChangeset => change,\n\t\trebase: rebaseGenericChange,\n\t\tprune: pruneGenericChange,\n\t\treplaceRevisions,\n\t},\n\tcodecsFactory: makeGenericChangeCodec,\n\teditor: {\n\t\tbuildChildChange(index, change): GenericChangeset {\n\t\t\treturn newGenericChangeset([[index, change]]);\n\t\t},\n\t},\n\tintoDelta: (change: GenericChangeset, deltaFromChild: ToDelta): DeltaFieldChanges => {\n\t\tlet nodeIndex = 0;\n\t\tconst markList: DeltaMark[] = [];\n\t\tfor (const [index, nodeChange] of change.entries()) {\n\t\t\tif (nodeIndex < index) {\n\t\t\t\tconst offset = index - nodeIndex;\n\t\t\t\tmarkList.push({ count: offset });\n\t\t\t\tnodeIndex = index;\n\t\t\t}\n\t\t\tmarkList.push({ count: 1, fields: deltaFromChild(nodeChange) });\n\t\t\tnodeIndex += 1;\n\t\t}\n\t\treturn { local: markList };\n\t},\n\trelevantRemovedRoots,\n\tisEmpty: (change: GenericChangeset): boolean => change.length === 0,\n\tgetNestedChanges,\n\tcreateEmpty: newGenericChangeset,\n\tgetCrossFieldKeys: (_change) => [],\n};\n\nfunction compose(\n\tchange1: GenericChangeset,\n\tchange2: GenericChangeset,\n\tcomposeChildren: NodeChangeComposer,\n): GenericChangeset {\n\tconst composed = change1.clone();\n\tfor (const [index, id2] of change2.entries()) {\n\t\tconst id1 = composed.get(index);\n\t\tconst idComposed = id1 !== undefined ? composeChildren(id1, id2) : id2;\n\t\tcomposed.set(index, idComposed);\n\t}\n\n\treturn composed;\n}\n\nfunction getNestedChanges(change: GenericChangeset): [NodeId, number | undefined][] {\n\treturn change.toArray().map(([index, nodeChange]) => [nodeChange, index]);\n}\n\nfunction rebaseGenericChange(\n\tchange: GenericChangeset,\n\tover: GenericChangeset,\n\trebaseChild: NodeChangeRebaser,\n): GenericChangeset {\n\tconst rebased: GenericChangeset = new BTree();\n\tlet nextIndex = 0;\n\n\t// eslint-disable-next-line no-constant-condition\n\twhile (true) {\n\t\tconst newEntry = change.getPairOrNextHigher(nextIndex);\n\t\tconst baseEntry = over.getPairOrNextHigher(nextIndex);\n\n\t\tif (baseEntry === undefined && newEntry === undefined) {\n\t\t\tbreak;\n\t\t}\n\n\t\tconst newIndex = newEntry?.[0] ?? Infinity;\n\t\tconst baseIndex = baseEntry?.[0] ?? Infinity;\n\t\tlet newNodeChange: NodeId | undefined;\n\t\tlet baseNodeChange: NodeId | undefined;\n\t\tlet index: number;\n\t\tif (newIndex === baseIndex) {\n\t\t\tassert(\n\t\t\t\tnewEntry !== undefined && baseEntry !== undefined,\n\t\t\t\t0xa0d /* Entries should be defined */,\n\t\t\t);\n\t\t\tindex = newIndex;\n\t\t\tnewNodeChange = newEntry[1];\n\t\t\tbaseNodeChange = baseEntry[1];\n\t\t} else if (newIndex < baseIndex) {\n\t\t\tassert(newEntry !== undefined, 0xa0e /* Entry should be defined */);\n\t\t\tindex = newIndex;\n\t\t\tnewNodeChange = newEntry[1];\n\t\t} else {\n\t\t\tassert(baseEntry !== undefined, 0xa0f /* Entry should be defined */);\n\t\t\tindex = baseIndex;\n\t\t\tbaseNodeChange = baseEntry[1];\n\t\t}\n\n\t\tconst nodeChange = rebaseChild(newNodeChange, baseNodeChange);\n\t\tif (nodeChange !== undefined) {\n\t\t\trebased.set(index, nodeChange);\n\t\t}\n\n\t\tnextIndex = index + 1;\n\t}\n\n\treturn rebased;\n}\n\nfunction pruneGenericChange(\n\tchangeset: GenericChangeset,\n\tpruneChild: NodeChangePruner,\n): GenericChangeset {\n\tconst pruned: GenericChangeset = new BTree();\n\tfor (const [index, node] of changeset.entries()) {\n\t\tconst prunedNode = pruneChild(node);\n\t\tif (prunedNode !== undefined) {\n\t\t\tpruned.set(index, node);\n\t\t}\n\t}\n\treturn pruned;\n}\n\nfunction replaceRevisions(\n\tchangeset: GenericChangeset,\n\toldRevisions: Set<RevisionTag | undefined>,\n\tnewRevision: RevisionTag | undefined,\n): GenericChangeset {\n\treturn changeset.mapValues((node) => replaceAtomRevisions(node, oldRevisions, newRevision));\n}\n\n/**\n * {@link FieldKind} used to represent changes to elements of a field in a field-kind-agnostic format.\n */\nexport const genericFieldKind: FieldKindWithEditor = new FieldKindWithEditor(\n\t\"ModularEditBuilder.Generic\",\n\tMultiplicity.Sequence,\n\tgenericChangeHandler,\n\t(types, other) => false,\n\tnew Set(),\n);\n\n/**\n * Converts a {@link GenericChangeset} into a field-kind-specific `TChange`.\n * @param changeset - The generic changeset to convert.\n * @param target - The {@link FieldChangeHandler} for the `FieldKind` that the returned change should target.\n * @param composeChild - A delegate to compose {@link NodeChangeset}s.\n * @returns An equivalent changeset as represented by the `target` field-kind.\n */\nexport function convertGenericChange<TChange>(\n\tchangeset: GenericChangeset,\n\ttarget: FieldChangeHandler<TChange>,\n\tcomposeChild: NodeChangeComposer,\n\tgenId: IdAllocator,\n\trevisionMetadata: RevisionMetadataSource,\n): TChange {\n\tconst perIndex: TChange[] = [];\n\tfor (const [index, nodeChange] of changeset.entries()) {\n\t\tperIndex.push(target.editor.buildChildChange(index, nodeChange));\n\t}\n\n\tif (perIndex.length === 0) {\n\t\treturn target.createEmpty();\n\t}\n\n\treturn perIndex.reduce((a, b) =>\n\t\ttarget.rebaser.compose(\n\t\t\ta,\n\t\t\tb,\n\t\t\tcomposeChild,\n\t\t\tgenId,\n\t\t\tinvalidCrossFieldManager,\n\t\t\trevisionMetadata,\n\t\t),\n\t);\n}\n\nconst invalidFunc = (): never => fail(\"Should not be called when converting generic changes\");\nconst invalidCrossFieldManager: CrossFieldManager = {\n\tset: invalidFunc,\n\tget: invalidFunc,\n\tonMoveIn: invalidFunc,\n\tmoveKey: invalidFunc,\n};\n\nfunction* relevantRemovedRoots(\n\tchange: GenericChangeset,\n\trelevantRemovedRootsFromChild: RelevantRemovedRootsFromChild,\n): Iterable<DeltaDetachedNodeId> {\n\tfor (const nodeChange of change.values()) {\n\t\tyield* relevantRemovedRootsFromChild(nodeChange);\n\t}\n}\n"]}

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

@@ -4,6 +4,6 @@
  */
 import { type ICodecFamily } from "../../codec/index.js";
 import type { FieldChangeEncodingContext } from "./fieldChangeHandler.js";
-import type { GenericChangeset } from "./genericFieldKindTypes.js";
+import { type GenericChangeset } from "./genericFieldKindTypes.js";
 export declare function makeGenericChangeCodec(): ICodecFamily<GenericChangeset, FieldChangeEncodingContext>;
 //# sourceMappingURL=genericFieldKindCodecs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKindCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAoC,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAK1E,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGlF,wBAAgB,sBAAsB,IAAI,YAAY,CACrD,gBAAgB,EAChB,0BAA0B,CAC1B,CAEA"}
+{"version":3,"file":"genericFieldKindCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAoC,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGxF,wBAAgB,sBAAsB,IAAI,YAAY,CACrD,gBAAgB,EAChB,0BAA0B,CAC1B,CAEA"}

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

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 import { makeCodecFamily } from "../../codec/index.js";
-import { EncodedGenericChangeset, } from "./genericFieldKindFormat.js";
+import { EncodedGenericChangeset } from "./genericFieldKindFormat.js";
+import { newGenericChangeset } from "./genericFieldKindTypes.js";
 import { EncodedNodeChangeset } from "./modularChangeFormat.js";
 export function makeGenericChangeCodec() {
     return makeCodecFamily([[1, makeV1Codec()]]);
@@ -11,17 +12,13 @@ export function makeGenericChangeCodec() {
 function makeV1Codec() {
     return {
         encode: (change, context) => {
-            const encoded = change.map(({ index, nodeChange }) => [
-                index,
-                context.encodeNode(nodeChange),
-            ]);
+            const encoded = change
+                .toArray()
+                .map(([index, nodeChange]) => [index, context.encodeNode(nodeChange)]);
             return encoded;
         },
         decode: (encoded, context) => {
-            return encoded.map(([index, nodeChange]) => ({
-                index,
-                nodeChange: context.decodeNode(nodeChange),
-            }));
+            return newGenericChangeset(encoded.map(([index, nodeChange]) => [index, context.decodeNode(nodeChange)]));
         },
         encodedSchema: EncodedGenericChangeset(EncodedNodeChangeset),
     };

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKindCodecs.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAsC,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3F,OAAO,EAEN,uBAAuB,GACvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,MAAM,UAAU,sBAAsB;IAIrC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,WAAW;IAMnB,OAAO;QACN,MAAM,EAAE,CACP,MAAwB,EACxB,OAAmC,EACT,EAAE;YAC5B,MAAM,OAAO,GAA4B,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;gBAC9E,KAAK;gBACL,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;aAC9B,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QAChB,CAAC;QACD,MAAM,EAAE,CACP,OAAgC,EAChC,OAAmC,EAChB,EAAE;YACrB,OAAO,OAAO,CAAC,GAAG,CACjB,CAAC,CAAC,KAAK,EAAE,UAAU,CAAuB,EAAiB,EAAE,CAAC,CAAC;gBAC9D,KAAK;gBACL,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;aAC1C,CAAC,CACF,CAAC;QACH,CAAC;QACD,aAAa,EAAE,uBAAuB,CAAC,oBAAoB,CAAC;KAC5D,CAAC;AACH,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ICodecFamily, type IJsonCodec, makeCodecFamily } from \"../../codec/index.js\";\nimport type { FieldChangeEncodingContext } from \"./fieldChangeHandler.js\";\nimport {\n\ttype EncodedGenericChange,\n\tEncodedGenericChangeset,\n} from \"./genericFieldKindFormat.js\";\nimport type { GenericChange, GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport { EncodedNodeChangeset } from \"./modularChangeFormat.js\";\n\nexport function makeGenericChangeCodec(): ICodecFamily<\n\tGenericChangeset,\n\tFieldChangeEncodingContext\n> {\n\treturn makeCodecFamily([[1, makeV1Codec()]]);\n}\n\nfunction makeV1Codec(): IJsonCodec<\n\tGenericChangeset,\n\tEncodedGenericChangeset,\n\tEncodedGenericChangeset,\n\tFieldChangeEncodingContext\n> {\n\treturn {\n\t\tencode: (\n\t\t\tchange: GenericChangeset,\n\t\t\tcontext: FieldChangeEncodingContext,\n\t\t): EncodedGenericChangeset => {\n\t\t\tconst encoded: EncodedGenericChangeset = change.map(({ index, nodeChange }) => [\n\t\t\t\tindex,\n\t\t\t\tcontext.encodeNode(nodeChange),\n\t\t\t]);\n\t\t\treturn encoded;\n\t\t},\n\t\tdecode: (\n\t\t\tencoded: EncodedGenericChangeset,\n\t\t\tcontext: FieldChangeEncodingContext,\n\t\t): GenericChangeset => {\n\t\t\treturn encoded.map(\n\t\t\t\t([index, nodeChange]: EncodedGenericChange): GenericChange => ({\n\t\t\t\t\tindex,\n\t\t\t\t\tnodeChange: context.decodeNode(nodeChange),\n\t\t\t\t}),\n\t\t\t);\n\t\t},\n\t\tencodedSchema: EncodedGenericChangeset(EncodedNodeChangeset),\n\t};\n}\n"]}
+{"version":3,"file":"genericFieldKindCodecs.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAsC,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAyB,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,MAAM,UAAU,sBAAsB;IAIrC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,WAAW;IAMnB,OAAO;QACN,MAAM,EAAE,CACP,MAAwB,EACxB,OAAmC,EACT,EAAE;YAC5B,MAAM,OAAO,GAA4B,MAAM;iBAC7C,OAAO,EAAE;iBACT,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACxE,OAAO,OAAO,CAAC;QAChB,CAAC;QACD,MAAM,EAAE,CACP,OAAgC,EAChC,OAAmC,EAChB,EAAE;YACrB,OAAO,mBAAmB,CACzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAC7E,CAAC;QACH,CAAC;QACD,aAAa,EAAE,uBAAuB,CAAC,oBAAoB,CAAC;KAC5D,CAAC;AACH,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ICodecFamily, type IJsonCodec, makeCodecFamily } from \"../../codec/index.js\";\nimport type { FieldChangeEncodingContext } from \"./fieldChangeHandler.js\";\nimport { EncodedGenericChangeset } from \"./genericFieldKindFormat.js\";\nimport { newGenericChangeset, type GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport { EncodedNodeChangeset } from \"./modularChangeFormat.js\";\n\nexport function makeGenericChangeCodec(): ICodecFamily<\n\tGenericChangeset,\n\tFieldChangeEncodingContext\n> {\n\treturn makeCodecFamily([[1, makeV1Codec()]]);\n}\n\nfunction makeV1Codec(): IJsonCodec<\n\tGenericChangeset,\n\tEncodedGenericChangeset,\n\tEncodedGenericChangeset,\n\tFieldChangeEncodingContext\n> {\n\treturn {\n\t\tencode: (\n\t\t\tchange: GenericChangeset,\n\t\t\tcontext: FieldChangeEncodingContext,\n\t\t): EncodedGenericChangeset => {\n\t\t\tconst encoded: EncodedGenericChangeset = change\n\t\t\t\t.toArray()\n\t\t\t\t.map(([index, nodeChange]) => [index, context.encodeNode(nodeChange)]);\n\t\t\treturn encoded;\n\t\t},\n\t\tdecode: (\n\t\t\tencoded: EncodedGenericChangeset,\n\t\t\tcontext: FieldChangeEncodingContext,\n\t\t): GenericChangeset => {\n\t\t\treturn newGenericChangeset(\n\t\t\t\tencoded.map(([index, nodeChange]) => [index, context.decodeNode(nodeChange)]),\n\t\t\t);\n\t\t},\n\t\tencodedSchema: EncodedGenericChangeset(EncodedNodeChangeset),\n\t};\n}\n"]}

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

@@ -2,22 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { BTree } from "@tylerbu/sorted-btree-es6";
 import type { NodeId } from "./modularChangeTypes.js";
-/**
- * A field-kind-agnostic change to a single node within a field.
- */
-export interface GenericChange {
-    /**
-     * Index within the field of the changed node.
-     */
-    index: number;
-    /**
-     * Change to the node.
-     */
-    nodeChange: NodeId;
-}
 /**
  * A field-agnostic set of changes to the elements of a field.
  */
-export type GenericChangeset = GenericChange[];
+export type GenericChangeset = BTree<number, NodeId>;
+export declare function newGenericChangeset(nodes?: [number, NodeId][]): GenericChangeset;
 //# sourceMappingURL=genericFieldKindTypes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKindTypes.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC"}
+{"version":3,"file":"genericFieldKindTypes.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAErD,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAO,GAAG,gBAAgB,CAEpF"}

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

@@ -2,5 +2,8 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export {};
+import { BTree } from "@tylerbu/sorted-btree-es6";
+export function newGenericChangeset(nodes = []) {
+    return new BTree(nodes);
+}
 //# sourceMappingURL=genericFieldKindTypes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"genericFieldKindTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { NodeId } from \"./modularChangeTypes.js\";\n\n/**\n * A field-kind-agnostic change to a single node within a field.\n */\nexport interface GenericChange {\n\t/**\n\t * Index within the field of the changed node.\n\t */\n\tindex: number;\n\t/**\n\t * Change to the node.\n\t */\n\tnodeChange: NodeId;\n}\n\n/**\n * A field-agnostic set of changes to the elements of a field.\n */\nexport type GenericChangeset = GenericChange[];\n"]}
+{"version":3,"file":"genericFieldKindTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/genericFieldKindTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAQlD,MAAM,UAAU,mBAAmB,CAAC,QAA4B,EAAE;IACjE,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { BTree } from \"@tylerbu/sorted-btree-es6\";\nimport type { NodeId } from \"./modularChangeTypes.js\";\n\n/**\n * A field-agnostic set of changes to the elements of a field.\n */\nexport type GenericChangeset = BTree<number, NodeId>;\n\nexport function newGenericChangeset(nodes: [number, NodeId][] = []): GenericChangeset {\n\treturn new BTree(nodes);\n}\n"]}

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

@@ -11,9 +11,9 @@ export { FieldKindWithEditor } from "./fieldKindWithEditor.js";
 export { type FieldChangeHandler, type FieldChangeRebaser, type FieldEditor, type NodeChangeComposer, type NodeChangeInverter, type NodeChangeRebaser, type NodeChangePruner, referenceFreeFieldChangeRebaser, type RebaseRevisionMetadata, type RelevantRemovedRootsFromChild, type ToDelta, NodeAttachState, type FieldChangeEncodingContext, } from "./fieldChangeHandler.js";
 export type { CrossFieldKeyRange, FieldChange, FieldChangeMap, FieldChangeset, HasFieldChanges, ModularChangeset, NodeExistsConstraint, NodeId, } from "./modularChangeTypes.js";
 export { convertGenericChange, genericChangeHandler, genericFieldKind, } from "./genericFieldKind.js";
-export type { GenericChange, GenericChangeset } from "./genericFieldKindTypes.js";
+export type { GenericChangeset } from "./genericFieldKindTypes.js";
 export { ModularChangeFamily, ModularEditBuilder, type EditDescription, type GlobalEditDescription, type FieldEditDescription, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, updateRefreshers, } from "./modularChangeFamily.js";
 export { makeModularChangeCodecFamily } from "./modularChangeCodecs.js";
 export type { FieldKindConfiguration, FieldKindConfigurationEntry, } from "./fieldKindConfiguration.js";
-export { getAllowedContentIncompatibilities } from "./discrepancies.js";
+export { getAllowedContentIncompatibilities, isRepoSuperset } from "./discrepancies.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,kBAAkB,EAClB,kCAAkC,EAClC,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,kBAAkB,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACN,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,+BAA+B,EAC/B,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,OAAO,EACZ,eAAe,EACf,KAAK,0BAA0B,GAC/B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACX,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,MAAM,GACN,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,8BAA8B,EAC9B,SAAS,EACT,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,YAAY,EACX,sBAAsB,EACtB,2BAA2B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kCAAkC,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,kBAAkB,EAClB,kCAAkC,EAClC,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,kBAAkB,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACN,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,+BAA+B,EAC/B,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,OAAO,EACZ,eAAe,EACf,KAAK,0BAA0B,GAC/B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACX,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,MAAM,GACN,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,8BAA8B,EAC9B,SAAS,EACT,oBAAoB,EACpB,gBAAgB,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,YAAY,EACX,sBAAsB,EACtB,2BAA2B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC"}

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

@@ -12,5 +12,5 @@ export { referenceFreeFieldChangeRebaser, NodeAttachState, } from "./fieldChange
 export { convertGenericChange, genericChangeHandler, genericFieldKind, } from "./genericFieldKind.js";
 export { ModularChangeFamily, ModularEditBuilder, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, updateRefreshers, } from "./modularChangeFamily.js";
 export { makeModularChangeCodecFamily } from "./modularChangeCodecs.js";
-export { getAllowedContentIncompatibilities } from "./discrepancies.js";
+export { getAllowedContentIncompatibilities, isRepoSuperset } from "./discrepancies.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,GAClB,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,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAQN,+BAA+B,EAI/B,eAAe,GAEf,MAAM,yBAAyB,CAAC;AAWjC,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,kCAAkC,EAAE,MAAM,oBAAoB,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} 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\tEncodedModularChangeset,\n\tEncodedNodeChangeset,\n} from \"./modularChangeFormat.js\";\nexport { FlexFieldKind, type FullSchemaPolicy } from \"./fieldKind.js\";\nexport { FieldKindWithEditor } from \"./fieldKindWithEditor.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 RelevantRemovedRootsFromChild,\n\ttype ToDelta,\n\tNodeAttachState,\n\ttype FieldChangeEncodingContext,\n} from \"./fieldChangeHandler.js\";\nexport type {\n\tCrossFieldKeyRange,\n\tFieldChange,\n\tFieldChangeMap,\n\tFieldChangeset,\n\tHasFieldChanges,\n\tModularChangeset,\n\tNodeExistsConstraint,\n\tNodeId,\n} from \"./modularChangeTypes.js\";\nexport {\n\tconvertGenericChange,\n\tgenericChangeHandler,\n\tgenericFieldKind,\n} from \"./genericFieldKind.js\";\nexport type { GenericChange, 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 { getAllowedContentIncompatibilities } from \"./discrepancies.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,GAClB,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,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAQN,+BAA+B,EAI/B,eAAe,GAEf,MAAM,yBAAyB,CAAC;AAWjC,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,kCAAkC,EAAE,cAAc,EAAE,MAAM,oBAAoB,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} 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\tEncodedModularChangeset,\n\tEncodedNodeChangeset,\n} from \"./modularChangeFormat.js\";\nexport { FlexFieldKind, type FullSchemaPolicy } from \"./fieldKind.js\";\nexport { FieldKindWithEditor } from \"./fieldKindWithEditor.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 RelevantRemovedRootsFromChild,\n\ttype ToDelta,\n\tNodeAttachState,\n\ttype FieldChangeEncodingContext,\n} from \"./fieldChangeHandler.js\";\nexport type {\n\tCrossFieldKeyRange,\n\tFieldChange,\n\tFieldChangeMap,\n\tFieldChangeset,\n\tHasFieldChanges,\n\tModularChangeset,\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 { getAllowedContentIncompatibilities, isRepoSuperset } from \"./discrepancies.js\";\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"modularChangeCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,UAAU,EAKf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAEX,qBAAqB,EAErB,kBAAkB,EAKlB,WAAW,EACX,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EACN,KAAK,eAAe,EAIpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EACX,sBAAsB,EAEtB,MAAM,6BAA6B,CAAC;AAWrC,OAAO,KAAK,EAIX,gBAAgB,EAGhB,MAAM,yBAAyB,CAAC;AAIjC,wBAAgB,4BAA4B,CAC3C,uBAAuB,EAAE,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,EACpE,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,WAAW,EAAE,eAAe,EAC5B,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,aAAa,EAC3C,wBAAwB,GAAE,uBAA4D,GACpF,YAAY,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAavD"}
+{"version":3,"file":"modularChangeCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,UAAU,EAKf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACX,qBAAqB,EAErB,kBAAkB,EAKlB,WAAW,EACX,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EACN,KAAK,eAAe,EAIpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EACX,sBAAsB,EAEtB,MAAM,6BAA6B,CAAC;AAWrC,OAAO,KAAK,EAKX,gBAAgB,EAGhB,MAAM,yBAAyB,CAAC;AAIjC,wBAAgB,4BAA4B,CAC3C,uBAAuB,EAAE,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,EACpE,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,WAAW,EAAE,eAAe,EAC5B,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,aAAa,EAC3C,wBAAwB,GAAE,uBAA4D,GACpF,YAAY,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAavD"}

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

@@ -2,14 +2,14 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert } from "@fluidframework/core-utils/internal";
+import { assert, oob } from "@fluidframework/core-utils/internal";
 import { makeCodecFamily, withSchemaValidation, } from "../../codec/index.js";
-import { brand, fail, idAllocatorFromMaxId, setInNestedMap, tryGetFromNestedMap, } from "../../util/index.js";
+import { brand, fail, idAllocatorFromMaxId, } from "../../util/index.js";
 import { chunkFieldSingle, defaultChunkPolicy, } from "../chunked-forest/index.js";
 import { TreeCompressionStrategy } from "../treeCompressionUtils.js";
 import { genericFieldKind } from "./genericFieldKind.js";
 import { EncodedModularChangeset, } from "./modularChangeFormat.js";
-import { newCrossFieldKeyTable } from "./modularChangeFamily.js";
+import { newCrossFieldKeyTable, newTupleBTree } from "./modularChangeFamily.js";
 export function makeModularChangeCodecFamily(fieldKindConfigurations, revisionTagCodec, fieldsCodec, { jsonValidator: validator }, chunkCompressionStrategy = TreeCompressionStrategy.Compressed) {
     return makeCodecFamily(Array.from(fieldKindConfigurations.entries(), ([version, fieldKinds]) => [
         version,
@@ -49,7 +49,7 @@ function makeModularChangeCodec(fieldKinds, revisionTagCodec, fieldsCodec, { jso
         const fieldContext = {
             baseContext: context,
             encodeNode: (nodeId) => {
-                const node = tryGetFromNestedMap(nodeChanges, nodeId.revision, nodeId.localId);
+                const node = nodeChanges.get([nodeId.revision, nodeId.localId]);
                 assert(node !== undefined, 0x92e /* Unknown node ID */);
                 return encodeNodeChangesForJson(node, fieldContext);
             },
@@ -106,8 +106,8 @@ function makeModularChangeCodec(fieldKinds, revisionTagCodec, fieldsCodec, { jso
                         localId: brand(idAllocator.allocate()),
                     };
                     const node = decodeNodeChangesetFromJson(encodedNode, nodeId, decoded, context, idAllocator);
-                    setInNestedMap(decoded.nodeChanges, nodeId.revision, nodeId.localId, node);
-                    setInNestedMap(decoded.nodeToParent, nodeId.revision, nodeId.localId, fieldId);
+                    decoded.nodeChanges.set([nodeId.revision, nodeId.localId], node);
+                    decoded.nodeToParent.set([nodeId.revision, nodeId.localId], fieldId);
                     return nodeId;
                 },
             };
@@ -140,19 +140,23 @@ function makeModularChangeCodec(fieldKinds, revisionTagCodec, fieldsCodec, { jso
             return undefined;
         }
         const treesToEncode = [];
-        const buildsArray = Array.from(detachedNodes.entries()).map(([r, commitBuilds]) => {
-            const commitBuildsEncoded = Array.from(commitBuilds.entries()).map(([i, t]) => {
-                treesToEncode.push(t.cursor());
-                const treeIndexInBatch = treesToEncode.length - 1;
-                return [i, treeIndexInBatch];
-            });
-            // `undefined` does not round-trip through JSON strings, so it needs special handling.
-            // Most entries will have an undefined revision due to the revision information being inherited from the `ModularChangeset`.
-            // We therefore optimize for the common case by omitting the revision when it is undefined.
-            return r === undefined || r === context.revision
-                ? [commitBuildsEncoded]
-                : [commitBuildsEncoded, revisionTagCodec.encode(r, context)];
-        });
+        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
             : {
@@ -176,19 +180,26 @@ function makeModularChangeCodec(fieldKinds, revisionTagCodec, fieldsCodec, { jso
         });
         const getChunk = (index) => {
             assert(index < chunks.length, 0x898 /* out of bounds index for build chunk */);
-            return chunkFieldSingle(chunks[index], defaultChunkPolicy);
+            return chunkFieldSingle(chunks[index] ?? oob(), defaultChunkPolicy);
         };
-        const map = new Map();
+        const map = newTupleBTree();
         encoded.builds.forEach((build) => {
             // EncodedRevisionTag cannot be an array so this ensures that we can isolate the tuple
             const revision = build[1] === undefined ? context.revision : revisionTagCodec.decode(build[1], context);
-            map.set(revision, new Map(build[0].map(([i, n]) => [i, getChunk(n)])));
+            const decodedChunks = build[0].map(([i, n]) => [
+                i,
+                getChunk(n),
+            ]);
+            for (const [id, chunk] of decodedChunks) {
+                map.set([revision, id], chunk);
+            }
         });
         return map;
     }
     function encodeRevisionInfos(revisions, context) {
         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;
@@ -239,9 +250,9 @@ function makeModularChangeCodec(fieldKinds, revisionTagCodec, fieldsCodec, { jso
         decode: (encodedChange, context) => {
             const decoded = {
                 fieldChanges: new Map(),
-                nodeChanges: new Map(),
-                nodeToParent: new Map(),
-                nodeAliases: new Map(),
+                nodeChanges: newTupleBTree(),
+                nodeToParent: newTupleBTree(),
+                nodeAliases: newTupleBTree(),
                 crossFieldKeys: newCrossFieldKeyTable(),
             };
             decoded.fieldChanges = decodeFieldChangesFromJson(encodedChange.changes, undefined, decoded, context, idAllocatorFromMaxId(encodedChange.maxId));
@@ -271,7 +282,13 @@ function getChangeHandler(fieldKinds, fieldKind) {
         return genericFieldKind.changeHandler;
     }
     const handler = fieldKinds.get(fieldKind)?.kind.changeHandler;
-    assert(handler !== undefined, "Unknown field kind");
+    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=modularChangeCodecs.js.map