@fluidframework/tree 2.118.1 → 3.0.1

package/dist/feature-libraries/modular-schema/modularChangeFormatV1.d.ts

@@ -7,7 +7,7 @@ import type { Static } from "@sinclair/typebox";
 import { type ChangesetLocalId, schemaFormatV1 } from "../../core/index.js";
 import { type JsonCompatibleReadOnly } from "../../util/index.js";
 export declare const ChangesetLocalIdSchema: Type.TUnsafe<ChangesetLocalId>;
-export declare const EncodedChangeAtomId: Type.TUnion<[Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TUnsafe<ChangesetLocalId>]>;
+export declare const EncodedChangeAtomId: Type.TUnion<[Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TUnsafe<ChangesetLocalId>]>;
 export type EncodedChangeAtomId = Static<typeof EncodedChangeAtomId>;
 export declare const EncodedFieldChange: Type.TObject<{
     fieldKey: Type.TUnsafe<schemaFormatV1.FieldKey>;
@@ -48,8 +48,8 @@ export declare const EncodedNodeChangeset: Type.TObject<{
  */
 export type EncodedNodeChangeset = Static<typeof EncodedNodeChangeset>;
 export declare const EncodedRevisionInfo: Type.TObject<{
-    revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
-    rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
+    revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
+    rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
 }>;
 export type EncodedRevisionInfo = Static<typeof EncodedRevisionInfo>;
 /**
@@ -58,10 +58,10 @@ export type EncodedRevisionInfo = Static<typeof EncodedRevisionInfo>;
 export declare const EncodedTreeIndex: Type.TNumber;
 export declare const CommitBuilds: Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>;
 export type CommitBuilds = Static<typeof CommitBuilds>;
-export declare const EncodedBuildsArray: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
+export declare const EncodedBuildsArray: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
 export type EncodedBuildsArray = Static<typeof EncodedBuildsArray>;
 export declare const EncodedBuilds: Type.TObject<{
-    builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
+    builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
     /**
      * FieldBatch codec encoded data indexed by the EncodedTreeIndexes above.
      */
@@ -76,18 +76,18 @@ export declare const EncodedModularChangesetV1: Type.TObject<{
         change: Type.TUnsafe<JsonCompatibleReadOnly>;
     }>>;
     revisions: Type.TReadonly<Type.TOptional<Type.TArray<Type.TObject<{
-        revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
-        rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
+        revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
+        rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
     }>>>>;
     builds: Type.TOptional<Type.TObject<{
-        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
+        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
         /**
          * FieldBatch codec encoded data indexed by the EncodedTreeIndexes above.
          */
         trees: Type.TUnsafe<JsonCompatibleReadOnly>;
     }>>;
     refreshers: Type.TOptional<Type.TObject<{
-        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
+        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<ChangesetLocalId>, Type.TNumber]>>]>]>>;
         /**
          * FieldBatch codec encoded data indexed by the EncodedTreeIndexes above.
          */

package/dist/feature-libraries/modular-schema/modularChangeFormatV1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modularChangeFormatV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,KAAK,gBAAgB,EAAqB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EACN,KAAK,sBAAsB,EAG3B,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,sBAAsB,gCAEjC,CAAC;AAEH,eAAO,MAAM,mBAAmB,0QAG9B,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,eAAO,MAAM,kBAAkB;;;;EAU9B,CAAC;AAEF,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,OAAO,kBAAkB,CAAC;IAC5E;;OAEG;IACH,MAAM,EAAE,sBAAsB,CAAC;CAC/B;AAED,eAAO,MAAM,qBAAqB;;;;GAAiC,CAAC;AAEpE;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAUzE,eAAO,MAAM,oBAAoB;;;;;;;;;EAMhC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,eAAO,MAAM,mBAAmB;;;EAM/B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE;;GAEG;AACH,eAAO,MAAM,gBAAgB,cAA6C,CAAC;AAE3E,eAAO,MAAM,YAAY,0EAOxB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,kBAAkB,0XAM9B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEnE,eAAO,MAAM,aAAa;;IAGxB;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;QAVpC;;WAEG;;;;;QAFH;;WAEG;;;IAiBH;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"modularChangeFormatV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,KAAK,gBAAgB,EAAqB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EACN,KAAK,sBAAsB,EAG3B,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,sBAAsB,gCAEjC,CAAC;AAEH,eAAO,MAAM,mBAAmB,qTAG9B,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,eAAO,MAAM,kBAAkB;;;;EAU9B,CAAC;AAEF,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,OAAO,kBAAkB,CAAC;IAC5E;;OAEG;IACH,MAAM,EAAE,sBAAsB,CAAC;CAC/B;AAED,eAAO,MAAM,qBAAqB;;;;GAAiC,CAAC;AAEpE;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAUzE,eAAO,MAAM,oBAAoB;;;;;;;;;EAMhC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,eAAO,MAAM,mBAAmB;;;EAM/B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE;;GAEG;AACH,eAAO,MAAM,gBAAgB,cAA6C,CAAC;AAE3E,eAAO,MAAM,YAAY,0EAOxB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,kBAAkB,qaAM9B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEnE,eAAO,MAAM,aAAa;;IAGxB;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;QAVpC;;WAEG;;;;;QAFH;;WAEG;;;IAiBH;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC"}

package/dist/feature-libraries/modular-schema/modularChangeFormatV2.d.ts

@@ -11,11 +11,11 @@ export type EncodedNoChangeConstraint = Static<typeof EncodedNoChangeConstraint>
 export declare const EncodedModularChangesetV2: Type.TObject<{
     maxId: Type.TOptional<Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>>;
     revisions: Type.TReadonly<Type.TOptional<Type.TArray<Type.TObject<{
-        revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
-        rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
+        revision: Type.TReadonly<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
+        rollbackOf: Type.TReadonly<Type.TOptional<Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>>>;
     }>>>>;
     builds: Type.TOptional<Type.TObject<{
-        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>]>]>>;
+        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>]>]>>;
         trees: Type.TUnsafe<import("../../index.js").JsonCompatibleReadOnly>;
     }>>;
     changes: Type.TArray<Type.TObject<{
@@ -24,7 +24,7 @@ export declare const EncodedModularChangesetV2: Type.TObject<{
         change: Type.TUnsafe<import("../../index.js").JsonCompatibleReadOnly>;
     }>>;
     refreshers: Type.TOptional<Type.TObject<{
-        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>]>]>>;
+        builds: Type.TArray<Type.TUnion<[Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor", { with: { "resolution-mode": "import" } }).OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TTuple<[Type.TArray<Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber]>>]>]>>;
         trees: Type.TUnsafe<import("../../index.js").JsonCompatibleReadOnly>;
     }>>;
     violations: Type.TOptional<Type.TNumber>;

package/dist/feature-libraries/modular-schema/modularChangeTypes.js

@@ -4,13 +4,12 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newCrossFieldKeyTable = void 0;
+exports.newCrossFieldKeyTable = newCrossFieldKeyTable;
 const index_js_1 = require("../../core/index.js");
 const index_js_2 = require("../../util/index.js");
 function newCrossFieldKeyTable() {
     return new index_js_2.RangeMap(offsetCrossFieldKey, subtractCrossFieldKeys);
 }
