@fluidframework/tree 2.73.0 → 2.74.0-368706

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

@@ -39,9 +39,8 @@ export const genericChangeHandler = {
             markList.push({ count: 1, fields: deltaFromChild(nodeChange) });
             nodeIndex += 1;
         }
-        return { local: markList };
+        return markList;
     },
-    relevantRemovedRoots,
     isEmpty: (change) => change.length === 0,
     getNestedChanges,
     createEmpty: newGenericChangeset,
@@ -58,7 +57,7 @@ function compose(change1, change2, composeChildren) {
 }
 function getNestedChanges(change) {
     // For generic changeset, the indices in the input and output contexts are the same.
-    return change.toArray().map(([index, nodeChange]) => [nodeChange, index, index]);
+    return change.toArray().map(([index, nodeChange]) => [nodeChange, index]);
 }
 function rebaseGenericChange(change, over, rebaseChild) {
     const rebased = new BTree();
@@ -104,7 +103,7 @@ function pruneGenericChange(changeset, pruneChild) {
     for (const [index, node] of changeset.entries()) {
         const prunedNode = pruneChild(node);
         if (prunedNode !== undefined) {
-            pruned.set(index, node);
+            pruned.set(index, prunedNode);
         }
     }
     return pruned;
@@ -115,7 +114,10 @@ function replaceRevisions(changeset, oldRevisions, newRevision) {
 /**
  * {@link FieldKind} used to represent changes to elements of a field in a field-kind-agnostic format.
  */
-export const genericFieldKind = new FlexFieldKind(brandConst("ModularEditBuilder.Generic")(), Multiplicity.Sequence, { changeHandler: genericChangeHandler, allowsTreeSupersetOf: (types, other) => false });
+export const genericFieldKind = new FlexFieldKind(brandConst("ModularEditBuilder.Generic")(), Multiplicity.Sequence, {
+    changeHandler: genericChangeHandler,
+    allowMonotonicUpgradeFrom: new Set(),
+});
 /**
  * Converts a {@link GenericChangeset} into a field-kind-specific `TChange`.
  * @param changeset - The generic changeset to convert.
@@ -126,9 +128,4 @@ export const genericFieldKind = new FlexFieldKind(brandConst("ModularEditBuilder
 export function convertGenericChange(changeset, target) {
     return target.editor.buildChildChanges(changeset.entries());
 }
-function* relevantRemovedRoots(change, relevantRemovedRootsFromChild) {
-    for (const nodeChange of change.values()) {
-        yield* relevantRemovedRootsFromChild(nodeChange);
-    }
-}
 //# sourceMappingURL=genericFieldKind.js.map

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 { assert } from \"@fluidframework/core-utils/internal\";\nimport { BTree } from \"@tylerbu/sorted-btree-es6\";\n\nimport {\n\ttype DeltaDetachedNodeId,\n\ttype DeltaMark,\n\ttype FieldKindIdentifier,\n\tMultiplicity,\n\ttype RevisionTag,\n\treplaceAtomRevisions,\n} from \"../../core/index.js\";\n\nimport type {\n\tFieldChangeDelta,\n\tFieldChangeHandler,\n\tNestedChangesIndices,\n\tNodeChangeComposer,\n\tNodeChangePruner,\n\tNodeChangeRebaser,\n\tRelevantRemovedRootsFromChild,\n\tToDelta,\n} from \"./fieldChangeHandler.js\";\nimport { makeGenericChangeCodec } from \"./genericFieldKindCodecs.js\";\nimport { newGenericChangeset, type GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport type { NodeId } from \"./modularChangeTypes.js\";\nimport { FlexFieldKind } from \"./fieldKind.js\";\nimport { brandConst } from \"../../util/index.js\";\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\tmute: (change: GenericChangeset): GenericChangeset => change,\n\t},\n\tcodecsFactory: makeGenericChangeCodec,\n\teditor: {\n\t\tbuildChildChanges(changes: Iterable<[number, NodeId]>): GenericChangeset {\n\t\t\treturn newGenericChangeset(Array.from(changes));\n\t\t},\n\t},\n\tintoDelta: (change: GenericChangeset, deltaFromChild: ToDelta): FieldChangeDelta => {\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): NestedChangesIndices {\n\t// For generic changeset, the indices in the input and output contexts are the same.\n\treturn change.toArray().map(([index, nodeChange]) => [nodeChange, index, 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] ?? Number.POSITIVE_INFINITY;\n\t\tconst baseIndex = baseEntry?.[0] ?? Number.POSITIVE_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: FlexFieldKind = new FlexFieldKind(\n\tbrandConst(\"ModularEditBuilder.Generic\")<FieldKindIdentifier>(),\n\tMultiplicity.Sequence,\n\t{ changeHandler: genericChangeHandler, allowsTreeSupersetOf: (types, other) => false },\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): TChange {\n\treturn target.editor.buildChildChanges(changeset.entries());\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"]}
+{"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 { assert } from \"@fluidframework/core-utils/internal\";\nimport { BTree } from \"@tylerbu/sorted-btree-es6\";\n\nimport {\n\ttype DeltaMark,\n\ttype FieldKindIdentifier,\n\tMultiplicity,\n\ttype RevisionTag,\n\treplaceAtomRevisions,\n\ttype DeltaFieldChanges,\n} from \"../../core/index.js\";\n\nimport type {\n\tFieldChangeHandler,\n\tNestedChangesIndices,\n\tNodeChangeComposer,\n\tNodeChangePruner,\n\tNodeChangeRebaser,\n\tToDelta,\n} from \"./fieldChangeHandler.js\";\nimport { makeGenericChangeCodec } from \"./genericFieldKindCodecs.js\";\nimport { newGenericChangeset, type GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport type { NodeId } from \"./modularChangeTypes.js\";\nimport { FlexFieldKind } from \"./fieldKind.js\";\nimport { brandConst } from \"../../util/index.js\";\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 => change,\n\t\trebase: rebaseGenericChange,\n\t\tprune: pruneGenericChange,\n\t\treplaceRevisions,\n\t\tmute: (change: GenericChangeset): GenericChangeset => change,\n\t},\n\tcodecsFactory: makeGenericChangeCodec,\n\teditor: {\n\t\tbuildChildChanges(changes: Iterable<[number, NodeId]>): GenericChangeset {\n\t\t\treturn newGenericChangeset(Array.from(changes));\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 markList;\n\t},\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): NestedChangesIndices {\n\t// For generic changeset, the indices in the input and output contexts are the same.\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] ?? Number.POSITIVE_INFINITY;\n\t\tconst baseIndex = baseEntry?.[0] ?? Number.POSITIVE_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, 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.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: FlexFieldKind = new FlexFieldKind(\n\tbrandConst(\"ModularEditBuilder.Generic\")<FieldKindIdentifier>(),\n\tMultiplicity.Sequence,\n\t{\n\t\tchangeHandler: genericChangeHandler,\n\t\tallowMonotonicUpgradeFrom: new Set(),\n\t},\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): TChange {\n\treturn target.editor.buildChildChanges(changeset.entries());\n}\n"]}

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

@@ -5,7 +5,7 @@
 import { makeCodecFamily } from "../../codec/index.js";
 import { EncodedGenericChangeset } from "./genericFieldKindFormat.js";
 import { newGenericChangeset } from "./genericFieldKindTypes.js";
-import { EncodedNodeChangeset } from "./modularChangeFormat.js";
+import { EncodedNodeChangeset } from "./modularChangeFormatV1.js";
 export function makeGenericChangeCodec() {
     return makeCodecFamily([[1, makeV1Codec()]]);
 }

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;AAG3F,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\";\n\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"]}
+{"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;AAG3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAyB,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,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\";\n\nimport type { FieldChangeEncodingContext } from \"./fieldChangeHandler.js\";\nimport { EncodedGenericChangeset } from \"./genericFieldKindFormat.js\";\nimport { newGenericChangeset, type GenericChangeset } from \"./genericFieldKindTypes.js\";\nimport { EncodedNodeChangeset } from \"./modularChangeFormatV1.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/index.d.ts

@@ -2,13 +2,13 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { allowsRepoSuperset, allowsTreeSchemaIdentifierSuperset, allowsFieldSuperset, allowsTreeSuperset, } from "./comparison.js";
+export { allowsRepoSuperset, allowsTreeSchemaIdentifierSuperset, allowsFieldSuperset, allowsTreeSuperset, allowsMultiplicitySuperset, } from "./comparison.js";
 export { isNeverField, isNeverTree } from "./isNeverTree.js";
-export { addCrossFieldQuery, type CrossFieldManager, type CrossFieldMap, type CrossFieldQuerySet, CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
-export { ChangesetLocalIdSchema, EncodedChangeAtomId, EncodedRevisionInfo, EncodedModularChangeset, EncodedNodeChangeset, } from "./modularChangeFormat.js";
+export { type InvertNodeManager, type RebaseNodeManager, type ComposeNodeManager, type CrossFieldMap, type CrossFieldQuerySet, type DetachedNodeEntry, CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
+export { ChangesetLocalIdSchema, EncodedChangeAtomId, EncodedRevisionInfo, EncodedModularChangeset, EncodedNodeChangeset, } from "./modularChangeFormatV1.js";
 export { FlexFieldKind, type FullSchemaPolicy } from "./fieldKind.js";
-export { type FieldChangeHandler, type FieldChangeDelta, type FieldChangeRebaser, type FieldEditor, type NodeChangeComposer, type NodeChangeInverter, type NodeChangeRebaser, type NodeChangePruner, referenceFreeFieldChangeRebaser, type RebaseRevisionMetadata, type RelevantRemovedRootsFromChild, type ToDelta, NodeAttachState, type FieldChangeEncodingContext, type NestedChangesIndices, } from "./fieldChangeHandler.js";
-export type { CrossFieldKey, CrossFieldKeyRange, FieldChange, FieldChangeMap, FieldChangeset, HasFieldChanges, ModularChangeset, NodeExistsConstraint, NodeId, } from "./modularChangeTypes.js";
+export { type FieldChangeHandler, type FieldChangeRebaser, type FieldEditor, type NodeChangeComposer, type NodeChangeInverter, type NodeChangeRebaser, type NodeChangePruner, referenceFreeFieldChangeRebaser, type RebaseRevisionMetadata, type ToDelta, NodeAttachState, type FieldChangeEncodingContext, type NestedChangesIndices, } from "./fieldChangeHandler.js";
+export { type CrossFieldKey, type CrossFieldKeyRange, type FieldChange, type FieldChangeMap, type FieldChangeset, type HasFieldChanges, type ModularChangeset, type NodeExistsConstraint, type NodeId, type ChangeAtomIdBTree, type RebaseVersion, getFromChangeAtomIdMap, setInChangeAtomIdMap, rangeQueryChangeAtomIdMap, } from "./modularChangeTypes.js";
 export { convertGenericChange, genericChangeHandler, genericFieldKind, } from "./genericFieldKind.js";
 export type { GenericChangeset } from "./genericFieldKindTypes.js";
 export { ModularChangeFamily, ModularEditBuilder, type EditDescription, type GlobalEditDescription, type FieldEditDescription, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, updateRefreshers, } from "./modularChangeFamily.js";

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,EACN,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,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,EAC/B,KAAK,oBAAoB,GACzB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACX,aAAa,EACb,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"}
+{"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,EAClB,0BAA0B,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACtE,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,OAAO,EACZ,eAAe,EACf,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACX,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,GACzB,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"}

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

@@ -2,12 +2,13 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { allowsRepoSuperset, allowsTreeSchemaIdentifierSuperset, allowsFieldSuperset, allowsTreeSuperset, } from "./comparison.js";
+export { allowsRepoSuperset, allowsTreeSchemaIdentifierSuperset, allowsFieldSuperset, allowsTreeSuperset, allowsMultiplicitySuperset, } from "./comparison.js";
 export { isNeverField, isNeverTree } from "./isNeverTree.js";
-export { addCrossFieldQuery, CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
-export { ChangesetLocalIdSchema, EncodedChangeAtomId, EncodedRevisionInfo, EncodedModularChangeset, EncodedNodeChangeset, } from "./modularChangeFormat.js";
+export { CrossFieldTarget, setInCrossFieldMap, } from "./crossFieldQueries.js";
+export { ChangesetLocalIdSchema, EncodedChangeAtomId, EncodedRevisionInfo, EncodedModularChangeset, EncodedNodeChangeset, } from "./modularChangeFormatV1.js";
 export { FlexFieldKind } from "./fieldKind.js";
 export { referenceFreeFieldChangeRebaser, NodeAttachState, } from "./fieldChangeHandler.js";
+export { getFromChangeAtomIdMap, setInChangeAtomIdMap, rangeQueryChangeAtomIdMap, } from "./modularChangeTypes.js";
 export { convertGenericChange, genericChangeHandler, genericFieldKind, } from "./genericFieldKind.js";
 export { ModularChangeFamily, ModularEditBuilder, rebaseRevisionMetadataFromInfo, intoDelta, relevantRemovedRoots, updateRefreshers, } from "./modularChangeFamily.js";
 export { makeModularChangeCodecFamily } from "./modularChangeCodecs.js";

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,EASN,+BAA+B,EAI/B,eAAe,GAGf,MAAM,yBAAyB,CAAC;AAYjC,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","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 {\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\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\";\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,EAON,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAQN,+BAA+B,EAG/B,eAAe,GAGf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAYN,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,GACzB,MAAM,yBAAyB,CAAC;AACjC,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","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\tEncodedModularChangeset,\n\tEncodedNodeChangeset,\n} from \"./modularChangeFormatV1.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 ChangeAtomIdBTree,\n\ttype RebaseVersion,\n\tgetFromChangeAtomIdMap,\n\tsetInChangeAtomIdMap,\n\trangeQueryChangeAtomIdMap,\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\";\n"]}

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

@@ -0,0 +1,17 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { type ICodecOptions, type IJsonCodec, type IMultiFormatCodec } from "../../codec/index.js";
+import { type ChangeEncodingContext, type EncodedRevisionTag, type RevisionTag } from "../../core/index.js";
+import { type JsonCompatibleReadOnly } from "../../util/index.js";
+import { type FieldBatchCodec } 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 { EncodedModularChangeset } from "./modularChangeFormatV1.js";
+import type { FieldChangeEncodingContext } from "./fieldChangeHandler.js";
+export type ModularChangeCodec = IJsonCodec<ModularChangeset, EncodedModularChangeset, EncodedModularChangeset, ChangeEncodingContext>;
+export type FieldCodec = IMultiFormatCodec<FieldChangeset, JsonCompatibleReadOnly, JsonCompatibleReadOnly, FieldChangeEncodingContext>;
+export declare function makeModularChangeCodecV1(fieldKinds: FieldKindConfiguration, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, fieldsCodec: FieldBatchCodec, codecOptions: ICodecOptions, chunkCompressionStrategy?: TreeCompressionStrategy): ModularChangeCodec;
+//# sourceMappingURL=modularChangeCodecV1.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modularChangeCodecV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeCodecV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAGN,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,iBAAiB,EAEtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIN,KAAK,qBAAqB,EAE1B,KAAK,kBAAkB,EAKvB,KAAK,WAAW,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAKN,KAAK,sBAAsB,EAK3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGN,KAAK,eAAe,EAEpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EACX,sBAAsB,EAEtB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAMN,KAAK,cAAc,EAEnB,KAAK,gBAAgB,EAKrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,uBAAuB,EAOvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,0BAA0B,EAAsB,MAAM,yBAAyB,CAAC;AAI9F,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAC1C,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,CACrB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,iBAAiB,CACzC,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,CAAC;AAEF,wBAAgB,wBAAwB,CACvC,UAAU,EAAE,sBAAsB,EAClC,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,WAAW,EAAE,eAAe,EAC5B,YAAY,EAAE,aAAa,EAC3B,wBAAwB,GAAE,uBAA4D,GACpF,kBAAkB,CA2hBpB"}

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

@@ -0,0 +1,384 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { assert, fail, oob } 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, } from "./modularChangeFamily.js";
+import { newCrossFieldRangeTable, setInChangeAtomIdMap, } from "./modularChangeTypes.js";
+import { EncodedModularChangeset, } from "./modularChangeFormatV1.js";
+import { genericFieldKind } from "./genericFieldKind.js";
+export function makeModularChangeCodecV1(fieldKinds, revisionTagCodec, fieldsCodec, codecOptions, chunkCompressionStrategy = TreeCompressionStrategy.Compressed) {
+    // 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 }),
+        ],
+    ]);
+    fieldKinds.forEach((entry, identifier) => {
+        fieldChangesetCodecs.set(identifier, getMapEntry(entry));
+    });
+    const getFieldChangesetCodec = (fieldKind) => {
+        const entry = fieldChangesetCodecs.get(fieldKind);
+        assert(entry !== undefined, 0x5ea /* Tried to encode unsupported fieldKind */);
+        return entry;
+    };
+    function encodeFieldChangesForJson(change, parentId, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId) {
+        const encodedFields = [];
+        for (const [field, fieldChange] of change) {
+            const { codec, compiledSchema } = getFieldChangesetCodec(fieldChange.fieldKind);
+            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);
+            if (compiledSchema !== undefined && !compiledSchema.check(encodedChange)) {
+                fail(0xb1f /* Encoded change didn't pass schema validation. */);
+            }
+            const fieldKey = field;
+            const encodedField = {
+                fieldKey,
+                fieldKind: fieldChange.fieldKind,
+                change: encodedChange,
+            };
+            encodedFields.push(encodedField);
+        }
+        return encodedFields;
+    }
+    function encodeNodeChangesForJson(change, id, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId) {
+        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);
+        }
+        if (nodeExistsConstraint !== undefined) {
+            encodedChange.nodeExistsConstraint = nodeExistsConstraint;
+        }
+        return encodedChange;
+    }
+    function decodeFieldChangesFromJson(encodedChange, parentId, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator) {
+        const decodedFields = new Map();
+        for (const field of encodedChange) {
+            const { codec, compiledSchema } = getFieldChangesetCodec(field.fieldKind);
+            if (compiledSchema !== undefined && !compiledSchema.check(field.change)) {
+                fail(0xb20 /* Encoded change didn't pass schema validation. */);
+            }
+            const fieldId = {
+                nodeId: parentId,
+                field: field.fieldKey,
+            };
+            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);
+                },
+                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);
+            }
+            const fieldKey = brand(field.fieldKey);
+            decodedFields.set(fieldKey, {
+                fieldKind: field.fieldKind,
+                change: brand(fieldChangeset),
+            });
+        }
+        return decodedFields;
+    }
+    function decodeNodeChangesetFromJson(encodedChange, id, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator) {
+        const decodedChange = {};
+        const { fieldChanges, nodeExistsConstraint } = encodedChange;
+        if (fieldChanges !== undefined) {
+            decodedChange.fieldChanges = decodeFieldChangesFromJson(fieldChanges, id, decodedCrossFieldKeys, decodedRootTable, context, decodeNode, idAllocator);
+        }
+        if (nodeExistsConstraint !== undefined) {
+            decodedChange.nodeExistsConstraint = nodeExistsConstraint;
+        }
+        return decodedChange;
+    }
+    function encodeDetachedNodes(detachedNodes, context) {
+        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 decodeDetachedNodes(encoded, context) {
+        if (encoded === undefined || encoded.builds.length === 0) {
+            return undefined;
+        }
+        const chunks = fieldsCodec.decode(encoded.trees, {
+            encodeType: chunkCompressionStrategy,
+            originatorId: context.originatorId,
+            idCompressor: context.idCompressor,
+        });
+        const getChunk = (index) => {
+            assert(index < chunks.length, 0x898 /* out of bounds index for build chunk */);
+            return chunkFieldSingle(chunks[index] ?? oob(), {
+                policy: defaultChunkPolicy,
+                idCompressor: context.idCompressor,
+            });
+        };
+        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);
+            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;
+        }
+        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 decodeRevisionInfos(revisions, context) {
+        if (revisions === undefined) {
+            return context.revision !== undefined ? [{ revision: context.revision }] : undefined;
+        }
+        const decodedRevisions = [];
+        for (const revision of revisions) {
+            const decodedRevision = {
+                revision: revisionTagCodec.decode(revision.revision, context),
+            };
+            if (revision.rollbackOf !== undefined) {
+                decodedRevision.rollbackOf = revisionTagCodec.decode(revision.rollbackOf, context);
+            }
+            decodedRevisions.push(decodedRevision);
+        }
+        return decodedRevisions;
+    }
+    const modularChangeCodec = {
+        encode: (change, context) => {
+            const fieldToRoots = getFieldToRoots(change.rootNodes);
+            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);
+            };
+            // Destroys only exist in rollback changesets, which are never sent.
+            assert(change.destroys === undefined, 0x899 /* Unexpected changeset with destroys */);
+            const encoded = {
+                maxId: change.maxId,
+                revisions: change.revisions === undefined
+                    ? undefined
+                    : encodeRevisionInfos(change.revisions, context),
+                changes: encodeFieldChangesForJson(change.fieldChanges, undefined, fieldToRoots, context, encodeNode, getInputRootId, isAttachId, isDetachId),
+                builds: encodeDetachedNodes(change.builds, context),
+                refreshers: encodeDetachedNodes(change.refreshers, context),
+                violations: change.constraintViolationCount,
+            };
+            return encoded;
+        },
+        decode: (encodedChange, context) => {
+            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);
+                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),
+                nodeChanges,
+                rootNodes,
+                nodeToParent,
+                nodeAliases: newTupleBTree(),
+                crossFieldKeys,
+            };
+            if (encodedChange.builds !== undefined) {
+                decoded.builds = decodeDetachedNodes(encodedChange.builds, context);
+            }
+            if (encodedChange.refreshers !== undefined) {
+                decoded.refreshers = decodeDetachedNodes(encodedChange.refreshers, context);
+            }
+            if (encodedChange.violations !== undefined) {
+                decoded.constraintViolationCount = encodedChange.violations;
+            }
+            const decodedRevInfos = decodeRevisionInfos(encodedChange.revisions, context);
+            if (decodedRevInfos !== undefined) {
+                decoded.revisions = decodedRevInfos;
+            }
+            if (encodedChange.maxId !== undefined) {
+                decoded.maxId = encodedChange.maxId;
+            }
+            return decoded;
+        },
+    };
+    return withSchemaValidation(EncodedModularChangeset, modularChangeCodec, codecOptions.jsonValidator);
+}
+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) {
+    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) {
+            setInChangeAtomIdMap(getOrAddInFieldRootMap(fieldToRoots, fieldId).nodeChanges, detachId, nodeId);
+        }
+        else {
+            fail("Untracked root change");
+        }
+    }
+    for (const entry of rootTable.oldToNewId.entries()) {
+        const fieldId = rootTable.detachLocations.getFirst(entry.start, 1).value;
+        if (fieldId !== undefined) {
+            getOrAddInFieldRootMap(fieldToRoots, fieldId).renames.set(entry.start, entry.length, entry.value);
+        }
+        else {
+            fail("Untracked root change");
+        }
+    }
+    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;
+}
+//# sourceMappingURL=modularChangeCodecV1.js.map