@fluidframework/tree 2.74.0-370705 → 2.80.0

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

@@ -8,7 +8,7 @@ import { type JsonCompatibleReadOnly } from "../../util/index.js";
 export declare const ChangesetLocalIdSchema: import("@sinclair/typebox").TUnsafe<ChangesetLocalId>;
 export declare const EncodedChangeAtomId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<ChangesetLocalId>]>;
 export type EncodedChangeAtomId = Static<typeof EncodedChangeAtomId>;
-declare const EncodedFieldChange: import("@sinclair/typebox").TObject<{
+export declare const EncodedFieldChange: import("@sinclair/typebox").TObject<{
     fieldKey: import("@sinclair/typebox").TUnsafe<schemaFormatV1.FieldKey>;
     fieldKind: import("@sinclair/typebox").TUnsafe<schemaFormatV1.FieldKindIdentifier>;
     change: import("@sinclair/typebox").TAny;
@@ -106,7 +106,7 @@ export declare const EncodedBuilds: import("@sinclair/typebox").TObject<{
     }>]>;
 }>;
 export type EncodedBuilds = Static<typeof EncodedBuilds>;
-export declare const EncodedModularChangeset: import("@sinclair/typebox").TObject<{
+export declare const EncodedModularChangesetV1: import("@sinclair/typebox").TObject<{
     maxId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<ChangesetLocalId>>;
     changes: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         fieldKey: import("@sinclair/typebox").TUnsafe<schemaFormatV1.FieldKey>;
@@ -214,6 +214,5 @@ export declare const EncodedModularChangeset: import("@sinclair/typebox").TObjec
      */
     violations: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
 }>;
-export type EncodedModularChangeset = Static<typeof EncodedModularChangeset>;
-export {};
+export type EncodedModularChangesetV1 = Static<typeof EncodedModularChangesetV1>;
 //# sourceMappingURL=modularChangeFormatV1.d.ts.map

package/lib/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,EAAsB,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAqB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EACN,KAAK,sBAAsB,EAG3B,MAAM,qBAAqB,CAAC;AAK7B,eAAO,MAAM,sBAAsB,uDAEjC,CAAC;AAEH,eAAO,MAAM,mBAAmB,2aAG9B,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,QAAA,MAAM,kBAAkB;;;;EAUvB,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,qCAA6C,CAAC;AAE3E,eAAO,MAAM,YAAY,sKAOxB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,kBAAkB,mtBAM9B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEnE,eAAO,MAAM,aAAa;;IAGxB;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;QAXlC;;;WAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAHH;;;WAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkBH;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"modularChangeFormatV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAsB,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAqB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EACN,KAAK,sBAAsB,EAG3B,MAAM,qBAAqB,CAAC;AAK7B,eAAO,MAAM,sBAAsB,uDAEjC,CAAC;AAEH,eAAO,MAAM,mBAAmB,2aAG9B,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,qCAA6C,CAAC;AAE3E,eAAO,MAAM,YAAY,sKAOxB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,kBAAkB,mtBAM9B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEnE,eAAO,MAAM,aAAa;;IAGxB;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;QAXpC;;;WAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAHH;;;WAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiBH;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC"}

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

@@ -14,7 +14,7 @@ export const EncodedChangeAtomId = Type.Union([
     Type.Tuple([ChangesetLocalIdSchema, RevisionTagSchema]),
     ChangesetLocalIdSchema,
 ]);