-exports.newCrossFieldKeyTable = newCrossFieldKeyTable;
 function offsetCrossFieldKey(key, offset) {
     return {
         ...key,

package/dist/feature-libraries/modular-schema/modularChangeTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"modularChangeTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,kDAO6B;AAC7B,kDAAkE;AA4DlE,SAAgB,qBAAqB;IACpC,OAAO,IAAI,mBAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;AAClE,CAAC;AAFD,sDAEC;AAED,SAAS,mBAAmB,CAAC,GAAkB,EAAE,MAAc;IAC9D,OAAO;QACN,GAAG,GAAG;QACN,OAAO,EAAE,IAAA,gBAAK,EAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC;KACpC,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,CAAgB,EAAE,CAAgB;IACjE,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,OAAO,IAAA,gCAAqB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\tsubtractChangeAtomIds,\n\ttype ChangeAtomId,\n\ttype ChangesetLocalId,\n\ttype FieldKey,\n\ttype FieldKindIdentifier,\n\ttype RevisionInfo,\n} from \"../../core/index.js\";\nimport { brand, RangeMap, type Brand } from \"../../util/index.js\";\nimport type { ChangeAtomIdBTree } from \"../changeAtomIdBTree.js\";\nimport type { TreeChunk } from \"../chunked-forest/index.js\";\n\nimport type { CrossFieldTarget } from \"./crossFieldQueries.js\";\n\nexport interface ModularChangeset extends Readonly<HasFieldChanges> {\n\t/**\n\t * The numerically highest `ChangesetLocalId` used in this changeset.\n\t * If undefined then this changeset contains no IDs.\n\t */\n\treadonly maxId?: ChangesetLocalId;\n\t/**\n\t * The revisions included in this changeset, ordered temporally (oldest to newest).\n\t * Undefined for anonymous changesets.\n\t * Should never be empty.\n\t */\n\treadonly revisions?: readonly RevisionInfo[];\n\treadonly fieldChanges: FieldChangeMap;\n\n\t/**\n\t * Maps from this changeset's canonical ID for a node (see comment on node aliases) to the changes for that node.\n\t */\n\treadonly nodeChanges: ChangeAtomIdBTree<NodeChangeset>;\n\n\t/**\n\t * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node.\n\t */\n\t// TODO: Should this be merged with `nodeChanges`?\n\treadonly nodeToParent: ChangeAtomIdBTree<FieldId>;\n\n\t/**\n\t * Maps from a node ID to another ID for the same node.\n\t * If a node ID used in this changeset has no entry in this table, then it is the canonical ID for that node.\n\t * The aliases form a set of trees, where the root of each tree is a canonical ID.\n\t *\n\t * When composing changesets with different canonical IDs for the same node,\n\t * one of those IDs becomes the canonical ID for the composition, while the other is added to this table as an alias.\n\t *\n\t * Node aliases are preserved when composing changesets so we can avoid having to find and update all changed node IDs\n\t * in the field IDs in nodeToParent and crossFieldKeys.\n\t */\n\treadonly nodeAliases: ChangeAtomIdBTree<NodeId>;\n\treadonly crossFieldKeys: CrossFieldKeyTable;\n\t/**\n\t * The number of constraint violations that apply to the input context of the changeset, i.e., before this change is applied.\n\t * If this count is greater than 0, it will prevent the changeset from being applied.\n\t */\n\treadonly constraintViolationCount?: number;\n\t/** Constraint that the document must be in the same state before this change is applied as it was before this change was authored */\n\treadonly noChangeConstraint?: NoChangeConstraint;\n\t/** Constraint that the document must be in the same state before the revert of this change is applied as it was after this change was applied */\n\treadonly noChangeConstraintOnRevert?: NoChangeConstraint;\n\treadonly builds?: ChangeAtomIdBTree<TreeChunk>;\n\treadonly destroys?: ChangeAtomIdBTree<number>;\n\treadonly refreshers?: ChangeAtomIdBTree<TreeChunk>;\n}\n\nexport type CrossFieldKeyTable = RangeMap<CrossFieldKey, FieldId>;\n\nexport function newCrossFieldKeyTable(): CrossFieldKeyTable {\n\treturn new RangeMap(offsetCrossFieldKey, subtractCrossFieldKeys);\n}\n\nfunction offsetCrossFieldKey(key: CrossFieldKey, offset: number): CrossFieldKey {\n\treturn {\n\t\t...key,\n\t\tlocalId: brand(key.localId + offset),\n\t};\n}\n\nfunction subtractCrossFieldKeys(a: CrossFieldKey, b: CrossFieldKey): number {\n\tconst cmpTarget = a.target - b.target;\n\tif (cmpTarget !== 0) {\n\t\treturn cmpTarget * Number.POSITIVE_INFINITY;\n\t}\n\n\treturn subtractChangeAtomIds(a, b);\n}\n\nexport interface CrossFieldKey extends ChangeAtomId {\n\treadonly target: CrossFieldTarget;\n}\n\nexport interface CrossFieldKeyRange {\n\treadonly key: CrossFieldKey;\n\treadonly count: number;\n}\n\nexport interface FieldId {\n\treadonly nodeId: NodeId | undefined;\n\treadonly field: FieldKey;\n}\n\nexport interface NodeExistsConstraint {\n\tviolated: boolean;\n}\n\n/**\n * A constraint that is violated whenever the state of the document is different from when the change was authored.\n */\nexport interface NoChangeConstraint {\n\tviolated: boolean;\n}\n\n/**\n * Changeset for a subtree rooted at a specific node.\n */\nexport interface NodeChangeset extends HasFieldChanges {\n\t/** Keeps track of whether node exists constraint has been violated by this change */\n\tnodeExistsConstraint?: NodeExistsConstraint;\n\t/** Keeps track of whether node exists constraint will be violated when this change is reverted */\n\tnodeExistsConstraintOnRevert?: NodeExistsConstraint;\n}\n\nexport type NodeId = ChangeAtomId;\n\nexport interface HasFieldChanges {\n\tfieldChanges?: FieldChangeMap;\n}\n\nexport type FieldChangeMap = Map<FieldKey, FieldChange>;\n\nexport interface FieldChange {\n\treadonly fieldKind: FieldKindIdentifier;\n\tchange: FieldChangeset;\n}\n\nexport type FieldChangeset = Brand<unknown, \"FieldChangeset\">;\n"]}
+{"version":3,"file":"modularChangeTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAsEH,sDAEC;AAtED,kDAO6B;AAC7B,kDAAkE;AA4DlE,SAAgB,qBAAqB;IACpC,OAAO,IAAI,mBAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAkB,EAAE,MAAc;IAC9D,OAAO;QACN,GAAG,GAAG;QACN,OAAO,EAAE,IAAA,gBAAK,EAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC;KACpC,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,CAAgB,EAAE,CAAgB;IACjE,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,OAAO,IAAA,gCAAqB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\tsubtractChangeAtomIds,\n\ttype ChangeAtomId,\n\ttype ChangesetLocalId,\n\ttype FieldKey,\n\ttype FieldKindIdentifier,\n\ttype RevisionInfo,\n} from \"../../core/index.js\";\nimport { brand, RangeMap, type Brand } from \"../../util/index.js\";\nimport type { ChangeAtomIdBTree } from \"../changeAtomIdBTree.js\";\nimport type { TreeChunk } from \"../chunked-forest/index.js\";\n\nimport type { CrossFieldTarget } from \"./crossFieldQueries.js\";\n\nexport interface ModularChangeset extends Readonly<HasFieldChanges> {\n\t/**\n\t * The numerically highest `ChangesetLocalId` used in this changeset.\n\t * If undefined then this changeset contains no IDs.\n\t */\n\treadonly maxId?: ChangesetLocalId;\n\t/**\n\t * The revisions included in this changeset, ordered temporally (oldest to newest).\n\t * Undefined for anonymous changesets.\n\t * Should never be empty.\n\t */\n\treadonly revisions?: readonly RevisionInfo[];\n\treadonly fieldChanges: FieldChangeMap;\n\n\t/**\n\t * Maps from this changeset's canonical ID for a node (see comment on node aliases) to the changes for that node.\n\t */\n\treadonly nodeChanges: ChangeAtomIdBTree<NodeChangeset>;\n\n\t/**\n\t * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node.\n\t */\n\t// TODO: Should this be merged with `nodeChanges`?\n\treadonly nodeToParent: ChangeAtomIdBTree<FieldId>;\n\n\t/**\n\t * Maps from a node ID to another ID for the same node.\n\t * If a node ID used in this changeset has no entry in this table, then it is the canonical ID for that node.\n\t * The aliases form a set of trees, where the root of each tree is a canonical ID.\n\t *\n\t * When composing changesets with different canonical IDs for the same node,\n\t * one of those IDs becomes the canonical ID for the composition, while the other is added to this table as an alias.\n\t *\n\t * Node aliases are preserved when composing changesets so we can avoid having to find and update all changed node IDs\n\t * in the field IDs in nodeToParent and crossFieldKeys.\n\t */\n\treadonly nodeAliases: ChangeAtomIdBTree<NodeId>;\n\treadonly crossFieldKeys: CrossFieldKeyTable;\n\t/**\n\t * The number of constraint violations that apply to the input context of the changeset, i.e., before this change is applied.\n\t * If this count is greater than 0, it will prevent the changeset from being applied.\n\t */\n\treadonly constraintViolationCount?: number;\n\t/** Constraint that the document must be in the same state before this change is applied as it was before this change was authored */\n\treadonly noChangeConstraint?: NoChangeConstraint;\n\t/** Constraint that the document must be in the same state before the revert of this change is applied as it was after this change was applied */\n\treadonly noChangeConstraintOnRevert?: NoChangeConstraint;\n\treadonly builds?: ChangeAtomIdBTree<TreeChunk>;\n\treadonly destroys?: ChangeAtomIdBTree<number>;\n\treadonly refreshers?: ChangeAtomIdBTree<TreeChunk>;\n}\n\nexport type CrossFieldKeyTable = RangeMap<CrossFieldKey, FieldId>;\n\nexport function newCrossFieldKeyTable(): CrossFieldKeyTable {\n\treturn new RangeMap(offsetCrossFieldKey, subtractCrossFieldKeys);\n}\n\nfunction offsetCrossFieldKey(key: CrossFieldKey, offset: number): CrossFieldKey {\n\treturn {\n\t\t...key,\n\t\tlocalId: brand(key.localId + offset),\n\t};\n}\n\nfunction subtractCrossFieldKeys(a: CrossFieldKey, b: CrossFieldKey): number {\n\tconst cmpTarget = a.target - b.target;\n\tif (cmpTarget !== 0) {\n\t\treturn cmpTarget * Number.POSITIVE_INFINITY;\n\t}\n\n\treturn subtractChangeAtomIds(a, b);\n}\n\nexport interface CrossFieldKey extends ChangeAtomId {\n\treadonly target: CrossFieldTarget;\n}\n\nexport interface CrossFieldKeyRange {\n\treadonly key: CrossFieldKey;\n\treadonly count: number;\n}\n\nexport interface FieldId {\n\treadonly nodeId: NodeId | undefined;\n\treadonly field: FieldKey;\n}\n\nexport interface NodeExistsConstraint {\n\tviolated: boolean;\n}\n\n/**\n * A constraint that is violated whenever the state of the document is different from when the change was authored.\n */\nexport interface NoChangeConstraint {\n\tviolated: boolean;\n}\n\n/**\n * Changeset for a subtree rooted at a specific node.\n */\nexport interface NodeChangeset extends HasFieldChanges {\n\t/** Keeps track of whether node exists constraint has been violated by this change */\n\tnodeExistsConstraint?: NodeExistsConstraint;\n\t/** Keeps track of whether node exists constraint will be violated when this change is reverted */\n\tnodeExistsConstraintOnRevert?: NodeExistsConstraint;\n}\n\nexport type NodeId = ChangeAtomId;\n\nexport interface HasFieldChanges {\n\tfieldChanges?: FieldChangeMap;\n}\n\nexport type FieldChangeMap = Map<FieldKey, FieldChange>;\n\nexport interface FieldChange {\n\treadonly fieldKind: FieldKindIdentifier;\n\tchange: FieldChangeset;\n}\n\nexport type FieldChangeset = Brand<unknown, \"FieldChangeset\">;\n"]}

package/dist/feature-libraries/modular-schema/modularChangeUtils.d.ts

@@ -9,7 +9,7 @@ import { CrossFieldTarget, type CrossFieldManager, type CrossFieldMap } from "./
 import type { FieldChangeHandler } from "./fieldChangeHandler.js";
 import { NodeAttachState } from "./fieldChangeHandler.js";
 import type { FlexFieldKind } from "./fieldKind.js";
-import { type FieldChangeMap, type ModularChangeset, type NodeChangeset, type NodeId } from "./modularChangeTypes.js";
+import { type CrossFieldKey, type CrossFieldKeyTable, type FieldChangeMap, type FieldId, type ModularChangeset, type NodeChangeset, type NodeId } from "./modularChangeTypes.js";
 export declare function hasConflicts(change: ModularChangeset): boolean;
 /**
  * Creates a normalized changeset from the provided properties.
@@ -53,4 +53,16 @@ export interface ConstraintState {
 export declare function newConstraintState(violationCount: number): ConstraintState;
 export declare function updateConstraintsForFields(fields: FieldChangeMap, parentInputAttachState: NodeAttachState, constraintState: ConstraintState, nodes: ChangeAtomIdBTree<NodeChangeset>, fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>): void;
 export declare function nodeChangeFromId(nodes: ChangeAtomIdBTree<NodeChangeset>, id: NodeId): NodeChangeset;
+/**
+ * @returns The canonical form of nodeId, according to nodeAliases
+ */
+export declare function normalizeNodeId(nodeId: NodeId, nodeAliases: ChangeAtomIdBTree<NodeId>): NodeId;
+export declare function makeChangesetInversions(fields: FieldChangeMap, nodes: ChangeAtomIdBTree<NodeChangeset>, fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>): {
+    crossFieldKeys: CrossFieldKeyTable;
+    nodeToParent: ChangeAtomIdBTree<FieldId>;
+};
+export declare function validateChangeset(change: ModularChangeset, fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>): void;
+export declare function getParentFieldId(changeset: ModularChangeset, nodeId: NodeId): FieldId;
+export declare function normalizeFieldId(fieldId: FieldId, nodeAliases: ChangeAtomIdBTree<NodeId>): FieldId;
+export declare function getFieldsForCrossFieldKey(changeset: ModularChangeset, key: CrossFieldKey, count: number): FieldId[];
 //# sourceMappingURL=modularChangeUtils.d.ts.map

package/dist/feature-libraries/modular-schema/modularChangeUtils.d.ts.map

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

package/dist/feature-libraries/modular-schema/modularChangeUtils.js

@@ -4,7 +4,22 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeChangeFromId = exports.updateConstraintsForFields = exports.newConstraintState = exports.getChangeHandler = exports.revisionInfoFromTaggedChange = exports.getRevInfoFromTaggedChanges = exports.newCrossFieldTable = exports.CrossFieldManagerI = exports.makeModularChangeset = exports.hasConflicts = void 0;
+exports.CrossFieldManagerI = void 0;
+exports.hasConflicts = hasConflicts;
+exports.makeModularChangeset = makeModularChangeset;
+exports.newCrossFieldTable = newCrossFieldTable;
+exports.getRevInfoFromTaggedChanges = getRevInfoFromTaggedChanges;
+exports.revisionInfoFromTaggedChange = revisionInfoFromTaggedChange;
+exports.getChangeHandler = getChangeHandler;
+exports.newConstraintState = newConstraintState;
+exports.updateConstraintsForFields = updateConstraintsForFields;
+exports.nodeChangeFromId = nodeChangeFromId;
+exports.normalizeNodeId = normalizeNodeId;
+exports.makeChangesetInversions = makeChangesetInversions;
+exports.validateChangeset = validateChangeset;
+exports.getParentFieldId = getParentFieldId;
+exports.normalizeFieldId = normalizeFieldId;
+exports.getFieldsForCrossFieldKey = getFieldsForCrossFieldKey;
 const internal_1 = require("@fluidframework/core-utils/internal");
 const index_js_1 = require("../../core/index.js");
 const index_js_2 = require("../../util/index.js");
@@ -16,7 +31,6 @@ const modularChangeTypes_js_1 = require("./modularChangeTypes.js");
 function hasConflicts(change) {
     return (change.constraintViolationCount ?? 0) > 0;
 }
-exports.hasConflicts = hasConflicts;
 /**
  * Creates a normalized changeset from the provided properties.
  *
@@ -59,8 +73,10 @@ function makeModularChangeset(props = {}) {
     }
     return changeset;
 }
-exports.makeModularChangeset = makeModularChangeset;
 class CrossFieldManagerI {
+    crossFieldTable;
+    currentFieldKey;
+    allowInval;
     constructor(crossFieldTable, currentFieldKey, allowInval = true) {
         this.crossFieldTable = crossFieldTable;
         this.currentFieldKey = currentFieldKey;
@@ -110,7 +126,6 @@ function newCrossFieldTable() {
         invalidatedFields: new Set(),
     };
 }
-exports.newCrossFieldTable = newCrossFieldTable;
 function getRevInfoFromTaggedChanges(changes) {
     let maxId = -1;
     const revInfos = [];
@@ -140,7 +155,6 @@ function getRevInfoFromTaggedChanges(changes) {
     }
     return { maxId: (0, index_js_2.brand)(maxId), revInfos };
 }
-exports.getRevInfoFromTaggedChanges = getRevInfoFromTaggedChanges;
 function revisionInfoFromTaggedChange(taggedChange) {
     const revInfos = [];
     if (taggedChange.change.revisions !== undefined) {
@@ -155,11 +169,9 @@ function revisionInfoFromTaggedChange(taggedChange) {
     }
     return revInfos;
 }
-exports.revisionInfoFromTaggedChange = revisionInfoFromTaggedChange;
 function getChangeHandler(fieldKinds, kind) {
     return getFieldKind(fieldKinds, kind).changeHandler;
 }
-exports.getChangeHandler = getChangeHandler;
 function getFieldKind(fieldKinds, kind) {
     if (kind === genericFieldKind_js_1.genericFieldKind.identifier) {
         return genericFieldKind_js_1.genericFieldKind;
@@ -173,12 +185,11 @@ function newConstraintState(violationCount) {
         violationCount,
     };
 }
-exports.newConstraintState = newConstraintState;
 function updateConstraintsForFields(fields, parentInputAttachState, constraintState, nodes, fieldKinds) {
     for (const field of fields.values()) {
         const handler = getChangeHandler(fieldKinds, field.fieldKind);
-        for (const [nodeId, inputIndex, _outputIndex] of handler.getNestedChanges(field.change)) {
-            const isInputDetached = inputIndex === undefined;
+        for (const { nodeId, inputRootId } of handler.getNestedChanges(field.change)) {
+            const isInputDetached = inputRootId !== undefined;
             const inputAttachState = parentInputAttachState === fieldChangeHandler_js_1.NodeAttachState.Detached || isInputDetached
                 ? fieldChangeHandler_js_1.NodeAttachState.Detached
                 : fieldChangeHandler_js_1.NodeAttachState.Attached;
@@ -186,7 +197,6 @@ function updateConstraintsForFields(fields, parentInputAttachState, constraintSt
         }
     }
 }
-exports.updateConstraintsForFields = updateConstraintsForFields;
 function updateConstraintsForNode(nodeId, inputAttachState, nodes, constraintState, fieldKinds) {
     const node = nodes.get([nodeId.revision, nodeId.localId]) ?? (0, internal_1.fail)(0xb24 /* Unknown node ID */);
     if (node.nodeExistsConstraint !== undefined) {
@@ -208,5 +218,98 @@ function nodeChangeFromId(nodes, id) {
     (0, internal_1.assert)(node !== undefined, 0x9ca /* Unknown node ID */);
     return node;
 }
-exports.nodeChangeFromId = nodeChangeFromId;
+/**
+ * @returns The canonical form of nodeId, according to nodeAliases
+ */
+function normalizeNodeId(nodeId, nodeAliases) {
+    let currentId = nodeId;
+    while (true) {
+        const dealiased = (0, changeAtomIdBTree_js_1.getFromChangeAtomIdMap)(nodeAliases, currentId);
+        if (dealiased === undefined) {
+            return currentId;
+        }
+        currentId = dealiased;
+    }
+}
+function makeChangesetInversions(fields, nodes, fieldKinds) {
+    const crossFieldKeys = (0, modularChangeTypes_js_1.newCrossFieldKeyTable)();
+    const nodeToParent = (0, changeAtomIdBTree_js_1.newChangeAtomIdBTree)();
+    populateInversionsFromFieldMap(fields, undefined, fieldKinds, crossFieldKeys, nodeToParent);
+    nodes.forEachPair(([revision, localId], node) => {
+        if (node.fieldChanges !== undefined) {
+            populateInversionsFromFieldMap(node.fieldChanges, {
+                revision,
+                localId,
+            }, fieldKinds, crossFieldKeys, nodeToParent);
+        }
+    });
+    return { crossFieldKeys, nodeToParent };
+}
+function populateInversionsFromFieldMap(fields, parent, fieldKinds, crossFieldKeys, nodeToParent) {
+    for (const [fieldKey, fieldChange] of fields) {
+        const handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);
+        for (const { key, count } of handler.getCrossFieldKeys(fieldChange.change)) {
+            crossFieldKeys.set(key, count, { nodeId: parent, field: fieldKey });
+        }
+        for (const { nodeId } of handler.getNestedChanges(fieldChange.change)) {
+            nodeToParent.set([nodeId.revision, nodeId.localId], { nodeId: parent, field: fieldKey });
+        }
+    }
+}
+function validateChangeset(change, fieldKinds) {
+    let numNodes = validateFieldChanges(change, change.fieldChanges, undefined, fieldKinds);
+    for (const [[revision, localId], node] of change.nodeChanges.entries()) {
+        if (node.fieldChanges === undefined) {
+            continue;
+        }
+        const nodeId = { revision, localId };
+        const numChildren = validateFieldChanges(change, node.fieldChanges, nodeId, fieldKinds);
+        numNodes += numChildren;
+    }
+    (0, internal_1.assert)(numNodes === change.nodeChanges.size, 0xa4d /* Node table contains unparented nodes */);
+}
+/**
+ * Asserts that each child and cross field key in each field has a correct entry in
+ * `nodeToParent` or `crossFieldKeyTable`.
+ * @returns the number of children found.
+ */
+function validateFieldChanges(change, fieldChanges, nodeParent, fieldKinds) {
+    let numChildren = 0;
+    for (const [field, fieldChange] of fieldChanges.entries()) {
+        const fieldId = { nodeId: nodeParent, field };
+        const handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);
+        for (const { nodeId } of handler.getNestedChanges(fieldChange.change)) {
+            const parentFieldId = getParentFieldId(change, nodeId);
+            (0, internal_1.assert)(areEqualFieldIds(parentFieldId, fieldId), 0xa4e /* Inconsistent node parentage */);
+            numChildren += 1;
+        }
+        for (const keyRange of handler.getCrossFieldKeys(fieldChange.change)) {
+            const fields = getFieldsForCrossFieldKey(change, keyRange.key, keyRange.count);
+            (0, internal_1.assert)(fields.length === 1 && fields[0] !== undefined && areEqualFieldIds(fields[0], fieldId), 0xa4f /* Inconsistent cross field keys */);
+        }
+    }
+    return numChildren;
+}
+function getParentFieldId(changeset, nodeId) {
+    const parentId = (0, changeAtomIdBTree_js_1.getFromChangeAtomIdMap)(changeset.nodeToParent, nodeId);
+    (0, internal_1.assert)(parentId !== undefined, 0x9cb /* Parent field should be defined */);
+    return normalizeFieldId(parentId, changeset.nodeAliases);
+}
+function normalizeFieldId(fieldId, nodeAliases) {
+    return fieldId.nodeId === undefined
+        ? fieldId
+        : { ...fieldId, nodeId: normalizeNodeId(fieldId.nodeId, nodeAliases) };
+}
+function getFieldsForCrossFieldKey(changeset, key, count) {
+    const fieldIds = [];
+    for (const { value: fieldId } of changeset.crossFieldKeys.getAll(key, count)) {
+        if (fieldId !== undefined) {
+            fieldIds.push(normalizeFieldId(fieldId, changeset.nodeAliases));
+        }
+    }
+    return fieldIds;
+}
+function areEqualFieldIds(a, b) {
+    return (0, index_js_1.areEqualChangeAtomIdOpts)(a.nodeId, b.nodeId) && a.field === b.field;
+}
 //# sourceMappingURL=modularChangeUtils.js.map