-const EncodedFieldChange = Type.Object({
+export const EncodedFieldChange = Type.Object({
     fieldKey: schemaFormatV1.FieldKeySchema,
     fieldKind: schemaFormatV1.FieldKindIdentifierSchema,
     // Implementation note: node and field change encoding is mutually recursive.
@@ -57,7 +57,7 @@ export const EncodedBuilds = Type.Object({
      */
     trees: EncodedFieldBatch,
 }, noAdditionalProps);
-export const EncodedModularChangeset = Type.Object({
+export const EncodedModularChangesetV1 = Type.Object({
     maxId: Type.Optional(ChangesetLocalIdSchema),
     changes: EncodedFieldChangeMap,
     revisions: Type.ReadonlyOptional(Type.Array(EncodedRevisionInfo)),

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

@@ -1 +1 @@
-{"version":3,"file":"modularChangeFormatV1.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAyB,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAEN,4BAA4B,EAC5B,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAmB;IACzE,UAAU,EAAE,CAAC;CACb,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;IACvD,sBAAsB;CACtB,CAAC,CAAC;AAGH,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CACrC;IACC,QAAQ,EAAE,cAAc,CAAC,cAAc;IACvC,SAAS,EAAE,cAAc,CAAC,yBAAyB;IACnD,6EAA6E;IAC7E,0FAA0F;IAC1F,0GAA0G;IAC1G,MAAM,EAAE,4BAA4B;CACpC,EACD,iBAAiB,CACjB,CAAC;AASF,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAWpE,MAAM,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;CACxB,EACD,iBAAiB,CACjB,CAAC;AAGF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IAClD,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;CAChE,EACD,iBAAiB,CACjB,CAAC;AAOF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAC7C;IACC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1C,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;CACpD,EACD,iBAAiB,CACjB,CAAC;AAIF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CACrC,IAAI,CAAC,KAAK,CAAC;IACV,oBAAoB;IACpB,sBAAsB;IACtB,sDAAsD;IACtD,gBAAgB;CAChB,CAAC,CACF,CAAC;AAGF,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAC3C,IAAI,CAAC,KAAK,CAAC;IACV,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAC7C,qCAAqC;IACrC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC;CAC1B,CAAC,CACF,CAAC;AAIF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CACvC;IACC,MAAM,EAAE,kBAAkB;IAC1B;;;OAGG;IACH,KAAK,EAAE,iBAAiB;CACxB,EACD,iBAAiB,CACjB,CAAC;AAIF,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC,MAAM,CACjD;IACC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAC5C,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACjE,oHAAoH;IACpH,wGAAwG;IACxG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IACpC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IAExC;;OAEG;IACH,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;CACrE,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ObjectOptions, type Static, Type } from \"@sinclair/typebox\";\n\nimport { type ChangesetLocalId, RevisionTagSchema, schemaFormatV1 } from \"../../core/index.js\";\nimport {\n\ttype JsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tbrandedNumberType,\n} from \"../../util/index.js\";\nimport { EncodedFieldBatch } from \"../chunked-forest/index.js\";\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nexport const ChangesetLocalIdSchema = brandedNumberType<ChangesetLocalId>({\n\tmultipleOf: 1,\n});\n\nexport const EncodedChangeAtomId = Type.Union([\n\tType.Tuple([ChangesetLocalIdSchema, RevisionTagSchema]),\n\tChangesetLocalIdSchema,\n]);\nexport type EncodedChangeAtomId = Static<typeof EncodedChangeAtomId>;\n\nconst EncodedFieldChange = Type.Object(\n\t{\n\t\tfieldKey: schemaFormatV1.FieldKeySchema,\n\t\tfieldKind: schemaFormatV1.FieldKindIdentifierSchema,\n\t\t// Implementation note: node and field change encoding is mutually recursive.\n\t\t// This field marks a boundary in that recursion to avoid constructing excessively complex\n\t\t// recursive types. Encoded changes are validated at this boundary at runtime--see modularChangeCodecs.ts.\n\t\tchange: JsonCompatibleReadOnlySchema,\n\t},\n\tnoAdditionalProps,\n);\n\nexport interface EncodedFieldChange extends Static<typeof EncodedFieldChange> {\n\t/**\n\t * Encoded in format selected by `fieldKind`\n\t */\n\tchange: JsonCompatibleReadOnly;\n}\n\nexport const EncodedFieldChangeMap = Type.Array(EncodedFieldChange);\n\n/**\n * Format for encoding as json.\n *\n * This chooses to use lists of named objects instead of maps:\n * this choice is somewhat arbitrary, but avoids user data being used as object keys,\n * which can sometimes be an issue (for example handling that for \"__proto__\" can require care).\n */\nexport type EncodedFieldChangeMap = Static<typeof EncodedFieldChangeMap>;\n\nconst EncodedNodeExistsConstraint = Type.Object(\n\t{\n\t\tviolated: Type.Boolean(),\n\t},\n\tnoAdditionalProps,\n);\ntype EncodedNodeExistsConstraint = Static<typeof EncodedNodeExistsConstraint>;\n\nexport const EncodedNodeChangeset = Type.Object(\n\t{\n\t\tfieldChanges: Type.Optional(EncodedFieldChangeMap),\n\t\tnodeExistsConstraint: Type.Optional(EncodedNodeExistsConstraint),\n\t},\n\tnoAdditionalProps,\n);\n\n/**\n * Format for encoding as json.\n */\nexport type EncodedNodeChangeset = Static<typeof EncodedNodeChangeset>;\n\nexport const EncodedRevisionInfo = Type.Object(\n\t{\n\t\trevision: Type.Readonly(RevisionTagSchema),\n\t\trollbackOf: Type.ReadonlyOptional(RevisionTagSchema),\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedRevisionInfo = Static<typeof EncodedRevisionInfo>;\n\n/**\n * Index of field in an EncodedFieldBatch.\n */\nexport const EncodedTreeIndex = Type.Number({ multipleOf: 1, minimum: 0 });\n\nexport const CommitBuilds = Type.Array(\n\tType.Tuple([\n\t\t// ID for first node\n\t\tChangesetLocalIdSchema,\n\t\t// Index for a TreeChunk that represents all the nodes\n\t\tEncodedTreeIndex,\n\t]),\n);\nexport type CommitBuilds = Static<typeof CommitBuilds>;\n\nexport const EncodedBuildsArray = Type.Array(\n\tType.Union([\n\t\tType.Tuple([CommitBuilds, RevisionTagSchema]),\n\t\t// Revision is omitted when undefined\n\t\tType.Tuple([CommitBuilds]),\n\t]),\n);\n\nexport type EncodedBuildsArray = Static<typeof EncodedBuildsArray>;\n\nexport const EncodedBuilds = Type.Object(\n\t{\n\t\tbuilds: EncodedBuildsArray,\n\t\t/**\n\t\t * Fields indexed by the EncodedTreeIndexes above.\n\t\t * TODO: Strongly typing this here may result in redundant schema validation of this data.\n\t\t */\n\t\ttrees: EncodedFieldBatch,\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedBuilds = Static<typeof EncodedBuilds>;\n\nexport const EncodedModularChangeset = Type.Object(\n\t{\n\t\tmaxId: Type.Optional(ChangesetLocalIdSchema),\n\t\tchanges: EncodedFieldChangeMap,\n\t\trevisions: Type.ReadonlyOptional(Type.Array(EncodedRevisionInfo)),\n\t\t// TODO#8574: separating `builds` and `refreshers` here means that we encode their `EncodedBuilds.trees` separately.\n\t\t// This can lead to a less efficient wire representation because of duplicated schema/shape information.\n\t\tbuilds: Type.Optional(EncodedBuilds),\n\t\trefreshers: Type.Optional(EncodedBuilds),\n\n\t\t/**\n\t\t * The number of constraints within this changeset that are violated.\n\t\t */\n\t\tviolations: Type.Optional(Type.Number({ minimum: 0, multipleOf: 1 })),\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedModularChangeset = Static<typeof EncodedModularChangeset>;\n"]}
+{"version":3,"file":"modularChangeFormatV1.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAyB,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAEN,4BAA4B,EAC5B,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAmB;IACzE,UAAU,EAAE,CAAC;CACb,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;IACvD,sBAAsB;CACtB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAC5C;IACC,QAAQ,EAAE,cAAc,CAAC,cAAc;IACvC,SAAS,EAAE,cAAc,CAAC,yBAAyB;IACnD,6EAA6E;IAC7E,0FAA0F;IAC1F,0GAA0G;IAC1G,MAAM,EAAE,4BAA4B;CACpC,EACD,iBAAiB,CACjB,CAAC;AASF,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAWpE,MAAM,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;CACxB,EACD,iBAAiB,CACjB,CAAC;AAGF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IAClD,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;CAChE,EACD,iBAAiB,CACjB,CAAC;AAOF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAC7C;IACC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1C,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;CACpD,EACD,iBAAiB,CACjB,CAAC;AAIF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CACrC,IAAI,CAAC,KAAK,CAAC;IACV,oBAAoB;IACpB,sBAAsB;IACtB,sDAAsD;IACtD,gBAAgB;CAChB,CAAC,CACF,CAAC;AAGF,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAC3C,IAAI,CAAC,KAAK,CAAC;IACV,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAC7C,qCAAqC;IACrC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC;CAC1B,CAAC,CACF,CAAC;AAIF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CACvC;IACC,MAAM,EAAE,kBAAkB;IAC1B;;;OAGG;IACH,KAAK,EAAE,iBAAiB;CACxB,EACD,iBAAiB,CACjB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,MAAM,CACnD;IACC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAC5C,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACjE,oHAAoH;IACpH,wGAAwG;IACxG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IACpC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IACxC;;OAEG;IACH,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;CACrE,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ObjectOptions, type Static, Type } from \"@sinclair/typebox\";\n\nimport { type ChangesetLocalId, RevisionTagSchema, schemaFormatV1 } from \"../../core/index.js\";\nimport {\n\ttype JsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tbrandedNumberType,\n} from \"../../util/index.js\";\nimport { EncodedFieldBatch } from \"../chunked-forest/index.js\";\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nexport const ChangesetLocalIdSchema = brandedNumberType<ChangesetLocalId>({\n\tmultipleOf: 1,\n});\n\nexport const EncodedChangeAtomId = Type.Union([\n\tType.Tuple([ChangesetLocalIdSchema, RevisionTagSchema]),\n\tChangesetLocalIdSchema,\n]);\nexport type EncodedChangeAtomId = Static<typeof EncodedChangeAtomId>;\n\nexport const EncodedFieldChange = Type.Object(\n\t{\n\t\tfieldKey: schemaFormatV1.FieldKeySchema,\n\t\tfieldKind: schemaFormatV1.FieldKindIdentifierSchema,\n\t\t// Implementation note: node and field change encoding is mutually recursive.\n\t\t// This field marks a boundary in that recursion to avoid constructing excessively complex\n\t\t// recursive types. Encoded changes are validated at this boundary at runtime--see modularChangeCodecs.ts.\n\t\tchange: JsonCompatibleReadOnlySchema,\n\t},\n\tnoAdditionalProps,\n);\n\nexport interface EncodedFieldChange extends Static<typeof EncodedFieldChange> {\n\t/**\n\t * Encoded in format selected by `fieldKind`\n\t */\n\tchange: JsonCompatibleReadOnly;\n}\n\nexport const EncodedFieldChangeMap = Type.Array(EncodedFieldChange);\n\n/**\n * Format for encoding as json.\n *\n * This chooses to use lists of named objects instead of maps:\n * this choice is somewhat arbitrary, but avoids user data being used as object keys,\n * which can sometimes be an issue (for example handling that for \"__proto__\" can require care).\n */\nexport type EncodedFieldChangeMap = Static<typeof EncodedFieldChangeMap>;\n\nconst EncodedNodeExistsConstraint = Type.Object(\n\t{\n\t\tviolated: Type.Boolean(),\n\t},\n\tnoAdditionalProps,\n);\ntype EncodedNodeExistsConstraint = Static<typeof EncodedNodeExistsConstraint>;\n\nexport const EncodedNodeChangeset = Type.Object(\n\t{\n\t\tfieldChanges: Type.Optional(EncodedFieldChangeMap),\n\t\tnodeExistsConstraint: Type.Optional(EncodedNodeExistsConstraint),\n\t},\n\tnoAdditionalProps,\n);\n\n/**\n * Format for encoding as json.\n */\nexport type EncodedNodeChangeset = Static<typeof EncodedNodeChangeset>;\n\nexport const EncodedRevisionInfo = Type.Object(\n\t{\n\t\trevision: Type.Readonly(RevisionTagSchema),\n\t\trollbackOf: Type.ReadonlyOptional(RevisionTagSchema),\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedRevisionInfo = Static<typeof EncodedRevisionInfo>;\n\n/**\n * Index of field in an EncodedFieldBatch.\n */\nexport const EncodedTreeIndex = Type.Number({ multipleOf: 1, minimum: 0 });\n\nexport const CommitBuilds = Type.Array(\n\tType.Tuple([\n\t\t// ID for first node\n\t\tChangesetLocalIdSchema,\n\t\t// Index for a TreeChunk that represents all the nodes\n\t\tEncodedTreeIndex,\n\t]),\n);\nexport type CommitBuilds = Static<typeof CommitBuilds>;\n\nexport const EncodedBuildsArray = Type.Array(\n\tType.Union([\n\t\tType.Tuple([CommitBuilds, RevisionTagSchema]),\n\t\t// Revision is omitted when undefined\n\t\tType.Tuple([CommitBuilds]),\n\t]),\n);\n\nexport type EncodedBuildsArray = Static<typeof EncodedBuildsArray>;\n\nexport const EncodedBuilds = Type.Object(\n\t{\n\t\tbuilds: EncodedBuildsArray,\n\t\t/**\n\t\t * Fields indexed by the EncodedTreeIndexes above.\n\t\t * TODO: Strongly typing this here may result in redundant schema validation of this data.\n\t\t */\n\t\ttrees: EncodedFieldBatch,\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedBuilds = Static<typeof EncodedBuilds>;\n\nexport const EncodedModularChangesetV1 = Type.Object(\n\t{\n\t\tmaxId: Type.Optional(ChangesetLocalIdSchema),\n\t\tchanges: EncodedFieldChangeMap,\n\t\trevisions: Type.ReadonlyOptional(Type.Array(EncodedRevisionInfo)),\n\t\t// TODO#8574: separating `builds` and `refreshers` here means that we encode their `EncodedBuilds.trees` separately.\n\t\t// This can lead to a less efficient wire representation because of duplicated schema/shape information.\n\t\tbuilds: Type.Optional(EncodedBuilds),\n\t\trefreshers: Type.Optional(EncodedBuilds),\n\t\t/**\n\t\t * The number of constraints within this changeset that are violated.\n\t\t */\n\t\tviolations: Type.Optional(Type.Number({ minimum: 0, multipleOf: 1 })),\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedModularChangesetV1 = Static<typeof EncodedModularChangesetV1>;\n"]}

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

@@ -3,51 +3,12 @@
  * Licensed under the MIT License.
  */
 import { type Static } from "@sinclair/typebox";
-declare const EncodedRenames: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-    oldId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-    newId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-    count: import("@sinclair/typebox").TNumber;
-}>>>;
-export type EncodedRenames = Static<typeof EncodedRenames>;
-declare const EncodedRootNodes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-    detachId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-    nodeChangeset: import("@sinclair/typebox").TObject<{
-        fieldChanges: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-            fieldKey: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKey>;
-            fieldKind: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKindIdentifier>;
-            change: import("@sinclair/typebox").TAny;
-        }>>>;
-        nodeExistsConstraint: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
-            violated: import("@sinclair/typebox").TBoolean;
-        }>>;
-    }>;
-}>>>;
-export type EncodedRootNodes = Static<typeof EncodedRootNodes>;
-export declare const EncodedModularChangeset: import("@sinclair/typebox").TObject<{
+declare const EncodedNoChangeConstraint: import("@sinclair/typebox").TObject<{
+    violated: import("@sinclair/typebox").TBoolean;
+}>;
+export type EncodedNoChangeConstraint = Static<typeof EncodedNoChangeConstraint>;
+export declare const EncodedModularChangesetV2: import("@sinclair/typebox").TObject<{
     maxId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>>;
-    fieldChanges: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-        fieldKey: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKey>;
-        fieldKind: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKindIdentifier>;
-        change: import("@sinclair/typebox").TAny;
-    }>>;
-    rootNodes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-        detachId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-        nodeChangeset: import("@sinclair/typebox").TObject<{
-            fieldChanges: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-                fieldKey: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKey>;
-                fieldKind: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKindIdentifier>;
-                change: import("@sinclair/typebox").TAny;
-            }>>>;
-            nodeExistsConstraint: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
-                violated: import("@sinclair/typebox").TBoolean;
-            }>>;
-        }>;
-    }>>>;
-    nodeRenames: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-        oldId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-        newId: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
-        count: import("@sinclair/typebox").TNumber;
-    }>>>;
     revisions: import("@sinclair/typebox").TReadonlyOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         revision: import("@sinclair/typebox").TReadonly<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
         rollbackOf: import("@sinclair/typebox").TReadonlyOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>>;