package/dist/feature-libraries/modular-schema/modularChangeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"modularChangeUtils.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,kEAAmE;AACnE,kDAQ6B;AAC7B,kDAAiF;AACjF,kEAIiC;AACjC,iEAMgC;AAEhC,mEAA0D;AAE1D,+DAAyD;AACzD,mEAOiC;AAEjC,SAAgB,YAAY,CAAC,MAAwB;IACpD,OAAO,CAAC,MAAM,CAAC,wBAAwB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AACnD,CAAC;AAFD,oCAEC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CACnC,QAAuE,EAAE;IAEzE,MAAM,CAAC,GAAG,KAAK,CAAC;IAChB,MAAM,SAAS,GAA8B;QAC5C,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,IAAI,GAAG,EAAyB;QAChE,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,IAAA,2CAAoB,GAAE;QACpD,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,IAAA,2CAAoB,GAAE;QACtD,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,IAAA,2CAAoB,GAAE;QACpD,cAAc,EAAE,CAAC,CAAC,cAAc,IAAI,IAAA,6CAAqB,GAAE;KAC3D,CAAC;IAEF,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;IACnC,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,CAAC,CAAC,wBAAwB,KAAK,SAAS,IAAI,CAAC,CAAC,wBAAwB,GAAG,CAAC,EAAE,CAAC;QAChF,SAAS,CAAC,wBAAwB,GAAG,CAAC,CAAC,wBAAwB,CAAC;IACjE,CAAC;IACD,IAAI,CAAC,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACxC,SAAS,CAAC,kBAAkB,GAAG,CAAC,CAAC,kBAAkB,CAAC;IACrD,CAAC;IACD,IAAI,CAAC,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;QAChD,SAAS,CAAC,0BAA0B,GAAG,CAAC,CAAC,0BAA0B,CAAC;IACrE,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACjD,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACrD,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACzD,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC;IACrC,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AArCD,oDAqCC;AAYD,MAAsB,kBAAkB;IACvC,YACoB,eAAmC,EACrC,eAAkB,EAChB,aAAa,IAAI;QAFjB,oBAAe,GAAf,eAAe,CAAoB;QACrC,oBAAe,GAAf,eAAe,CAAG;QAChB,eAAU,GAAV,UAAU,CAAO;IAClC,CAAC;IAEG,GAAG,CACT,MAAwB,EACxB,QAAiC,EACjC,EAAoB,EACpB,KAAa,EACb,QAAiB,EACjB,oBAA6B;QAE7B,IAAI,oBAAoB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7C,MAAM,aAAa,GAAI,EAAa,GAAG,KAAK,GAAG,CAAC,CAAC;YACjD,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,OAAO,OAAO,IAAI,aAAa,EAAE,CAAC;gBACjC,MAAM,cAAc,GAAG,IAAA,gDAAyB,EAC/C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAC1B,QAAQ,EACR,OAAO,EACP,aAAa,GAAG,OAAO,GAAG,CAAC,CAC3B,CAAC;gBACF,IAAI,cAAc,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxC,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAClE,CAAC;gBAED,OAAO,GAAG,IAAA,gBAAK,EAAC,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC;QACF,CAAC;QACD,IAAA,yCAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAEM,GAAG,CACT,MAAwB,EACxB,QAAiC,EACjC,EAAoB,EACpB,KAAa,EACb,aAAsB;QAEtB,IAAI,aAAa,EAAE,CAAC;YACnB,wEAAwE;YACxE,sEAAsE;YACtE,0FAA0F;YAC1F,IAAA,yCAAkB,EACjB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAC1B,QAAQ,EACR,EAAE,EACF,KAAK,EACL,IAAI,CAAC,eAAe,CACpB,CAAC;QACH,CAAC;QACD,OAAO,IAAA,gDAAyB,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5E,CAAC;IAWO,MAAM,CAAC,MAAwB;QACtC,OAAO,MAAM,KAAK,uCAAgB,CAAC,MAAM;YACxC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ;YAC/B,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,MAAwB;QAC7C,OAAO,MAAM,KAAK,uCAAgB,CAAC,MAAM;YACxC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa;YACpC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;IACvC,CAAC;CACD;AA7ED,gDA6EC;AAED,SAAgB,kBAAkB;IACjC,OAAO;QACN,QAAQ,EAAE,IAAA,kCAAuB,GAAE;QACnC,QAAQ,EAAE,IAAA,kCAAuB,GAAE;QACnC,aAAa,EAAE,IAAA,kCAAuB,GAAE;QACxC,aAAa,EAAE,IAAA,kCAAuB,GAAE;QACxC,iBAAiB,EAAE,IAAI,GAAG,EAAE;KAC5B,CAAC;AACH,CAAC;AARD,gDAQC;AAED,SAAgB,2BAA2B,CAAC,OAAyC;IAIpF,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IACf,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAe,CAAC;IACzC,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;QAC9D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,mBAAmB,GAAkB,EAAE,CAAC;IAC9C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC;IAED,mBAAmB,CAAC,OAAO,EAAE,CAAC;IAC9B,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7B,CAAC;IACF,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAA,gBAAK,EAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAlCD,kEAkCC;AAED,SAAgB,4BAA4B,CAC3C,YAA4C;IAE5C,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,IAAI,YAAY,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACjD,QAAQ,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;SAAM,IAAI,YAAY,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,GAA0B,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC;QACxE,IAAI,YAAY,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QAC3C,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAdD,oEAcC;AAED,SAAgB,gBAAgB,CAC/B,UAA2D,EAC3D,IAAyB;IAEzB,OAAO,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,aAAa,CAAC;AACrD,CAAC;AALD,4CAKC;AAED,SAAS,YAAY,CACpB,UAA2D,EAC3D,IAAyB;IAEzB,IAAI,IAAI,KAAK,sCAAgB,CAAC,UAAU,EAAE,CAAC;QAC1C,OAAO,sCAAgB,CAAC;IACzB,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,IAAA,iBAAM,EAAC,SAAS,KAAK,SAAS,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAChE,OAAO,SAAS,CAAC;AAClB,CAAC;AAMD,SAAgB,kBAAkB,CAAC,cAAsB;IACxD,OAAO;QACN,cAAc;KACd,CAAC;AACH,CAAC;AAJD,gDAIC;AAED,SAAgB,0BAA0B,CACzC,MAAsB,EACtB,sBAAuC,EACvC,eAAgC,EAChC,KAAuC,EACvC,UAA2D;IAE3D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9D,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACzF,MAAM,eAAe,GAAG,UAAU,KAAK,SAAS,CAAC;YACjD,MAAM,gBAAgB,GACrB,sBAAsB,KAAK,uCAAe,CAAC,QAAQ,IAAI,eAAe;gBACrE,CAAC,CAAC,uCAAe,CAAC,QAAQ;gBAC1B,CAAC,CAAC,uCAAe,CAAC,QAAQ,CAAC;YAE7B,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QACxF,CAAC;IACF,CAAC;AACF,CAAC;AAnBD,gEAmBC;AAED,SAAS,wBAAwB,CAChC,MAAc,EACd,gBAAiC,EACjC,KAAuC,EACvC,eAAgC,EAChC,UAA2D;IAE3D,MAAM,IAAI,GACT,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,IAAA,eAAI,EAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACnF,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,gBAAgB,KAAK,uCAAe,CAAC,QAAQ,CAAC;QACpE,IAAI,IAAI,CAAC,oBAAoB,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC1D,IAAI,CAAC,oBAAoB,GAAG;gBAC3B,GAAG,IAAI,CAAC,oBAAoB;gBAC5B,QAAQ,EAAE,aAAa;aACvB,CAAC;YACF,eAAe,CAAC,cAAc,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACrC,0BAA0B,CACzB,IAAI,CAAC,YAAY,EACjB,gBAAgB,EAChB,eAAe,EACf,KAAK,EACL,UAAU,CACV,CAAC;IACH,CAAC;AACF,CAAC;AAED,SAAgB,gBAAgB,CAC/B,KAAuC,EACvC,EAAU;IAEV,MAAM,IAAI,GAAG,IAAA,6CAAsB,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,IAAA,iBAAM,EAAC,IAAI,KAAK,SAAS,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC;AACb,CAAC;AAPD,4CAOC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, fail } from \"@fluidframework/core-utils/internal\";\nimport {\n\tnewChangeAtomIdRangeMap,\n\ttype ChangesetLocalId,\n\ttype FieldKey,\n\ttype FieldKindIdentifier,\n\ttype RevisionInfo,\n\ttype RevisionTag,\n\ttype TaggedChange,\n} from \"../../core/index.js\";\nimport { brand, type Mutable, type RangeQueryResult } from \"../../util/index.js\";\nimport {\n\tgetFromChangeAtomIdMap,\n\tnewChangeAtomIdBTree,\n\ttype ChangeAtomIdBTree,\n} from \"../changeAtomIdBTree.js\";\nimport {\n\tCrossFieldTarget,\n\tgetFirstFromCrossFieldMap,\n\tsetInCrossFieldMap,\n\ttype CrossFieldManager,\n\ttype CrossFieldMap,\n} from \"./crossFieldQueries.js\";\nimport type { FieldChangeHandler } from \"./fieldChangeHandler.js\";\nimport { NodeAttachState } from \"./fieldChangeHandler.js\";\nimport type { FlexFieldKind } from \"./fieldKind.js\";\nimport { genericFieldKind } from \"./genericFieldKind.js\";\nimport {\n\tnewCrossFieldKeyTable,\n\ttype FieldChange,\n\ttype FieldChangeMap,\n\ttype ModularChangeset,\n\ttype NodeChangeset,\n\ttype NodeId,\n} from \"./modularChangeTypes.js\";\n\nexport function hasConflicts(change: ModularChangeset): boolean {\n\treturn (change.constraintViolationCount ?? 0) > 0;\n}\n\n/**\n * Creates a normalized changeset from the provided properties.\n *\n * Required changeset maps are initialized when omitted, and empty optional properties are not\n * included in the returned changeset. `maxId` accepts an unbranded allocator ID; `undefined`\n * indicates that the changeset contains no IDs.\n */\nexport function makeModularChangeset(\n\tprops: Partial<Omit<ModularChangeset, \"maxId\">> & { maxId?: number } = {},\n): ModularChangeset {\n\tconst p = props;\n\tconst changeset: Mutable<ModularChangeset> = {\n\t\tfieldChanges: p.fieldChanges ?? new Map<FieldKey, FieldChange>(),\n\t\tnodeChanges: p.nodeChanges ?? newChangeAtomIdBTree(),\n\t\tnodeToParent: p.nodeToParent ?? newChangeAtomIdBTree(),\n\t\tnodeAliases: p.nodeAliases ?? newChangeAtomIdBTree(),\n\t\tcrossFieldKeys: p.crossFieldKeys ?? newCrossFieldKeyTable(),\n\t};\n\n\tif (p.revisions !== undefined && p.revisions.length > 0) {\n\t\tchangeset.revisions = p.revisions;\n\t}\n\tif (p.maxId !== undefined && p.maxId >= 0) {\n\t\tchangeset.maxId = brand(p.maxId);\n\t}\n\tif (p.constraintViolationCount !== undefined && p.constraintViolationCount > 0) {\n\t\tchangeset.constraintViolationCount = p.constraintViolationCount;\n\t}\n\tif (p.noChangeConstraint !== undefined) {\n\t\tchangeset.noChangeConstraint = p.noChangeConstraint;\n\t}\n\tif (p.noChangeConstraintOnRevert !== undefined) {\n\t\tchangeset.noChangeConstraintOnRevert = p.noChangeConstraintOnRevert;\n\t}\n\tif (p.builds !== undefined && p.builds.size > 0) {\n\t\tchangeset.builds = p.builds;\n\t}\n\tif (p.destroys !== undefined && p.destroys.size > 0) {\n\t\tchangeset.destroys = p.destroys;\n\t}\n\tif (p.refreshers !== undefined && p.refreshers.size > 0) {\n\t\tchangeset.refreshers = p.refreshers;\n\t}\n\treturn changeset;\n}\n\n// TODO: TFieldData could instead just be a numeric ID generated by the CrossFieldTable\n// The CrossFieldTable could have a generic field ID to context table\nexport interface CrossFieldTable<TFieldData> {\n\tsrcTable: CrossFieldMap<unknown>;\n\tdstTable: CrossFieldMap<unknown>;\n\tsrcDependents: CrossFieldMap<TFieldData>;\n\tdstDependents: CrossFieldMap<TFieldData>;\n\tinvalidatedFields: Set<TFieldData>;\n}\n\nexport abstract class CrossFieldManagerI<T> implements CrossFieldManager {\n\tpublic constructor(\n\t\tprotected readonly crossFieldTable: CrossFieldTable<T>,\n\t\tprivate readonly currentFieldKey: T,\n\t\tprotected readonly allowInval = true,\n\t) {}\n\n\tpublic set(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t\tnewValue: unknown,\n\t\tinvalidateDependents: boolean,\n\t): void {\n\t\tif (invalidateDependents && this.allowInval) {\n\t\t\tconst lastChangedId = (id as number) + count - 1;\n\t\t\tlet firstId = id;\n\t\t\twhile (firstId <= lastChangedId) {\n\t\t\t\tconst dependentEntry = getFirstFromCrossFieldMap(\n\t\t\t\t\tthis.getDependents(target),\n\t\t\t\t\trevision,\n\t\t\t\t\tfirstId,\n\t\t\t\t\tlastChangedId - firstId + 1,\n\t\t\t\t);\n\t\t\t\tif (dependentEntry.value !== undefined) {\n\t\t\t\t\tthis.crossFieldTable.invalidatedFields.add(dependentEntry.value);\n\t\t\t\t}\n\n\t\t\t\tfirstId = brand(firstId + dependentEntry.length);\n\t\t\t}\n\t\t}\n\t\tsetInCrossFieldMap(this.getMap(target), revision, id, count, newValue);\n\t}\n\n\tpublic get(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t\taddDependency: boolean,\n\t): RangeQueryResult<unknown> {\n\t\tif (addDependency) {\n\t\t\t// We assume that if there is already an entry for this ID it is because\n\t\t\t// a field handler has called compose on the same node multiple times.\n\t\t\t// In this case we only want to update the latest version, so we overwrite the dependency.\n\t\t\tsetInCrossFieldMap(\n\t\t\t\tthis.getDependents(target),\n\t\t\t\trevision,\n\t\t\t\tid,\n\t\t\t\tcount,\n\t\t\t\tthis.currentFieldKey,\n\t\t\t);\n\t\t}\n\t\treturn getFirstFromCrossFieldMap(this.getMap(target), revision, id, count);\n\t}\n\n\tpublic abstract onMoveIn(id: NodeId): void;\n\n\tpublic abstract moveKey(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t): void;\n\n\tprivate getMap(target: CrossFieldTarget): CrossFieldMap<unknown> {\n\t\treturn target === CrossFieldTarget.Source\n\t\t\t? this.crossFieldTable.srcTable\n\t\t\t: this.crossFieldTable.dstTable;\n\t}\n\n\tprivate getDependents(target: CrossFieldTarget): CrossFieldMap<T> {\n\t\treturn target === CrossFieldTarget.Source\n\t\t\t? this.crossFieldTable.srcDependents\n\t\t\t: this.crossFieldTable.dstDependents;\n\t}\n}\n\nexport function newCrossFieldTable<T>(): CrossFieldTable<T> {\n\treturn {\n\t\tsrcTable: newChangeAtomIdRangeMap(),\n\t\tdstTable: newChangeAtomIdRangeMap(),\n\t\tsrcDependents: newChangeAtomIdRangeMap(),\n\t\tdstDependents: newChangeAtomIdRangeMap(),\n\t\tinvalidatedFields: new Set(),\n\t};\n}\n\nexport function getRevInfoFromTaggedChanges(changes: TaggedChange<ModularChangeset>[]): {\n\trevInfos: RevisionInfo[];\n\tmaxId: ChangesetLocalId;\n} {\n\tlet maxId = -1;\n\tconst revInfos: RevisionInfo[] = [];\n\tconst revisions = new Set<RevisionTag>();\n\tfor (const taggedChange of changes) {\n\t\tconst change = taggedChange.change;\n\t\tmaxId = Math.max(change.maxId ?? -1, maxId);\n\t\tconst infosToAdd = revisionInfoFromTaggedChange(taggedChange);\n\t\tfor (const info of infosToAdd) {\n\t\t\tif (!revisions.has(info.revision)) {\n\t\t\t\trevisions.add(info.revision);\n\t\t\t\trevInfos.push(info);\n\t\t\t}\n\t\t}\n\t}\n\n\tconst rolledBackRevisions: RevisionTag[] = [];\n\tfor (const info of revInfos) {\n\t\tif (info.rollbackOf !== undefined) {\n\t\t\trolledBackRevisions.push(info.rollbackOf);\n\t\t}\n\t}\n\n\trolledBackRevisions.reverse();\n\tfor (const revision of rolledBackRevisions) {\n\t\tif (!revisions.has(revision)) {\n\t\t\trevInfos.push({ revision });\n\t\t}\n\t}\n\n\treturn { maxId: brand(maxId), revInfos };\n}\n\nexport function revisionInfoFromTaggedChange(\n\ttaggedChange: TaggedChange<ModularChangeset>,\n): RevisionInfo[] {\n\tconst revInfos: RevisionInfo[] = [];\n\tif (taggedChange.change.revisions !== undefined) {\n\t\trevInfos.push(...taggedChange.change.revisions);\n\t} else if (taggedChange.revision !== undefined) {\n\t\tconst info: Mutable<RevisionInfo> = { revision: taggedChange.revision };\n\t\tif (taggedChange.rollbackOf !== undefined) {\n\t\t\tinfo.rollbackOf = taggedChange.rollbackOf;\n\t\t}\n\t\trevInfos.push(info);\n\t}\n\treturn revInfos;\n}\n\nexport function getChangeHandler(\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n\tkind: FieldKindIdentifier,\n): FieldChangeHandler<unknown> {\n\treturn getFieldKind(fieldKinds, kind).changeHandler;\n}\n\nfunction getFieldKind(\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n\tkind: FieldKindIdentifier,\n): FlexFieldKind {\n\tif (kind === genericFieldKind.identifier) {\n\t\treturn genericFieldKind;\n\t}\n\tconst fieldKind = fieldKinds.get(kind);\n\tassert(fieldKind !== undefined, 0x3ad /* Unknown field kind */);\n\treturn fieldKind;\n}\n\nexport interface ConstraintState {\n\tviolationCount: number;\n}\n\nexport function newConstraintState(violationCount: number): ConstraintState {\n\treturn {\n\t\tviolationCount,\n\t};\n}\n\nexport function updateConstraintsForFields(\n\tfields: FieldChangeMap,\n\tparentInputAttachState: NodeAttachState,\n\tconstraintState: ConstraintState,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): void {\n\tfor (const field of fields.values()) {\n\t\tconst handler = getChangeHandler(fieldKinds, field.fieldKind);\n\t\tfor (const [nodeId, inputIndex, _outputIndex] of handler.getNestedChanges(field.change)) {\n\t\t\tconst isInputDetached = inputIndex === undefined;\n\t\t\tconst inputAttachState =\n\t\t\t\tparentInputAttachState === NodeAttachState.Detached || isInputDetached\n\t\t\t\t\t? NodeAttachState.Detached\n\t\t\t\t\t: NodeAttachState.Attached;\n\n\t\t\tupdateConstraintsForNode(nodeId, inputAttachState, nodes, constraintState, fieldKinds);\n\t\t}\n\t}\n}\n\nfunction updateConstraintsForNode(\n\tnodeId: NodeId,\n\tinputAttachState: NodeAttachState,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tconstraintState: ConstraintState,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): void {\n\tconst node =\n\t\tnodes.get([nodeId.revision, nodeId.localId]) ?? fail(0xb24 /* Unknown node ID */);\n\tif (node.nodeExistsConstraint !== undefined) {\n\t\tconst isNowViolated = inputAttachState === NodeAttachState.Detached;\n\t\tif (node.nodeExistsConstraint.violated !== isNowViolated) {\n\t\t\tnode.nodeExistsConstraint = {\n\t\t\t\t...node.nodeExistsConstraint,\n\t\t\t\tviolated: isNowViolated,\n\t\t\t};\n\t\t\tconstraintState.violationCount += isNowViolated ? 1 : -1;\n\t\t}\n\t}\n\n\tif (node.fieldChanges !== undefined) {\n\t\tupdateConstraintsForFields(\n\t\t\tnode.fieldChanges,\n\t\t\tinputAttachState,\n\t\t\tconstraintState,\n\t\t\tnodes,\n\t\t\tfieldKinds,\n\t\t);\n\t}\n}\n\nexport function nodeChangeFromId(\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tid: NodeId,\n): NodeChangeset {\n\tconst node = getFromChangeAtomIdMap(nodes, id);\n\tassert(node !== undefined, 0x9ca /* Unknown node ID */);\n\treturn node;\n}\n"]}
+{"version":3,"file":"modularChangeUtils.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeUtils.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, fail } from \"@fluidframework/core-utils/internal\";\nimport {\n\tareEqualChangeAtomIdOpts,\n\tnewChangeAtomIdRangeMap,\n\ttype ChangesetLocalId,\n\ttype FieldKey,\n\ttype FieldKindIdentifier,\n\ttype RevisionInfo,\n\ttype RevisionTag,\n\ttype TaggedChange,\n} from \"../../core/index.js\";\nimport { brand, type Mutable, type RangeQueryResult } from \"../../util/index.js\";\nimport {\n\tgetFromChangeAtomIdMap,\n\tnewChangeAtomIdBTree,\n\ttype ChangeAtomIdBTree,\n} from \"../changeAtomIdBTree.js\";\nimport {\n\tCrossFieldTarget,\n\tgetFirstFromCrossFieldMap,\n\tsetInCrossFieldMap,\n\ttype CrossFieldManager,\n\ttype CrossFieldMap,\n} from \"./crossFieldQueries.js\";\nimport type { FieldChangeHandler } from \"./fieldChangeHandler.js\";\nimport { NodeAttachState } from \"./fieldChangeHandler.js\";\nimport type { FlexFieldKind } from \"./fieldKind.js\";\nimport { genericFieldKind } from \"./genericFieldKind.js\";\nimport {\n\tnewCrossFieldKeyTable,\n\ttype CrossFieldKey,\n\ttype CrossFieldKeyTable,\n\ttype FieldChange,\n\ttype FieldChangeMap,\n\ttype FieldId,\n\ttype ModularChangeset,\n\ttype NodeChangeset,\n\ttype NodeId,\n} from \"./modularChangeTypes.js\";\n\nexport function hasConflicts(change: ModularChangeset): boolean {\n\treturn (change.constraintViolationCount ?? 0) > 0;\n}\n\n/**\n * Creates a normalized changeset from the provided properties.\n *\n * Required changeset maps are initialized when omitted, and empty optional properties are not\n * included in the returned changeset. `maxId` accepts an unbranded allocator ID; `undefined`\n * indicates that the changeset contains no IDs.\n */\nexport function makeModularChangeset(\n\tprops: Partial<Omit<ModularChangeset, \"maxId\">> & { maxId?: number } = {},\n): ModularChangeset {\n\tconst p = props;\n\tconst changeset: Mutable<ModularChangeset> = {\n\t\tfieldChanges: p.fieldChanges ?? new Map<FieldKey, FieldChange>(),\n\t\tnodeChanges: p.nodeChanges ?? newChangeAtomIdBTree(),\n\t\tnodeToParent: p.nodeToParent ?? newChangeAtomIdBTree(),\n\t\tnodeAliases: p.nodeAliases ?? newChangeAtomIdBTree(),\n\t\tcrossFieldKeys: p.crossFieldKeys ?? newCrossFieldKeyTable(),\n\t};\n\n\tif (p.revisions !== undefined && p.revisions.length > 0) {\n\t\tchangeset.revisions = p.revisions;\n\t}\n\tif (p.maxId !== undefined && p.maxId >= 0) {\n\t\tchangeset.maxId = brand(p.maxId);\n\t}\n\tif (p.constraintViolationCount !== undefined && p.constraintViolationCount > 0) {\n\t\tchangeset.constraintViolationCount = p.constraintViolationCount;\n\t}\n\tif (p.noChangeConstraint !== undefined) {\n\t\tchangeset.noChangeConstraint = p.noChangeConstraint;\n\t}\n\tif (p.noChangeConstraintOnRevert !== undefined) {\n\t\tchangeset.noChangeConstraintOnRevert = p.noChangeConstraintOnRevert;\n\t}\n\tif (p.builds !== undefined && p.builds.size > 0) {\n\t\tchangeset.builds = p.builds;\n\t}\n\tif (p.destroys !== undefined && p.destroys.size > 0) {\n\t\tchangeset.destroys = p.destroys;\n\t}\n\tif (p.refreshers !== undefined && p.refreshers.size > 0) {\n\t\tchangeset.refreshers = p.refreshers;\n\t}\n\treturn changeset;\n}\n\n// TODO: TFieldData could instead just be a numeric ID generated by the CrossFieldTable\n// The CrossFieldTable could have a generic field ID to context table\nexport interface CrossFieldTable<TFieldData> {\n\tsrcTable: CrossFieldMap<unknown>;\n\tdstTable: CrossFieldMap<unknown>;\n\tsrcDependents: CrossFieldMap<TFieldData>;\n\tdstDependents: CrossFieldMap<TFieldData>;\n\tinvalidatedFields: Set<TFieldData>;\n}\n\nexport abstract class CrossFieldManagerI<T> implements CrossFieldManager {\n\tpublic constructor(\n\t\tprotected readonly crossFieldTable: CrossFieldTable<T>,\n\t\tprivate readonly currentFieldKey: T,\n\t\tprotected readonly allowInval = true,\n\t) {}\n\n\tpublic set(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t\tnewValue: unknown,\n\t\tinvalidateDependents: boolean,\n\t): void {\n\t\tif (invalidateDependents && this.allowInval) {\n\t\t\tconst lastChangedId = (id as number) + count - 1;\n\t\t\tlet firstId = id;\n\t\t\twhile (firstId <= lastChangedId) {\n\t\t\t\tconst dependentEntry = getFirstFromCrossFieldMap(\n\t\t\t\t\tthis.getDependents(target),\n\t\t\t\t\trevision,\n\t\t\t\t\tfirstId,\n\t\t\t\t\tlastChangedId - firstId + 1,\n\t\t\t\t);\n\t\t\t\tif (dependentEntry.value !== undefined) {\n\t\t\t\t\tthis.crossFieldTable.invalidatedFields.add(dependentEntry.value);\n\t\t\t\t}\n\n\t\t\t\tfirstId = brand(firstId + dependentEntry.length);\n\t\t\t}\n\t\t}\n\t\tsetInCrossFieldMap(this.getMap(target), revision, id, count, newValue);\n\t}\n\n\tpublic get(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t\taddDependency: boolean,\n\t): RangeQueryResult<unknown> {\n\t\tif (addDependency) {\n\t\t\t// We assume that if there is already an entry for this ID it is because\n\t\t\t// a field handler has called compose on the same node multiple times.\n\t\t\t// In this case we only want to update the latest version, so we overwrite the dependency.\n\t\t\tsetInCrossFieldMap(\n\t\t\t\tthis.getDependents(target),\n\t\t\t\trevision,\n\t\t\t\tid,\n\t\t\t\tcount,\n\t\t\t\tthis.currentFieldKey,\n\t\t\t);\n\t\t}\n\t\treturn getFirstFromCrossFieldMap(this.getMap(target), revision, id, count);\n\t}\n\n\tpublic abstract onMoveIn(id: NodeId): void;\n\n\tpublic abstract moveKey(\n\t\ttarget: CrossFieldTarget,\n\t\trevision: RevisionTag | undefined,\n\t\tid: ChangesetLocalId,\n\t\tcount: number,\n\t): void;\n\n\tprivate getMap(target: CrossFieldTarget): CrossFieldMap<unknown> {\n\t\treturn target === CrossFieldTarget.Source\n\t\t\t? this.crossFieldTable.srcTable\n\t\t\t: this.crossFieldTable.dstTable;\n\t}\n\n\tprivate getDependents(target: CrossFieldTarget): CrossFieldMap<T> {\n\t\treturn target === CrossFieldTarget.Source\n\t\t\t? this.crossFieldTable.srcDependents\n\t\t\t: this.crossFieldTable.dstDependents;\n\t}\n}\n\nexport function newCrossFieldTable<T>(): CrossFieldTable<T> {\n\treturn {\n\t\tsrcTable: newChangeAtomIdRangeMap(),\n\t\tdstTable: newChangeAtomIdRangeMap(),\n\t\tsrcDependents: newChangeAtomIdRangeMap(),\n\t\tdstDependents: newChangeAtomIdRangeMap(),\n\t\tinvalidatedFields: new Set(),\n\t};\n}\n\nexport function getRevInfoFromTaggedChanges(changes: TaggedChange<ModularChangeset>[]): {\n\trevInfos: RevisionInfo[];\n\tmaxId: ChangesetLocalId;\n} {\n\tlet maxId = -1;\n\tconst revInfos: RevisionInfo[] = [];\n\tconst revisions = new Set<RevisionTag>();\n\tfor (const taggedChange of changes) {\n\t\tconst change = taggedChange.change;\n\t\tmaxId = Math.max(change.maxId ?? -1, maxId);\n\t\tconst infosToAdd = revisionInfoFromTaggedChange(taggedChange);\n\t\tfor (const info of infosToAdd) {\n\t\t\tif (!revisions.has(info.revision)) {\n\t\t\t\trevisions.add(info.revision);\n\t\t\t\trevInfos.push(info);\n\t\t\t}\n\t\t}\n\t}\n\n\tconst rolledBackRevisions: RevisionTag[] = [];\n\tfor (const info of revInfos) {\n\t\tif (info.rollbackOf !== undefined) {\n\t\t\trolledBackRevisions.push(info.rollbackOf);\n\t\t}\n\t}\n\n\trolledBackRevisions.reverse();\n\tfor (const revision of rolledBackRevisions) {\n\t\tif (!revisions.has(revision)) {\n\t\t\trevInfos.push({ revision });\n\t\t}\n\t}\n\n\treturn { maxId: brand(maxId), revInfos };\n}\n\nexport function revisionInfoFromTaggedChange(\n\ttaggedChange: TaggedChange<ModularChangeset>,\n): RevisionInfo[] {\n\tconst revInfos: RevisionInfo[] = [];\n\tif (taggedChange.change.revisions !== undefined) {\n\t\trevInfos.push(...taggedChange.change.revisions);\n\t} else if (taggedChange.revision !== undefined) {\n\t\tconst info: Mutable<RevisionInfo> = { revision: taggedChange.revision };\n\t\tif (taggedChange.rollbackOf !== undefined) {\n\t\t\tinfo.rollbackOf = taggedChange.rollbackOf;\n\t\t}\n\t\trevInfos.push(info);\n\t}\n\treturn revInfos;\n}\n\nexport function getChangeHandler(\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n\tkind: FieldKindIdentifier,\n): FieldChangeHandler<unknown> {\n\treturn getFieldKind(fieldKinds, kind).changeHandler;\n}\n\nfunction getFieldKind(\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n\tkind: FieldKindIdentifier,\n): FlexFieldKind {\n\tif (kind === genericFieldKind.identifier) {\n\t\treturn genericFieldKind;\n\t}\n\tconst fieldKind = fieldKinds.get(kind);\n\tassert(fieldKind !== undefined, 0x3ad /* Unknown field kind */);\n\treturn fieldKind;\n}\n\nexport interface ConstraintState {\n\tviolationCount: number;\n}\n\nexport function newConstraintState(violationCount: number): ConstraintState {\n\treturn {\n\t\tviolationCount,\n\t};\n}\n\nexport function updateConstraintsForFields(\n\tfields: FieldChangeMap,\n\tparentInputAttachState: NodeAttachState,\n\tconstraintState: ConstraintState,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): void {\n\tfor (const field of fields.values()) {\n\t\tconst handler = getChangeHandler(fieldKinds, field.fieldKind);\n\t\tfor (const { nodeId, inputRootId } of handler.getNestedChanges(field.change)) {\n\t\t\tconst isInputDetached = inputRootId !== undefined;\n\t\t\tconst inputAttachState =\n\t\t\t\tparentInputAttachState === NodeAttachState.Detached || isInputDetached\n\t\t\t\t\t? NodeAttachState.Detached\n\t\t\t\t\t: NodeAttachState.Attached;\n\n\t\t\tupdateConstraintsForNode(nodeId, inputAttachState, nodes, constraintState, fieldKinds);\n\t\t}\n\t}\n}\n\nfunction updateConstraintsForNode(\n\tnodeId: NodeId,\n\tinputAttachState: NodeAttachState,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tconstraintState: ConstraintState,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): void {\n\tconst node =\n\t\tnodes.get([nodeId.revision, nodeId.localId]) ?? fail(0xb24 /* Unknown node ID */);\n\tif (node.nodeExistsConstraint !== undefined) {\n\t\tconst isNowViolated = inputAttachState === NodeAttachState.Detached;\n\t\tif (node.nodeExistsConstraint.violated !== isNowViolated) {\n\t\t\tnode.nodeExistsConstraint = {\n\t\t\t\t...node.nodeExistsConstraint,\n\t\t\t\tviolated: isNowViolated,\n\t\t\t};\n\t\t\tconstraintState.violationCount += isNowViolated ? 1 : -1;\n\t\t}\n\t}\n\n\tif (node.fieldChanges !== undefined) {\n\t\tupdateConstraintsForFields(\n\t\t\tnode.fieldChanges,\n\t\t\tinputAttachState,\n\t\t\tconstraintState,\n\t\t\tnodes,\n\t\t\tfieldKinds,\n\t\t);\n\t}\n}\n\nexport function nodeChangeFromId(\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tid: NodeId,\n): NodeChangeset {\n\tconst node = getFromChangeAtomIdMap(nodes, id);\n\tassert(node !== undefined, 0x9ca /* Unknown node ID */);\n\treturn node;\n}\n\n/**\n * @returns The canonical form of nodeId, according to nodeAliases\n */\nexport function normalizeNodeId(\n\tnodeId: NodeId,\n\tnodeAliases: ChangeAtomIdBTree<NodeId>,\n): NodeId {\n\tlet currentId = nodeId;\n\n\twhile (true) {\n\t\tconst dealiased = getFromChangeAtomIdMap(nodeAliases, currentId);\n\t\tif (dealiased === undefined) {\n\t\t\treturn currentId;\n\t\t}\n\n\t\tcurrentId = dealiased;\n\t}\n}\n\nexport function makeChangesetInversions(\n\tfields: FieldChangeMap,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): { crossFieldKeys: CrossFieldKeyTable; nodeToParent: ChangeAtomIdBTree<FieldId> } {\n\tconst crossFieldKeys: CrossFieldKeyTable = newCrossFieldKeyTable();\n\tconst nodeToParent: ChangeAtomIdBTree<FieldId> = newChangeAtomIdBTree();\n\tpopulateInversionsFromFieldMap(fields, undefined, fieldKinds, crossFieldKeys, nodeToParent);\n\n\tnodes.forEachPair(([revision, localId], node) => {\n\t\tif (node.fieldChanges !== undefined) {\n\t\t\tpopulateInversionsFromFieldMap(\n\t\t\t\tnode.fieldChanges,\n\t\t\t\t{\n\t\t\t\t\trevision,\n\t\t\t\t\tlocalId,\n\t\t\t\t},\n\t\t\t\tfieldKinds,\n\t\t\t\tcrossFieldKeys,\n\t\t\t\tnodeToParent,\n\t\t\t);\n\t\t}\n\t});\n\n\treturn { crossFieldKeys, nodeToParent };\n}\n\nfunction populateInversionsFromFieldMap(\n\tfields: FieldChangeMap,\n\tparent: NodeId | undefined,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n\tcrossFieldKeys: CrossFieldKeyTable,\n\tnodeToParent: ChangeAtomIdBTree<FieldId>,\n): void {\n\tfor (const [fieldKey, fieldChange] of fields) {\n\t\tconst handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);\n\t\tfor (const { key, count } of handler.getCrossFieldKeys(fieldChange.change)) {\n\t\t\tcrossFieldKeys.set(key, count, { nodeId: parent, field: fieldKey });\n\t\t}\n\n\t\tfor (const { nodeId } of handler.getNestedChanges(fieldChange.change)) {\n\t\t\tnodeToParent.set([nodeId.revision, nodeId.localId], { nodeId: parent, field: fieldKey });\n\t\t}\n\t}\n}\n\nexport function validateChangeset(\n\tchange: ModularChangeset,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): void {\n\tlet numNodes = validateFieldChanges(change, change.fieldChanges, undefined, fieldKinds);\n\n\tfor (const [[revision, localId], node] of change.nodeChanges.entries()) {\n\t\tif (node.fieldChanges === undefined) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst nodeId: NodeId = { revision, localId };\n\t\tconst numChildren = validateFieldChanges(change, node.fieldChanges, nodeId, fieldKinds);\n\n\t\tnumNodes += numChildren;\n\t}\n\n\tassert(\n\t\tnumNodes === change.nodeChanges.size,\n\t\t0xa4d /* Node table contains unparented nodes */,\n\t);\n}\n\n/**\n * Asserts that each child and cross field key in each field has a correct entry in\n * `nodeToParent` or `crossFieldKeyTable`.\n * @returns the number of children found.\n */\nfunction validateFieldChanges(\n\tchange: ModularChangeset,\n\tfieldChanges: FieldChangeMap,\n\tnodeParent: NodeId | undefined,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): number {\n\tlet numChildren = 0;\n\tfor (const [field, fieldChange] of fieldChanges.entries()) {\n\t\tconst fieldId = { nodeId: nodeParent, field };\n\t\tconst handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);\n\t\tfor (const { nodeId } of handler.getNestedChanges(fieldChange.change)) {\n\t\t\tconst parentFieldId = getParentFieldId(change, nodeId);\n\t\t\tassert(\n\t\t\t\tareEqualFieldIds(parentFieldId, fieldId),\n\t\t\t\t0xa4e /* Inconsistent node parentage */,\n\t\t\t);\n\t\t\tnumChildren += 1;\n\t\t}\n\n\t\tfor (const keyRange of handler.getCrossFieldKeys(fieldChange.change)) {\n\t\t\tconst fields = getFieldsForCrossFieldKey(change, keyRange.key, keyRange.count);\n\t\t\tassert(\n\t\t\t\tfields.length === 1 && fields[0] !== undefined && areEqualFieldIds(fields[0], fieldId),\n\t\t\t\t0xa4f /* Inconsistent cross field keys */,\n\t\t\t);\n\t\t}\n\t}\n\n\treturn numChildren;\n}\n\nexport function getParentFieldId(changeset: ModularChangeset, nodeId: NodeId): FieldId {\n\tconst parentId = getFromChangeAtomIdMap(changeset.nodeToParent, nodeId);\n\tassert(parentId !== undefined, 0x9cb /* Parent field should be defined */);\n\treturn normalizeFieldId(parentId, changeset.nodeAliases);\n}\n\nexport function normalizeFieldId(\n\tfieldId: FieldId,\n\tnodeAliases: ChangeAtomIdBTree<NodeId>,\n): FieldId {\n\treturn fieldId.nodeId === undefined\n\t\t? fieldId\n\t\t: { ...fieldId, nodeId: normalizeNodeId(fieldId.nodeId, nodeAliases) };\n}\n\nexport function getFieldsForCrossFieldKey(\n\tchangeset: ModularChangeset,\n\tkey: CrossFieldKey,\n\tcount: number,\n): FieldId[] {\n\tconst fieldIds: FieldId[] = [];\n\tfor (const { value: fieldId } of changeset.crossFieldKeys.getAll(key, count)) {\n\t\tif (fieldId !== undefined) {\n\t\t\tfieldIds.push(normalizeFieldId(fieldId, changeset.nodeAliases));\n\t\t}\n\t}\n\n\treturn fieldIds;\n}\n\nfunction areEqualFieldIds(a: FieldId, b: FieldId): boolean {\n\treturn areEqualChangeAtomIdOpts(a.nodeId, b.nodeId) && a.field === b.field;\n}\n"]}