@@ -94,6 +55,11 @@ export declare const EncodedModularChangeset: import("@sinclair/typebox").TObjec
             }>>;
         }>]>;
     }>>;
+    changes: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+        fieldKey: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKey>;
+        fieldKind: import("@sinclair/typebox").TUnsafe<import("../../core/index.js").FieldKindIdentifier>;
+        change: import("@sinclair/typebox").TAny;
+    }>>;
     refreshers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         builds: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TArray<import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TNumber]>>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TArray<import("@sinclair/typebox").TTuple<[import("@sinclair/typebox").TUnsafe<import("../../core/index.js").ChangesetLocalId>, import("@sinclair/typebox").TNumber]>>]>]>>;
         trees: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
@@ -136,11 +102,11 @@ export declare const EncodedModularChangeset: import("@sinclair/typebox").TObjec
             }>>;
         }>]>;
     }>>;
-    /**
-     * The number of constraints within this changeset that are violated.
-     */
     violations: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+    noChangeConstraint: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        violated: import("@sinclair/typebox").TBoolean;
+    }>>;
 }>;
-export type EncodedModularChangeset = Static<typeof EncodedModularChangeset>;
+export type EncodedModularChangesetV2 = Static<typeof EncodedModularChangesetV2>;
 export {};
 //# sourceMappingURL=modularChangeFormatV2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"modularChangeFormatV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAsB,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAY1E,QAAA,MAAM,cAAc;;;;IASnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,gBAAgB;;;;;;;;;;;;IAOrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE/D,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYlC;;OAEG;;EAIJ,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"modularChangeFormatV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAsB,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAM1E,QAAA,MAAM,yBAAyB;;EAK9B,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAEjF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYrC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC"}

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