package/dist/feature-libraries/modular-schema/prune.d.ts

@@ -3,8 +3,7 @@
  * Licensed under the MIT License.
  */
 import type { FieldKindIdentifier } from "../../core/index.js";
-import { type ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import type { FlexFieldKind } from "./fieldKind.js";
-import type { FieldChangeMap, NodeChangeset } from "./modularChangeTypes.js";
-export declare function pruneFieldMap(changeset: FieldChangeMap | undefined, nodeMap: ChangeAtomIdBTree<NodeChangeset>, fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>): FieldChangeMap | undefined;
+import type { ModularChangeset } from "./modularChangeTypes.js";
+export declare function pruneChangeset(changeset: ModularChangeset, fieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>): ModularChangeset;
 //# sourceMappingURL=prune.d.ts.map

package/dist/feature-libraries/modular-schema/prune.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/prune.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAU,MAAM,yBAAyB,CAAC;AAGrF,wBAAgB,aAAa,CAC5B,SAAS,EAAE,cAAc,GAAG,SAAS,EACrC,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,EACzC,UAAU,EAAE,WAAW,CAAC,mBAAmB,EAAE,aAAa,CAAC,GACzD,cAAc,GAAG,SAAS,CAmB5B"}
+{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/prune.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAoB,mBAAmB,EAAe,MAAM,qBAAqB,CAAC;AAG9F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAGX,gBAAgB,EAGhB,MAAM,yBAAyB,CAAC;AAGjC,wBAAgB,cAAc,CAC7B,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,WAAW,CAAC,mBAAmB,EAAE,aAAa,CAAC,GACzD,gBAAgB,CAkBlB"}

package/dist/feature-libraries/modular-schema/prune.js

@@ -4,40 +4,57 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneFieldMap = void 0;
+exports.pruneChangeset = pruneChangeset;
 const index_js_1 = require("../../util/index.js");
 const changeAtomIdBTree_js_1 = require("../changeAtomIdBTree.js");
 const modularChangeUtils_js_1 = require("./modularChangeUtils.js");
-function pruneFieldMap(changeset, nodeMap, fieldKinds) {
+function pruneChangeset(changeset, fieldKinds) {
+    const prunedChangeset = {
+        ...changeset,
+        nodeChanges: changeset.nodeChanges.clone(),
+        nodeToParent: changeset.nodeToParent.clone(),
+        nodeAliases: changeset.nodeAliases.clone(),
+    };
+    prunedChangeset.fieldChanges =
+        pruneFieldMap(prunedChangeset.fieldChanges, prunedChangeset.nodeChanges, prunedChangeset.nodeToParent, prunedChangeset.nodeAliases, fieldKinds) ?? new Map();
+    return prunedChangeset;
+}
+function pruneFieldMap(changeset, nodes, nodeToParent, nodeAliases, fieldKinds) {
     if (changeset === undefined) {
         return undefined;
     }
     const prunedChangeset = new Map();
     for (const [field, fieldChange] of changeset) {
         const handler = (0, modularChangeUtils_js_1.getChangeHandler)(fieldKinds, fieldChange.fieldKind);
-        const prunedFieldChangeset = handler.rebaser.prune(fieldChange.change, (nodeId) => pruneNodeChange(nodeId, nodeMap, fieldKinds));
+        const prunedFieldChangeset = handler.rebaser.prune(fieldChange.change, (nodeId) => pruneNodeChange(nodeId, nodes, nodeToParent, nodeAliases, fieldKinds));
         if (!handler.isEmpty(prunedFieldChangeset)) {
             prunedChangeset.set(field, { ...fieldChange, change: (0, index_js_1.brand)(prunedFieldChangeset) });
         }
     }
     return prunedChangeset.size > 0 ? prunedChangeset : undefined;
 }
-exports.pruneFieldMap = pruneFieldMap;
-function pruneNodeChange(nodeId, nodeMap, fieldKinds) {
+function pruneNodeChange(nodeId, nodeMap, nodeToParent, nodeAliases, fieldKinds) {
     const changeset = (0, modularChangeUtils_js_1.nodeChangeFromId)(nodeMap, nodeId);
     const prunedFields = changeset.fieldChanges === undefined
         ? undefined
-        : pruneFieldMap(changeset.fieldChanges, nodeMap, fieldKinds);
+        : pruneFieldMap(changeset.fieldChanges, nodeMap, nodeToParent, nodeAliases, fieldKinds);
     const prunedChange = { ...changeset, fieldChanges: prunedFields };
     if (prunedChange.fieldChanges === undefined) {
         delete prunedChange.fieldChanges;
     }
+    const normalizedNodeId = (0, modularChangeUtils_js_1.normalizeNodeId)(nodeId, nodeAliases);
     if (isEmptyNodeChangeset(prunedChange)) {
-        nodeMap.delete([nodeId.revision, nodeId.localId]);
+        const nodeIdKey = [
+            normalizedNodeId.revision,
+            normalizedNodeId.localId,
+        ];
+        nodeMap.delete(nodeIdKey);
+        nodeToParent.delete(nodeIdKey);
+        // TODO: Also remove aliases for this node.
         return undefined;
     }
     else {
-        (0, changeAtomIdBTree_js_1.setInChangeAtomIdMap)(nodeMap, nodeId, prunedChange);
+        (0, changeAtomIdBTree_js_1.setInChangeAtomIdMap)(nodeMap, normalizedNodeId, prunedChange);
         return nodeId;
     }
 }

package/dist/feature-libraries/modular-schema/prune.js.map

@@ -1 +1 @@
-{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/prune.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,kDAA4C;AAC5C,kEAAuF;AAGvF,mEAA6E;AAE7E,SAAgB,aAAa,CAC5B,SAAqC,EACrC,OAAyC,EACzC,UAA2D;IAE3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,eAAe,GAAmB,IAAI,GAAG,EAAE,CAAC;IAClD,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,SAAS,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,wCAAgB,EAAC,UAAU,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpE,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CACjF,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAC5C,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC5C,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,IAAA,gBAAK,EAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QACrF,CAAC;IACF,CAAC;IAED,OAAO,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAvBD,sCAuBC;AAED,SAAS,eAAe,CACvB,MAAc,EACd,OAAyC,EACzC,UAA2D;IAE3D,MAAM,SAAS,GAAG,IAAA,wCAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,YAAY,GACjB,SAAS,CAAC,YAAY,KAAK,SAAS;QACnC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,EAAE,GAAG,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IAClE,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,YAAY,CAAC,YAAY,CAAC;IAClC,CAAC;IAED,IAAI,oBAAoB,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAClD,OAAO,SAAS,CAAC;IAClB,CAAC;SAAM,CAAC;QACP,IAAA,2CAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IACf,CAAC;AACF,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAqB;IAClD,OAAO,CACN,MAAM,CAAC,YAAY,KAAK,SAAS;QACjC,MAAM,CAAC,oBAAoB,KAAK,SAAS;QACzC,MAAM,CAAC,4BAA4B,KAAK,SAAS,CACjD,CAAC;AACH,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { FieldKindIdentifier } from \"../../core/index.js\";\nimport { brand } from \"../../util/index.js\";\nimport { setInChangeAtomIdMap, type ChangeAtomIdBTree } from \"../changeAtomIdBTree.js\";\nimport type { FlexFieldKind } from \"./fieldKind.js\";\nimport type { FieldChangeMap, NodeChangeset, NodeId } from \"./modularChangeTypes.js\";\nimport { getChangeHandler, nodeChangeFromId } from \"./modularChangeUtils.js\";\n\nexport function pruneFieldMap(\n\tchangeset: FieldChangeMap | undefined,\n\tnodeMap: ChangeAtomIdBTree<NodeChangeset>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): FieldChangeMap | undefined {\n\tif (changeset === undefined) {\n\t\treturn undefined;\n\t}\n\n\tconst prunedChangeset: FieldChangeMap = new Map();\n\tfor (const [field, fieldChange] of changeset) {\n\t\tconst handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);\n\n\t\tconst prunedFieldChangeset = handler.rebaser.prune(fieldChange.change, (nodeId) =>\n\t\t\tpruneNodeChange(nodeId, nodeMap, fieldKinds),\n\t\t);\n\n\t\tif (!handler.isEmpty(prunedFieldChangeset)) {\n\t\t\tprunedChangeset.set(field, { ...fieldChange, change: brand(prunedFieldChangeset) });\n\t\t}\n\t}\n\n\treturn prunedChangeset.size > 0 ? prunedChangeset : undefined;\n}\n\nfunction pruneNodeChange(\n\tnodeId: NodeId,\n\tnodeMap: ChangeAtomIdBTree<NodeChangeset>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): NodeId | undefined {\n\tconst changeset = nodeChangeFromId(nodeMap, nodeId);\n\tconst prunedFields =\n\t\tchangeset.fieldChanges === undefined\n\t\t\t? undefined\n\t\t\t: pruneFieldMap(changeset.fieldChanges, nodeMap, fieldKinds);\n\n\tconst prunedChange = { ...changeset, fieldChanges: prunedFields };\n\tif (prunedChange.fieldChanges === undefined) {\n\t\tdelete prunedChange.fieldChanges;\n\t}\n\n\tif (isEmptyNodeChangeset(prunedChange)) {\n\t\tnodeMap.delete([nodeId.revision, nodeId.localId]);\n\t\treturn undefined;\n\t} else {\n\t\tsetInChangeAtomIdMap(nodeMap, nodeId, prunedChange);\n\t\treturn nodeId;\n\t}\n}\n\nfunction isEmptyNodeChangeset(change: NodeChangeset): boolean {\n\treturn (\n\t\tchange.fieldChanges === undefined &&\n\t\tchange.nodeExistsConstraint === undefined &&\n\t\tchange.nodeExistsConstraintOnRevert === undefined\n\t);\n}\n"]}
+{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/prune.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 type { ChangesetLocalId, FieldKindIdentifier, RevisionTag } from \"../../core/index.js\";\nimport { brand, type Mutable } from \"../../util/index.js\";\nimport { setInChangeAtomIdMap, type ChangeAtomIdBTree } from \"../changeAtomIdBTree.js\";\nimport type { FlexFieldKind } from \"./fieldKind.js\";\nimport type {\n\tFieldChangeMap,\n\tFieldId,\n\tModularChangeset,\n\tNodeChangeset,\n\tNodeId,\n} from \"./modularChangeTypes.js\";\nimport { getChangeHandler, nodeChangeFromId, normalizeNodeId } from \"./modularChangeUtils.js\";\n\nexport function pruneChangeset(\n\tchangeset: ModularChangeset,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): ModularChangeset {\n\tconst prunedChangeset: Mutable<ModularChangeset> = {\n\t\t...changeset,\n\t\tnodeChanges: changeset.nodeChanges.clone(),\n\t\tnodeToParent: changeset.nodeToParent.clone(),\n\t\tnodeAliases: changeset.nodeAliases.clone(),\n\t};\n\n\tprunedChangeset.fieldChanges =\n\t\tpruneFieldMap(\n\t\t\tprunedChangeset.fieldChanges,\n\t\t\tprunedChangeset.nodeChanges,\n\t\t\tprunedChangeset.nodeToParent,\n\t\t\tprunedChangeset.nodeAliases,\n\t\t\tfieldKinds,\n\t\t) ?? new Map();\n\n\treturn prunedChangeset;\n}\n\nfunction pruneFieldMap(\n\tchangeset: FieldChangeMap | undefined,\n\tnodes: ChangeAtomIdBTree<NodeChangeset>,\n\tnodeToParent: ChangeAtomIdBTree<FieldId>,\n\tnodeAliases: ChangeAtomIdBTree<NodeId>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): FieldChangeMap | undefined {\n\tif (changeset === undefined) {\n\t\treturn undefined;\n\t}\n\n\tconst prunedChangeset: FieldChangeMap = new Map();\n\tfor (const [field, fieldChange] of changeset) {\n\t\tconst handler = getChangeHandler(fieldKinds, fieldChange.fieldKind);\n\n\t\tconst prunedFieldChangeset = handler.rebaser.prune(fieldChange.change, (nodeId) =>\n\t\t\tpruneNodeChange(nodeId, nodes, nodeToParent, nodeAliases, fieldKinds),\n\t\t);\n\n\t\tif (!handler.isEmpty(prunedFieldChangeset)) {\n\t\t\tprunedChangeset.set(field, { ...fieldChange, change: brand(prunedFieldChangeset) });\n\t\t}\n\t}\n\n\treturn prunedChangeset.size > 0 ? prunedChangeset : undefined;\n}\n\nfunction pruneNodeChange(\n\tnodeId: NodeId,\n\tnodeMap: ChangeAtomIdBTree<NodeChangeset>,\n\tnodeToParent: ChangeAtomIdBTree<FieldId>,\n\tnodeAliases: ChangeAtomIdBTree<NodeId>,\n\tfieldKinds: ReadonlyMap<FieldKindIdentifier, FlexFieldKind>,\n): NodeId | undefined {\n\tconst changeset = nodeChangeFromId(nodeMap, nodeId);\n\tconst prunedFields =\n\t\tchangeset.fieldChanges === undefined\n\t\t\t? undefined\n\t\t\t: pruneFieldMap(changeset.fieldChanges, nodeMap, nodeToParent, nodeAliases, fieldKinds);\n\n\tconst prunedChange = { ...changeset, fieldChanges: prunedFields };\n\tif (prunedChange.fieldChanges === undefined) {\n\t\tdelete prunedChange.fieldChanges;\n\t}\n\n\tconst normalizedNodeId = normalizeNodeId(nodeId, nodeAliases);\n\tif (isEmptyNodeChangeset(prunedChange)) {\n\t\tconst nodeIdKey: [RevisionTag | undefined, ChangesetLocalId] = [\n\t\t\tnormalizedNodeId.revision,\n\t\t\tnormalizedNodeId.localId,\n\t\t];\n\n\t\tnodeMap.delete(nodeIdKey);\n\t\tnodeToParent.delete(nodeIdKey);\n\n\t\t// TODO: Also remove aliases for this node.\n\t\treturn undefined;\n\t} else {\n\t\tsetInChangeAtomIdMap(nodeMap, normalizedNodeId, prunedChange);\n\t\treturn nodeId;\n\t}\n}\n\nfunction isEmptyNodeChangeset(change: NodeChangeset): boolean {\n\treturn (\n\t\tchange.fieldChanges === undefined &&\n\t\tchange.nodeExistsConstraint === undefined &&\n\t\tchange.nodeExistsConstraintOnRevert === undefined\n\t);\n}\n"]}