@@ -3,27 +3,16 @@
  * Licensed under the MIT License.
  */
 import { Type } from "@sinclair/typebox";
-import { ChangesetLocalIdSchema, EncodedBuilds, EncodedChangeAtomId, EncodedFieldChangeMap, EncodedNodeChangeset, EncodedRevisionInfo, } from "./modularChangeFormatV1.js";
+import { EncodedModularChangesetV1 } from "./modularChangeFormatV1.js";
 const noAdditionalProps = { additionalProperties: false };
-const EncodedRenames = Type.Optional(Type.Array(Type.Object({
-    oldId: EncodedChangeAtomId,
-    newId: EncodedChangeAtomId,
-    count: Type.Number(),
-}), noAdditionalProps));
-const EncodedRootNodes = Type.Optional(Type.Array(Type.Object({ detachId: EncodedChangeAtomId, nodeChangeset: EncodedNodeChangeset }, noAdditionalProps)));
-export const EncodedModularChangeset = Type.Object({
-    maxId: Type.Optional(ChangesetLocalIdSchema),
-    fieldChanges: EncodedFieldChangeMap,
-    rootNodes: EncodedRootNodes,
-    nodeRenames: EncodedRenames,
-    revisions: Type.ReadonlyOptional(Type.Array(EncodedRevisionInfo)),
-    // TODO#8574: separating `builds` and `refreshers` here means that we encode their `EncodedBuilds.trees` separately.
-    // This can lead to a less efficient wire representation because of duplicated schema/shape information.
-    builds: Type.Optional(EncodedBuilds),
-    refreshers: Type.Optional(EncodedBuilds),
-    /**
-     * The number of constraints within this changeset that are violated.
-     */
-    violations: Type.Optional(Type.Number({ minimum: 0, multipleOf: 1 })),
+const EncodedNoChangeConstraint = Type.Object({
+    violated: Type.Boolean(),
 }, noAdditionalProps);
+export const EncodedModularChangesetV2 = Type.Composite([
+    EncodedModularChangesetV1,
+    Type.Object({
+        /** Global no change constraint that gets violated whenever the changeset is rebased */
+        noChangeConstraint: Type.Optional(EncodedNoChangeConstraint),
+    }, noAdditionalProps),
+], noAdditionalProps);
 //# sourceMappingURL=modularChangeFormatV2.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"modularChangeFormatV2.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EACN,sBAAsB,EACtB,aAAa,EACb,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,GACnB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CACnC,IAAI,CAAC,KAAK,CACT,IAAI,CAAC,MAAM,CAAC;IACX,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;CACpB,CAAC,EACF,iBAAiB,CACjB,CACD,CAAC;AAIF,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CACrC,IAAI,CAAC,KAAK,CACT,IAAI,CAAC,MAAM,CACV,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,oBAAoB,EAAE,EACtE,iBAAiB,CACjB,CACD,CACD,CAAC;AAIF,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC,MAAM,CACjD;IACC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAC5C,YAAY,EAAE,qBAAqB;IACnC,SAAS,EAAE,gBAAgB;IAC3B,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACjE,oHAAoH;IACpH,wGAAwG;IACxG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IACpC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;IAExC;;OAEG;IACH,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;CACrE,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ObjectOptions, type Static, Type } from \"@sinclair/typebox\";\nimport {\n\tChangesetLocalIdSchema,\n\tEncodedBuilds,\n\tEncodedChangeAtomId,\n\tEncodedFieldChangeMap,\n\tEncodedNodeChangeset,\n\tEncodedRevisionInfo,\n} from \"./modularChangeFormatV1.js\";\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst EncodedRenames = Type.Optional(\n\tType.Array(\n\t\tType.Object({\n\t\t\toldId: EncodedChangeAtomId,\n\t\t\tnewId: EncodedChangeAtomId,\n\t\t\tcount: Type.Number(),\n\t\t}),\n\t\tnoAdditionalProps,\n\t),\n);\n\nexport type EncodedRenames = Static<typeof EncodedRenames>;\n\nconst EncodedRootNodes = Type.Optional(\n\tType.Array(\n\t\tType.Object(\n\t\t\t{ detachId: EncodedChangeAtomId, nodeChangeset: EncodedNodeChangeset },\n\t\t\tnoAdditionalProps,\n\t\t),\n\t),\n);\n\nexport type EncodedRootNodes = Static<typeof EncodedRootNodes>;\n\nexport const EncodedModularChangeset = Type.Object(\n\t{\n\t\tmaxId: Type.Optional(ChangesetLocalIdSchema),\n\t\tfieldChanges: EncodedFieldChangeMap,\n\t\trootNodes: EncodedRootNodes,\n\t\tnodeRenames: EncodedRenames,\n\t\trevisions: Type.ReadonlyOptional(Type.Array(EncodedRevisionInfo)),\n\t\t// TODO#8574: separating `builds` and `refreshers` here means that we encode their `EncodedBuilds.trees` separately.\n\t\t// This can lead to a less efficient wire representation because of duplicated schema/shape information.\n\t\tbuilds: Type.Optional(EncodedBuilds),\n\t\trefreshers: Type.Optional(EncodedBuilds),\n\n\t\t/**\n\t\t * The number of constraints within this changeset that are violated.\n\t\t */\n\t\tviolations: Type.Optional(Type.Number({ minimum: 0, multipleOf: 1 })),\n\t},\n\tnoAdditionalProps,\n);\n\nexport type EncodedModularChangeset = Static<typeof EncodedModularChangeset>;\n"]}
+{"version":3,"file":"modularChangeFormatV2.js","sourceRoot":"","sources":["../../../src/feature-libraries/modular-schema/modularChangeFormatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAC5C;IACC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;CACxB,EACD,iBAAiB,CACjB,CAAC;AAGF,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,CACtD;IACC,yBAAyB;IACzB,IAAI,CAAC,MAAM,CACV;QACC,uFAAuF;QACvF,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC;KAC5D,EACD,iBAAiB,CACjB;CACD,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { type ObjectOptions, type Static, Type } from \"@sinclair/typebox\";\n\nimport { EncodedModularChangesetV1 } from \"./modularChangeFormatV1.js\";\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst EncodedNoChangeConstraint = Type.Object(\n\t{\n\t\tviolated: Type.Boolean(),\n\t},\n\tnoAdditionalProps,\n);\nexport type EncodedNoChangeConstraint = Static<typeof EncodedNoChangeConstraint>;\n\nexport const EncodedModularChangesetV2 = Type.Composite(\n\t[\n\t\tEncodedModularChangesetV1,\n\t\tType.Object(\n\t\t\t{\n\t\t\t\t/** Global no change constraint that gets violated whenever the changeset is rebased */\n\t\t\t\tnoChangeConstraint: Type.Optional(EncodedNoChangeConstraint),\n\t\t\t},\n\t\t\tnoAdditionalProps,\n\t\t),\n\t],\n\tnoAdditionalProps,\n);\n\nexport type EncodedModularChangesetV2 = Static<typeof EncodedModularChangesetV2>;\n"]}

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

@@ -2,13 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { type ChangeAtomId, type ChangeAtomIdRangeMap, type ChangesetLocalId, type FieldKey, type FieldKindIdentifier, type RevisionInfo, type RevisionTag } from "../../core/index.js";
-import { RangeMap, type Brand, type RangeQueryResult, type TupleBTree } from "../../util/index.js";
+import { type ChangeAtomId, type ChangesetLocalId, type FieldKey, type FieldKindIdentifier, type RevisionInfo } from "../../core/index.js";
+import { RangeMap, type Brand } from "../../util/index.js";
+import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import type { TreeChunk } from "../chunked-forest/index.js";
 import type { CrossFieldTarget } from "./crossFieldQueries.js";
-export type RebaseVersion = 1 | 2;
 export interface ModularChangeset extends HasFieldChanges {
-    readonly rebaseVersion: RebaseVersion;
     /**
      * The numerically highest `ChangesetLocalId` used in this changeset.
      * If undefined then this changeset contains no IDs.
@@ -25,12 +24,10 @@ export interface ModularChangeset extends HasFieldChanges {
      * Maps from this changeset's canonical ID for a node (see comment on node aliases) to the changes for that node.
      */
     readonly nodeChanges: ChangeAtomIdBTree<NodeChangeset>;
-    readonly rootNodes: RootNodeTable;
     /**
-     * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node,
-     * or the detach ID, if this node is detached.
+     * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node.
      */
-    readonly nodeToParent: ChangeAtomIdBTree<NodeLocation>;
+    readonly nodeToParent: ChangeAtomIdBTree<FieldId>;
     /**
      * Maps from a node ID to another ID for the same node.
      * If a node ID used in this changeset has no entry in this table, then it is the canonical ID for that node.
@@ -49,6 +46,10 @@ export interface ModularChangeset extends HasFieldChanges {
      * If this count is greater than 0, it will prevent the changeset from being applied.
      */
     readonly constraintViolationCount?: number;
+    /** Constraint that the document must be in the same state before this change is applied as it was before this change was authored */
+    readonly noChangeConstraint?: NoChangeConstraint;
+    /** 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 */
+    readonly noChangeConstraintOnRevert?: NoChangeConstraint;
     /**
      * The number of constraint violations that apply to the revert of the changeset. If this count is greater than 0, it will
      * prevent the changeset from being reverted or undone.
@@ -58,30 +59,8 @@ export interface ModularChangeset extends HasFieldChanges {
     readonly destroys?: ChangeAtomIdBTree<number>;
     readonly refreshers?: ChangeAtomIdBTree<TreeChunk>;
 }
-export interface RootNodeTable {
-    oldToNewId: ChangeAtomIdRangeMap<ChangeAtomId>;
-    newToOldId: ChangeAtomIdRangeMap<ChangeAtomId>;
-    nodeChanges: ChangeAtomIdBTree<NodeId>;
-    /**
-     * Maps from input context detach ID to the field where the node was last attached.
-     * There should be an entry for every detach ID referenced in `oldToNewId` or `nodeChanges`.
-     */
-    detachLocations: ChangeAtomIdRangeMap<FieldId>;
-    /**
-     * Maps from the output root ID of a node to the output detach location of that node.
-     * This is only guaranteed to contain entries for nodes which have an output detach location
-     * which is different from their location in the input context.
-     */
-    outputDetachLocations: ChangeAtomIdRangeMap<FieldId>;
-}
-export type ChangeAtomIdBTree<V> = TupleBTree<ChangeAtomIdKey, V>;
-export type ChangeAtomIdKey = [RevisionTag | undefined, ChangesetLocalId];
-export declare function getFromChangeAtomIdMap<T>(map: ChangeAtomIdBTree<T>, id: ChangeAtomId): T | undefined;
-export declare function rangeQueryChangeAtomIdMap<T>(map: ChangeAtomIdBTree<T>, id: ChangeAtomId, count: number): RangeQueryResult<T | undefined>;
-export declare function setInChangeAtomIdMap<T>(map: ChangeAtomIdBTree<T>, id: ChangeAtomId, value: T): boolean;
-export type CrossFieldRangeTable<T> = RangeMap<CrossFieldKey, T>;
-export type CrossFieldKeyTable = CrossFieldRangeTable<FieldId>;
-export declare function newCrossFieldRangeTable<V>(): CrossFieldRangeTable<V>;
+export type CrossFieldKeyTable = RangeMap<CrossFieldKey, FieldId>;
+export declare function newCrossFieldKeyTable(): CrossFieldKeyTable;
 export interface CrossFieldKey extends ChangeAtomId {
     readonly target: CrossFieldTarget;
 }
@@ -93,22 +72,13 @@ export interface FieldId {
     readonly nodeId: NodeId | undefined;
     readonly field: FieldKey;
 }
-export interface FieldParent {
-    readonly field: FieldId;
-    readonly root?: undefined;
-}
-export interface RootParent {
-    readonly field?: undefined;
-    readonly root: ChangeAtomId;
-}
-export type NodeLocation = FieldParent | RootParent;
-export interface DetachLocation {
-    field: FieldId;
-    atomId: ChangeAtomId | undefined;
+export interface NodeExistsConstraint {
+    violated: boolean;
 }
 /**
+ * A constraint that is violated whenever the state of the document is different from when the change was authored.
  */
-export interface NodeExistsConstraint {
+export interface NoChangeConstraint {
     violated: boolean;
 }
 /**
@@ -116,13 +86,13 @@ export interface NodeExistsConstraint {
  */
 export interface NodeChangeset extends HasFieldChanges {
     /** Keeps track of whether node exists constraint has been violated by this change */
-    readonly nodeExistsConstraint?: NodeExistsConstraint;
+    nodeExistsConstraint?: NodeExistsConstraint;
     /** Keeps track of whether node exists constraint will be violated when this change is reverted */
-    readonly nodeExistsConstraintOnRevert?: NodeExistsConstraint;
+    nodeExistsConstraintOnRevert?: NodeExistsConstraint;
 }
 export type NodeId = ChangeAtomId;
 export interface HasFieldChanges {
-    readonly fieldChanges?: FieldChangeMap;
+    fieldChanges?: FieldChangeMap;
 }
 export type FieldChangeMap = Map<FieldKey, FieldChange>;
 export interface FieldChange {

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

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

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

@@ -3,26 +3,8 @@
  * Licensed under the MIT License.
  */
 import { subtractChangeAtomIds, } from "../../core/index.js";
-import { brand, RangeMap, } from "../../util/index.js";
-export function getFromChangeAtomIdMap(map, id) {
-    return map.get([id.revision, id.localId]);
-}
-export function rangeQueryChangeAtomIdMap(map, id, count) {
-    const pair = map.getPairOrNextHigher([id.revision, id.localId]);
-    if (pair === undefined) {
-        return { value: undefined, length: count };
-    }
-    const [[revision, localId], value] = pair;
-    const lengthBefore = subtractChangeAtomIds({ revision, localId }, id);
-    if (lengthBefore === 0) {
-        return { value, length: 1 };
-    }
-    return { value: undefined, length: Math.min(lengthBefore, count) };
-}
-export function setInChangeAtomIdMap(map, id, value) {
-    return map.set([id.revision, id.localId], value);
-}
-export function newCrossFieldRangeTable() {
+import { brand, RangeMap } from "../../util/index.js";
+export function newCrossFieldKeyTable() {
     return new RangeMap(offsetCrossFieldKey, subtractCrossFieldKeys);
 }
 function offsetCrossFieldKey(key, offset) {

package/lib/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,OAAO,EACN,qBAAqB,GAQrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,KAAK,EACL,QAAQ,GAIR,MAAM,qBAAqB,CAAC;AAuF7B,MAAM,UAAU,sBAAsB,CACrC,GAAyB,EACzB,EAAgB;IAEhB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,GAAyB,EACzB,EAAgB,EAChB,KAAa;IAEb,MAAM,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;IAC1C,MAAM,YAAY,GAAG,qBAAqB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IACtE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,oBAAoB,CACnC,GAAyB,EACzB,EAAgB,EAChB,KAAQ;IAER,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAKD,MAAM,UAAU,uBAAuB;IACtC,OAAO,IAAI,QAAQ,CAAmB,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAkB,EAAE,MAAc;IAC9D,OAAO;QACN,GAAG,GAAG;QACN,OAAO,EAAE,KAAK,CAAC,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,qBAAqB,CAAC,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 ChangeAtomIdRangeMap,\n\ttype ChangesetLocalId,\n\ttype FieldKey,\n\ttype FieldKindIdentifier,\n\ttype RevisionInfo,\n\ttype RevisionTag,\n} from \"../../core/index.js\";\nimport {\n\tbrand,\n\tRangeMap,\n\ttype Brand,\n\ttype RangeQueryResult,\n\ttype TupleBTree,\n} from \"../../util/index.js\";\nimport type { TreeChunk } from \"../chunked-forest/index.js\";\n\nimport type { CrossFieldTarget } from \"./crossFieldQueries.js\";\n\nexport type RebaseVersion = 1 | 2;\n\nexport interface ModularChangeset extends HasFieldChanges {\n\treadonly rebaseVersion: RebaseVersion;\n\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\treadonly rootNodes: RootNodeTable;\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 * or the detach ID, if this node is detached.\n\t */\n\t// TODO: Should this be merged with `nodeChanges`?\n\treadonly nodeToParent: ChangeAtomIdBTree<NodeLocation>;\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/**\n\t * The number of constraint violations that apply to the revert of the changeset. If this count is greater than 0, it will\n\t * prevent the changeset from being reverted or undone.\n\t */\n\treadonly constraintViolationCountOnRevert?: number;\n\treadonly builds?: ChangeAtomIdBTree<TreeChunk>;\n\treadonly destroys?: ChangeAtomIdBTree<number>;\n\treadonly refreshers?: ChangeAtomIdBTree<TreeChunk>;\n}\n\nexport interface RootNodeTable {\n\t// TODO: Include builds, destroys, refreshers, and field changes\n\toldToNewId: ChangeAtomIdRangeMap<ChangeAtomId>;\n\tnewToOldId: ChangeAtomIdRangeMap<ChangeAtomId>;\n\tnodeChanges: ChangeAtomIdBTree<NodeId>;\n\n\t/**\n\t * Maps from input context detach ID to the field where the node was last attached.\n\t * There should be an entry for every detach ID referenced in `oldToNewId` or `nodeChanges`.\n\t */\n\tdetachLocations: ChangeAtomIdRangeMap<FieldId>;\n\n\t/**\n\t * Maps from the output root ID of a node to the output detach location of that node.\n\t * This is only guaranteed to contain entries for nodes which have an output detach location\n\t * which is different from their location in the input context.\n\t */\n\toutputDetachLocations: ChangeAtomIdRangeMap<FieldId>;\n}\n\nexport type ChangeAtomIdBTree<V> = TupleBTree<ChangeAtomIdKey, V>;\nexport type ChangeAtomIdKey = [RevisionTag | undefined, ChangesetLocalId];\n\nexport function getFromChangeAtomIdMap<T>(\n\tmap: ChangeAtomIdBTree<T>,\n\tid: ChangeAtomId,\n): T | undefined {\n\treturn map.get([id.revision, id.localId]);\n}\n\nexport function rangeQueryChangeAtomIdMap<T>(\n\tmap: ChangeAtomIdBTree<T>,\n\tid: ChangeAtomId,\n\tcount: number,\n): RangeQueryResult<T | undefined> {\n\tconst pair = map.getPairOrNextHigher([id.revision, id.localId]);\n\tif (pair === undefined) {\n\t\treturn { value: undefined, length: count };\n\t}\n\n\tconst [[revision, localId], value] = pair;\n\tconst lengthBefore = subtractChangeAtomIds({ revision, localId }, id);\n\tif (lengthBefore === 0) {\n\t\treturn { value, length: 1 };\n\t}\n\n\treturn { value: undefined, length: Math.min(lengthBefore, count) };\n}\n\nexport function setInChangeAtomIdMap<T>(\n\tmap: ChangeAtomIdBTree<T>,\n\tid: ChangeAtomId,\n\tvalue: T,\n): boolean {\n\treturn map.set([id.revision, id.localId], value);\n}\n\nexport type CrossFieldRangeTable<T> = RangeMap<CrossFieldKey, T>;\nexport type CrossFieldKeyTable = CrossFieldRangeTable<FieldId>;\n\nexport function newCrossFieldRangeTable<V>(): CrossFieldRangeTable<V> {\n\treturn new RangeMap<CrossFieldKey, V>(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\tkey: CrossFieldKey;\n\tcount: number;\n}\n\nexport interface FieldId {\n\treadonly nodeId: NodeId | undefined;\n\treadonly field: FieldKey;\n}\n\nexport interface FieldParent {\n\treadonly field: FieldId;\n\treadonly root?: undefined;\n}\n\nexport interface RootParent {\n\treadonly field?: undefined;\n\treadonly root: ChangeAtomId;\n}\n\nexport type NodeLocation = FieldParent | RootParent;\nexport interface DetachLocation {\n\tfield: FieldId;\n\tatomId: ChangeAtomId | undefined;\n}\n\n/**\n */\nexport interface NodeExistsConstraint {\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\treadonly nodeExistsConstraint?: NodeExistsConstraint;\n\n\t/** Keeps track of whether node exists constraint will be violated when this change is reverted */\n\treadonly nodeExistsConstraintOnRevert?: NodeExistsConstraint;\n}\n\nexport type NodeId = ChangeAtomId;\n\nexport interface HasFieldChanges {\n\treadonly fieldChanges?: FieldChangeMap;\n}\n\nexport type FieldChangeMap = Map<FieldKey, FieldChange>;\n\nexport interface FieldChange {\n\tfieldKind: 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;AAEH,OAAO,EACN,qBAAqB,GAMrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,qBAAqB,CAAC;AAiElE,MAAM,UAAU,qBAAqB;IACpC,OAAO,IAAI,QAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAkB,EAAE,MAAc;IAC9D,OAAO;QACN,GAAG,GAAG;QACN,OAAO,EAAE,KAAK,CAAC,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,qBAAqB,CAAC,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 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\t/**\n\t * The number of constraint violations that apply to the revert of the changeset. If this count is greater than 0, it will\n\t * prevent the changeset from being reverted or undone.\n\t */\n\treadonly constraintViolationCountOnRevert?: number;\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\tkey: CrossFieldKey;\n\tcount: 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\tfieldKind: FieldKindIdentifier;\n\tchange: FieldChangeset;\n}\n\nexport type FieldChangeset = Brand<unknown, \"FieldChangeset\">;\n"]}

package/lib/feature-libraries/node-identifier/mockNodeIdentifierManager.js

@@ -32,7 +32,7 @@ export class MockNodeIdentifierManager {
         if (!isStableNodeIdentifier(key) || !key.startsWith("a110ca7e-add1-4000-8000-")) {
             return undefined;
         }
-        const localNodeIdentifier = Number.parseInt(key.substring(24), 16);
+        const localNodeIdentifier = Number.parseInt(key.slice(24), 16);
         return localNodeIdentifier < this.count
             ? brand(localNodeIdentifier)
             : undefined;

package/lib/feature-libraries/node-identifier/mockNodeIdentifierManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"mockNodeIdentifierManager.js","sourceRoot":"","sources":["../../../src/feature-libraries/node-identifier/mockNodeIdentifierManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG/D,OAAO,EACN,sBAAsB,GAEtB,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,MAAM,OAAO,yBAAyB;IAAtC;QACS,UAAK,GAAG,CAAC,CAAC;IAwCnB,CAAC;IAtCO,4BAA4B;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEM,2BAA2B;QACjC,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;IACzE,CAAC;IAEM,sBAAsB,CAAC,GAAyB;QACtD,OAAO,CACN,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CACvF,CAAC;IACH,CAAC;IAEM,uBAAuB,CAAC,GAAwB;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,yBAAyB,CAAC,GAAW;QAC3C,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACjF,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,OAAO,mBAAmB,GAAG,IAAI,CAAC,KAAK;YACtC,CAAC,CAAC,KAAK,CAAC,mBAA+C,CAAC;YACxD,CAAC,CAAC,SAAS,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAc;QAC1B,MAAM,CAAC,MAAM,GAAG,mBAAmB,EAAE,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACpF,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YACxC,OAAO,gBAAgB,CACtB,2BAA2B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAC9E,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,UAAU,CAAC,+BAA+B,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;CACD","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 type { SessionSpaceCompressedId, StableId } from \"@fluidframework/id-compressor\";\nimport { assertIsStableId } from \"@fluidframework/id-compressor/internal\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport { brand, extractFromOpaque } from \"../../util/index.js\";\n\nimport type { LocalNodeIdentifier, StableNodeIdentifier } from \"./nodeIdentifier.js\";\nimport {\n\tisStableNodeIdentifier,\n\ttype NodeIdentifierManager,\n} from \"./nodeIdentifierManager.js\";\n\n/**\n * Mock {@link NodeIdentifierManager} that generates deterministic {@link StableNodeIdentifier}s and {@link LocalNodeIdentifier}s.\n * @remarks This is useful for test environments because it will always yield the same keys in the same order.\n * It should not be used for production environments for the same reason; the {@link StableNodeIdentifier}s are not universally unique.\n */\nexport class MockNodeIdentifierManager implements NodeIdentifierManager {\n\tprivate count = 0;\n\n\tpublic generateStableNodeIdentifier(): StableNodeIdentifier {\n\t\treturn brand(this.getId(this.count++));\n\t}\n\n\tpublic generateLocalNodeIdentifier(): LocalNodeIdentifier {\n\t\treturn this.localizeNodeIdentifier(this.generateStableNodeIdentifier());\n\t}\n\n\tpublic localizeNodeIdentifier(key: StableNodeIdentifier): LocalNodeIdentifier {\n\t\treturn (\n\t\t\tthis.tryLocalizeNodeIdentifier(key) ?? fail(0xb26 /* Identifier is not compressible */)\n\t\t);\n\t}\n\n\tpublic stabilizeNodeIdentifier(key: LocalNodeIdentifier): StableNodeIdentifier {\n\t\treturn brand(this.getId(extractFromOpaque(key)));\n\t}\n\n\tpublic tryLocalizeNodeIdentifier(key: string): LocalNodeIdentifier | undefined {\n\t\tif (!isStableNodeIdentifier(key) || !key.startsWith(\"a110ca7e-add1-4000-8000-\")) {\n\t\t\treturn undefined;\n\t\t}\n\t\tconst localNodeIdentifier = Number.parseInt(key.substring(24), 16);\n\t\treturn localNodeIdentifier < this.count\n\t\t\t? brand(localNodeIdentifier as SessionSpaceCompressedId)\n\t\t\t: undefined;\n\t}\n\n\tpublic getId(offset: number): StableId {\n\t\tassert(offset < 281_474_976_710_656, 0x6e8 /* UUID offset must be at most 16^12 */);\n\t\tif (offset >= 0 && offset < this.count) {\n\t\t\treturn assertIsStableId(\n\t\t\t\t`a110ca7e-add1-4000-8000-${Math.round(offset).toString(16).padStart(12, \"0\")}`,\n\t\t\t);\n\t\t} else {\n\t\t\tthrow new UsageError(\"Local ID offset out of bounds\");\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"mockNodeIdentifierManager.js","sourceRoot":"","sources":["../../../src/feature-libraries/node-identifier/mockNodeIdentifierManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG/D,OAAO,EACN,sBAAsB,GAEtB,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,MAAM,OAAO,yBAAyB;IAAtC;QACS,UAAK,GAAG,CAAC,CAAC;IAwCnB,CAAC;IAtCO,4BAA4B;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAEM,2BAA2B;QACjC,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;IACzE,CAAC;IAEM,sBAAsB,CAAC,GAAyB;QACtD,OAAO,CACN,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CACvF,CAAC;IACH,CAAC;IAEM,uBAAuB,CAAC,GAAwB;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,yBAAyB,CAAC,GAAW;QAC3C,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACjF,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,OAAO,mBAAmB,GAAG,IAAI,CAAC,KAAK;YACtC,CAAC,CAAC,KAAK,CAAC,mBAA+C,CAAC;YACxD,CAAC,CAAC,SAAS,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAc;QAC1B,MAAM,CAAC,MAAM,GAAG,mBAAmB,EAAE,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACpF,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YACxC,OAAO,gBAAgB,CACtB,2BAA2B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAC9E,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,UAAU,CAAC,+BAA+B,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;CACD","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 type { SessionSpaceCompressedId, StableId } from \"@fluidframework/id-compressor\";\nimport { assertIsStableId } from \"@fluidframework/id-compressor/internal\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport { brand, extractFromOpaque } from \"../../util/index.js\";\n\nimport type { LocalNodeIdentifier, StableNodeIdentifier } from \"./nodeIdentifier.js\";\nimport {\n\tisStableNodeIdentifier,\n\ttype NodeIdentifierManager,\n} from \"./nodeIdentifierManager.js\";\n\n/**\n * Mock {@link NodeIdentifierManager} that generates deterministic {@link StableNodeIdentifier}s and {@link LocalNodeIdentifier}s.\n * @remarks This is useful for test environments because it will always yield the same keys in the same order.\n * It should not be used for production environments for the same reason; the {@link StableNodeIdentifier}s are not universally unique.\n */\nexport class MockNodeIdentifierManager implements NodeIdentifierManager {\n\tprivate count = 0;\n\n\tpublic generateStableNodeIdentifier(): StableNodeIdentifier {\n\t\treturn brand(this.getId(this.count++));\n\t}\n\n\tpublic generateLocalNodeIdentifier(): LocalNodeIdentifier {\n\t\treturn this.localizeNodeIdentifier(this.generateStableNodeIdentifier());\n\t}\n\n\tpublic localizeNodeIdentifier(key: StableNodeIdentifier): LocalNodeIdentifier {\n\t\treturn (\n\t\t\tthis.tryLocalizeNodeIdentifier(key) ?? fail(0xb26 /* Identifier is not compressible */)\n\t\t);\n\t}\n\n\tpublic stabilizeNodeIdentifier(key: LocalNodeIdentifier): StableNodeIdentifier {\n\t\treturn brand(this.getId(extractFromOpaque(key)));\n\t}\n\n\tpublic tryLocalizeNodeIdentifier(key: string): LocalNodeIdentifier | undefined {\n\t\tif (!isStableNodeIdentifier(key) || !key.startsWith(\"a110ca7e-add1-4000-8000-\")) {\n\t\t\treturn undefined;\n\t\t}\n\t\tconst localNodeIdentifier = Number.parseInt(key.slice(24), 16);\n\t\treturn localNodeIdentifier < this.count\n\t\t\t? brand(localNodeIdentifier as SessionSpaceCompressedId)\n\t\t\t: undefined;\n\t}\n\n\tpublic getId(offset: number): StableId {\n\t\tassert(offset < 281_474_976_710_656, 0x6e8 /* UUID offset must be at most 16^12 */);\n\t\tif (offset >= 0 && offset < this.count) {\n\t\t\treturn assertIsStableId(\n\t\t\t\t`a110ca7e-add1-4000-8000-${Math.round(offset).toString(16).padStart(12, \"0\")}`,\n\t\t\t);\n\t\t} else {\n\t\t\tthrow new UsageError(\"Local ID offset out of bounds\");\n\t\t}\n\t}\n}\n"]}

package/lib/feature-libraries/object-forest/objectForest.js

@@ -96,12 +96,12 @@ let ObjectForest = (() => {
                 this.events = __classPrivateFieldGet(this, _ObjectForest_events, "f");
                 _ObjectForest_roots.set(this, void 0);
                 this.nextRange = 0;
-                __classPrivateFieldSet(this, _ObjectForest_roots, roots !== undefined
-                    ? deepCopyMapTree(roots)
-                    : {
+                __classPrivateFieldSet(this, _ObjectForest_roots, roots === undefined
+                    ? {
                         type: aboveRootPlaceholder,
                         fields: new Map(),
-                    }, "f");
+                    }
+                    : deepCopyMapTree(roots), "f");
                 if (additionalAsserts) {
                     this.checkSchema();
                 }