@fluidframework/tree 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0

package/dist/shared-tree-core/editManagerCodecs.js

@@ -4,12 +4,25 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeEditManagerCodec = void 0;
+exports.makeEditManagerCodecs = exports.makeEditManagerCodec = void 0;
 const index_js_1 = require("../codec/index.js");
-const index_js_2 = require("../util/index.js");
+const index_js_2 = require("../codec/index.js");
+const index_js_3 = require("../util/index.js");
 const editManagerFormat_js_1 = require("./editManagerFormat.js");
-function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
-    const format = (0, editManagerFormat_js_1.EncodedEditManager)(changeCodec.json.encodedSchema ?? index_js_2.JsonCompatibleReadOnlySchema);
+function makeEditManagerCodec(changeCodecs, revisionTagCodec, options, writeVersion) {
+    const family = makeEditManagerCodecs(changeCodecs, revisionTagCodec, options);
+    return (0, index_js_2.makeVersionDispatchingCodec)(family, { ...options, writeVersion });
+}
+exports.makeEditManagerCodec = makeEditManagerCodec;
+function makeEditManagerCodecs(changeCodecs, revisionTagCodec, options) {
+    return (0, index_js_1.makeCodecFamily)([
+        [1, makeV1CodecWithVersion(changeCodecs.resolve(1), revisionTagCodec, options, 1)],
+        [2, makeV1CodecWithVersion(changeCodecs.resolve(2), revisionTagCodec, options, 2)],
+    ]);
+}
+exports.makeEditManagerCodecs = makeEditManagerCodecs;
+function makeV1CodecWithVersion(changeCodec, revisionTagCodec, options, version) {
+    const format = (0, editManagerFormat_js_1.EncodedEditManager)(changeCodec.json.encodedSchema ?? index_js_3.JsonCompatibleReadOnlySchema);
     const encodeCommit = (commit, context) => ({
         ...commit,
         revision: revisionTagCodec.encode(commit.revision, { originatorId: commit.sessionId }),
@@ -20,7 +33,7 @@ function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
         revision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),
         change: changeCodec.json.decode(commit.change, context),
     });
-    const codec = (0, index_js_1.makeVersionedValidatedCodec)(options, new Set([editManagerFormat_js_1.version]), format, {
+    const codec = (0, index_js_1.withSchemaValidation)(format, {
         encode: (data, context) => {
             const json = {
                 trunk: data.trunk.map((commit) => encodeCommit(commit, {
@@ -39,7 +52,7 @@ function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
                         })),
                     },
                 ]),
-                version: editManagerFormat_js_1.version,
+                version,
             };
             return json;
         },
@@ -53,10 +66,12 @@ function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
                 decodeCommit(commit, {
                     originatorId: commit.sessionId,
                 })),
-                peerLocalBranches: new Map((0, index_js_2.mapIterable)(json.branches, ([sessionId, branch]) => [
+                peerLocalBranches: new Map((0, index_js_3.mapIterable)(json.branches, ([sessionId, branch]) => [
                     sessionId,
                     {
-                        base: revisionTagCodec.decode(branch.base, { originatorId: sessionId }),
+                        base: revisionTagCodec.decode(branch.base, {
+                            originatorId: sessionId,
+                        }),
                         commits: branch.commits.map((commit) => 
                         // TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
                         decodeCommit(commit, {
@@ -66,11 +81,10 @@ function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
                 ])),
             };
         },
-    });
+    }, options.jsonValidator);
     // TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,
     // and not leak the internal encoded format in the API surface.
     // Fixing that would remove the need for this cast.
     return codec;
 }
-exports.makeEditManagerCodec = makeEditManagerCodec;
 //# sourceMappingURL=editManagerCodecs.js.map

package/dist/shared-tree-core/editManagerCodecs.js.map

@@ -1 +1 @@
-{"version":3,"file":"editManagerCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\tICodecOptions,\n\tIJsonCodec,\n\tIMultiFormatCodec,\n\tmakeVersionedValidatedCodec,\n} from \"../codec/index.js\";\nimport { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from \"../core/index.js\";\nimport { SchemaAndPolicy } from \"../feature-libraries/index.js\";\nimport {\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tmapIterable,\n} from \"../util/index.js\";\nimport { SummaryData } from \"./editManager.js\";\nimport {\n\tCommit,\n\tEncodedCommit,\n\tEncodedEditManager,\n\tSequencedCommit,\n\tversion,\n} from \"./editManagerFormat.js\";\n\nexport interface EditManagerEncodingContext {\n\treadonly schema?: SchemaAndPolicy;\n}\n\nexport function makeEditManagerCodec<TChangeset>(\n\tchangeCodec: IMultiFormatCodec<\n\t\tTChangeset,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tChangeEncodingContext\n\t>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tChangeEncodingContext\n> {\n\tconst format = EncodedEditManager(\n\t\tchangeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema,\n\t);\n\n\tconst encodeCommit = <T extends Commit<TChangeset>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.encode(commit.change, context),\n\t});\n\n\tconst decodeCommit = <T extends EncodedCommit<JsonCompatibleReadOnly>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.decode(commit.change, context),\n\t});\n\n\tconst codec: IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEditManagerEncodingContext\n\t> = makeVersionedValidatedCodec(options, new Set([version]), format, {\n\t\tencode: (data, context: EditManagerEncodingContext) => {\n\t\t\tconst json: EncodedEditManager<TChangeset> = {\n\t\t\t\ttrunk: data.trunk.map((commit) =>\n\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t\tbranches: Array.from(data.peerLocalBranches.entries(), ([sessionId, branch]) => [\n\t\t\t\t\tsessionId,\n\t\t\t\t\t{\n\t\t\t\t\t\tbase: revisionTagCodec.encode(branch.base, {\n\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t),\n\t\t\t\t\t},\n\t\t\t\t]),\n\t\t\t\tversion,\n\t\t\t};\n\t\t\treturn json;\n\t\t},\n\t\tdecode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {\n\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.\n\t\t\tconst trunk: readonly any[] = json.trunk;\n\t\t\treturn {\n\t\t\t\ttrunk: trunk.map(\n\t\t\t\t\t(commit): SequencedCommit<TChangeset> =>\n\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-unsafe-return\n\t\t\t\t\t\tdecodeCommit(commit, {\n\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t\tpeerLocalBranches: new Map(\n\t\t\t\t\tmapIterable(json.branches, ([sessionId, branch]) => [\n\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tbase: revisionTagCodec.decode(branch.base, { originatorId: sessionId }),\n\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t\tdecodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {\n\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t},\n\t\t\t\t\t]),\n\t\t\t\t),\n\t\t\t};\n\t\t},\n\t});\n\t// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,\n\t// and not leak the internal encoded format in the API surface.\n\t// Fixing that would remove the need for this cast.\n\treturn codec as unknown as IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tChangeEncodingContext\n\t>;\n}\n"]}
+{"version":3,"file":"editManagerCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\ttype ICodecFamily,\n\tICodecOptions,\n\tIJsonCodec,\n\tIMultiFormatCodec,\n\tmakeCodecFamily,\n\twithSchemaValidation,\n} from \"../codec/index.js\";\nimport { makeVersionDispatchingCodec } from \"../codec/index.js\";\nimport {\n\tChangeEncodingContext,\n\tEncodedRevisionTag,\n\tRevisionTag,\n\tSchemaAndPolicy,\n} from \"../core/index.js\";\nimport {\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tmapIterable,\n} from \"../util/index.js\";\n\nimport { SummaryData } from \"./editManager.js\";\nimport { Commit, EncodedCommit, EncodedEditManager, SequencedCommit } from \"./editManagerFormat.js\";\n\nexport interface EditManagerEncodingContext {\n\treadonly schema?: SchemaAndPolicy;\n}\n\nexport function makeEditManagerCodec<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\twriteVersion: number,\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tEditManagerEncodingContext\n> {\n\tconst family = makeEditManagerCodecs(changeCodecs, revisionTagCodec, options);\n\treturn makeVersionDispatchingCodec(family, { ...options, writeVersion });\n}\n\nexport function makeEditManagerCodecs<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): ICodecFamily<SummaryData<TChangeset>, EditManagerEncodingContext> {\n\treturn makeCodecFamily([\n\t\t[1, makeV1CodecWithVersion(changeCodecs.resolve(1), revisionTagCodec, options, 1)],\n\t\t[2, makeV1CodecWithVersion(changeCodecs.resolve(2), revisionTagCodec, options, 2)],\n\t]);\n}\n\nfunction makeV1CodecWithVersion<TChangeset>(\n\tchangeCodec: IMultiFormatCodec<\n\t\tTChangeset,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tChangeEncodingContext\n\t>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\tversion: EncodedEditManager<TChangeset>[\"version\"],\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tEditManagerEncodingContext\n> {\n\tconst format = EncodedEditManager(\n\t\tchangeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema,\n\t);\n\n\tconst encodeCommit = <T extends Commit<TChangeset>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.encode(commit.change, context),\n\t});\n\n\tconst decodeCommit = <T extends EncodedCommit<JsonCompatibleReadOnly>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.decode(commit.change, context),\n\t});\n\n\tconst codec: IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEditManagerEncodingContext\n\t> = withSchemaValidation(\n\t\tformat,\n\t\t{\n\t\t\tencode: (data, context: EditManagerEncodingContext) => {\n\t\t\t\tconst json: EncodedEditManager<TChangeset> = {\n\t\t\t\t\ttrunk: data.trunk.map((commit) =>\n\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t\tbranches: Array.from(\n\t\t\t\t\t\tdata.peerLocalBranches.entries(),\n\t\t\t\t\t\t([sessionId, branch]) => [\n\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tbase: revisionTagCodec.encode(branch.base, {\n\t\t\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t],\n\t\t\t\t\t),\n\t\t\t\t\tversion,\n\t\t\t\t};\n\t\t\t\treturn json;\n\t\t\t},\n\t\t\tdecode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {\n\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.\n\t\t\t\tconst trunk: readonly any[] = json.trunk;\n\t\t\t\treturn {\n\t\t\t\t\ttrunk: trunk.map(\n\t\t\t\t\t\t(commit): SequencedCommit<TChangeset> =>\n\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-unsafe-return\n\t\t\t\t\t\t\tdecodeCommit(commit, {\n\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t\tpeerLocalBranches: new Map(\n\t\t\t\t\t\tmapIterable(json.branches, ([sessionId, branch]) => [\n\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tbase: revisionTagCodec.decode(branch.base, {\n\t\t\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t\t\tdecodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {\n\t\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t]),\n\t\t\t\t\t),\n\t\t\t\t};\n\t\t\t},\n\t\t},\n\t\toptions.jsonValidator,\n\t);\n\t// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,\n\t// and not leak the internal encoded format in the API surface.\n\t// Fixing that would remove the need for this cast.\n\treturn codec as unknown as IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tEditManagerEncodingContext\n\t>;\n}\n"]}

package/dist/shared-tree-core/editManagerFormat.d.ts

@@ -2,10 +2,10 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { TSchema, Static } from "@sinclair/typebox";
 import { SessionId } from "@fluidframework/id-compressor";
+import { Static, TSchema } from "@sinclair/typebox";
+import { EncodedRevisionTag, RevisionTag } from "../core/index.js";
 import { Brand } from "../util/index.js";
-import { RevisionTag, EncodedRevisionTag } from "../core/index.js";
 /**
  * Contains a single change to the `SharedTree` and associated metadata.
  *
@@ -51,11 +51,10 @@ export interface EncodedSummarySessionBranch<TChangeset> {
 export interface EncodedEditManager<TChangeset> {
     readonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];
     readonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];
-    readonly version: typeof version;
+    readonly version: 1 | 2;
 }
-export declare const version = 1;
 export declare const EncodedEditManager: <ChangeSchema extends TSchema>(tChange: ChangeSchema) => import("@sinclair/typebox").TObject<{
-    version: import("@sinclair/typebox").TLiteral<1>;
+    version: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<1>, import("@sinclair/typebox").TLiteral<2>]>;
     trunk: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<import("@sinclair/typebox").TCompositeReduce<[import("@sinclair/typebox").TObject<{
         revision: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>;
         change: ChangeSchema;

package/dist/shared-tree-core/editManagerFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editManagerFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAuB,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAqB,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAEN,WAAW,EAEX,kBAAkB,EAClB,MAAM,kBAAkB,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,WAAW,MAAM,CAAC,UAAU;IACjC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B;AAGD,MAAM,MAAM,aAAa,CAAC,UAAU,IAAI;IACvC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B,CAAC;AAiBF,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAGhE,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,UAAU,CAAE,SAAQ,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU;CAAG;AAKtF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB,CAAC,UAAU;IAC/C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,2BAA2B,CAAC,UAAU;IACtD,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAUD,MAAM,WAAW,kBAAkB,CAAC,UAAU;IAC7C,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,OAAO,EAAE,OAAO,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,OAAO,IAAM,CAAC;AAE3B,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAQ7B,CAAC"}
+{"version":3,"file":"editManagerFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAiB,MAAM,EAAE,OAAO,EAAQ,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EACN,kBAAkB,EAClB,WAAW,EAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAqB,MAAM,kBAAkB,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,WAAW,MAAM,CAAC,UAAU;IACjC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B;AAGD,MAAM,MAAM,aAAa,CAAC,UAAU,IAAI;IACvC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B,CAAC;AAiBF,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAGhE,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,UAAU,CAAE,SAAQ,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU;CAAG;AAKtF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB,CAAC,UAAU;IAC/C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,2BAA2B,CAAC,UAAU;IACtD,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAUD,MAAM,WAAW,kBAAkB,CAAC,UAAU;IAC7C,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAQ7B,CAAC"}

package/dist/shared-tree-core/editManagerFormat.js

@@ -4,36 +4,35 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EncodedEditManager = exports.version = void 0;
+exports.EncodedEditManager = void 0;
 const typebox_1 = require("@sinclair/typebox");
-const index_js_1 = require("../util/index.js");
-const index_js_2 = require("../core/index.js");
+const index_js_1 = require("../core/index.js");
+const index_js_2 = require("../util/index.js");
 const noAdditionalProps = { additionalProperties: false };
 const CommitBase = (tChange) => typebox_1.Type.Object({
-    revision: index_js_2.RevisionTagSchema,
+    revision: index_js_1.RevisionTagSchema,
     change: tChange,
-    sessionId: index_js_2.SessionIdSchema,
+    sessionId: index_js_1.SessionIdSchema,
 });
 /**
  * @privateRemarks Commits are generally encoded from `GraphCommit`s, which often contain extra data.
  * This `noAdditionalProps` is especially important in that light.
  */
 const Commit = (tChange) => typebox_1.Type.Composite([CommitBase(tChange)], noAdditionalProps);
-const SeqNumber = (0, index_js_1.brandedNumberType)({ multipleOf: 1 });
+const SeqNumber = (0, index_js_2.brandedNumberType)({ multipleOf: 1 });
 const SequenceId = typebox_1.Type.Object({
     sequenceNumber: SeqNumber,
     indexInBatch: typebox_1.Type.Optional(typebox_1.Type.Number({ multipleOf: 1, minimum: 0 })),
 });
 const SequencedCommit = (tChange) => typebox_1.Type.Composite([CommitBase(tChange), SequenceId], noAdditionalProps);
 const SummarySessionBranch = (tChange) => typebox_1.Type.Object({
-    base: index_js_2.RevisionTagSchema,
+    base: index_js_1.RevisionTagSchema,
     commits: typebox_1.Type.Array(Commit(tChange)),
 }, noAdditionalProps);
-exports.version = 1.0;
 const EncodedEditManager = (tChange) => typebox_1.Type.Object({
-    version: typebox_1.Type.Literal(exports.version),
+    version: typebox_1.Type.Union([typebox_1.Type.Literal(1), typebox_1.Type.Literal(2)]),
     trunk: typebox_1.Type.Array(SequencedCommit(tChange)),
-    branches: typebox_1.Type.Array(typebox_1.Type.Tuple([index_js_2.SessionIdSchema, SummarySessionBranch(tChange)])),
+    branches: typebox_1.Type.Array(typebox_1.Type.Tuple([index_js_1.SessionIdSchema, SummarySessionBranch(tChange)])),
 }, noAdditionalProps);
 exports.EncodedEditManager = EncodedEditManager;
 //# sourceMappingURL=editManagerFormat.js.map

package/dist/shared-tree-core/editManagerFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"editManagerFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAyE;AAEzE,+CAA4D;AAC5D,+CAK0B;AAsB1B,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC1E,cAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,4BAAiB;IAC3B,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,0BAAe;CAC1B,CAAC,CAAC;AACJ;;;GAGG;AACH,MAAM,MAAM,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACtE,cAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAG1D,MAAM,SAAS,GAAG,IAAA,4BAAiB,EAAY,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;AAElE,MAAM,UAAU,GAAG,cAAI,CAAC,MAAM,CAAC;IAC9B,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CACvE,CAAC,CAAC;AASH,MAAM,eAAe,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC/E,cAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAiBtE,MAAM,oBAAoB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACpF,cAAI,CAAC,MAAM,CACV;IACC,IAAI,EAAE,4BAAiB;IACvB,OAAO,EAAE,cAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACpC,EACD,iBAAiB,CACjB,CAAC;AAQU,QAAA,OAAO,GAAG,GAAG,CAAC;AAEpB,MAAM,kBAAkB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACzF,cAAI,CAAC,MAAM,CACV;IACC,OAAO,EAAE,cAAI,CAAC,OAAO,CAAC,eAAO,CAAC;IAC9B,KAAK,EAAE,cAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,EAAE,cAAI,CAAC,KAAK,CAAC,cAAI,CAAC,KAAK,CAAC,CAAC,0BAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAClF,EACD,iBAAiB,CACjB,CAAC;AARU,QAAA,kBAAkB,sBAQ5B","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { TSchema, Type, ObjectOptions, Static } from \"@sinclair/typebox\";\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { Brand, brandedNumberType } from \"../util/index.js\";\nimport {\n\tSessionIdSchema,\n\tRevisionTag,\n\tRevisionTagSchema,\n\tEncodedRevisionTag,\n} from \"../core/index.js\";\n\n/**\n * Contains a single change to the `SharedTree` and associated metadata.\n *\n * TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, clarify the difference between it and EncodedCommit.\n */\nexport interface Commit<TChangeset> {\n\treadonly revision: RevisionTag;\n\treadonly change: TChangeset;\n\t/** An identifier representing the session/user/client that made this commit */\n\treadonly sessionId: SessionId;\n}\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport type EncodedCommit<TChangeset> = {\n\treadonly revision: EncodedRevisionTag;\n\treadonly change: TChangeset;\n\treadonly sessionId: SessionId;\n};\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst CommitBase = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\tchange: tChange,\n\t\tsessionId: SessionIdSchema,\n\t});\n/**\n * @privateRemarks Commits are generally encoded from `GraphCommit`s, which often contain extra data.\n * This `noAdditionalProps` is especially important in that light.\n */\nconst Commit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange)], noAdditionalProps);\n\nexport type SeqNumber = Brand<number, \"edit-manager.SeqNumber\">;\nconst SeqNumber = brandedNumberType<SeqNumber>({ multipleOf: 1 });\n\nconst SequenceId = Type.Object({\n\tsequenceNumber: SeqNumber,\n\tindexInBatch: Type.Optional(Type.Number({ multipleOf: 1, minimum: 0 })),\n});\n\nexport type SequenceId = Static<typeof SequenceId>;\n\n/**\n * A commit with a sequence number but no parentage; used for serializing the `EditManager` into a summary\n */\nexport interface SequencedCommit<TChangeset> extends Commit<TChangeset>, SequenceId {}\n\nconst SequencedCommit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange), SequenceId], noAdditionalProps);\n\n/**\n * A branch off of the trunk for use in summaries.\n *\n * TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, use EncodedCommit instead of Commit or clarify that Commit is also an encoded format.\n */\nexport interface SummarySessionBranch<TChangeset> {\n\treadonly base: RevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\n\nexport interface EncodedSummarySessionBranch<TChangeset> {\n\treadonly base: EncodedRevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\nconst SummarySessionBranch = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tbase: RevisionTagSchema,\n\t\t\tcommits: Type.Array(Commit(tChange)),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n\nexport interface EncodedEditManager<TChangeset> {\n\treadonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];\n\treadonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];\n\treadonly version: typeof version;\n}\n\nexport const version = 1.0;\n\nexport const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tversion: Type.Literal(version),\n\t\t\ttrunk: Type.Array(SequencedCommit(tChange)),\n\t\t\tbranches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n"]}
+{"version":3,"file":"editManagerFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,+CAAyE;AAEzE,+CAK0B;AAC1B,+CAA4D;AAsB5D,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC1E,cAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,4BAAiB;IAC3B,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,0BAAe;CAC1B,CAAC,CAAC;AACJ;;;GAGG;AACH,MAAM,MAAM,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACtE,cAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAG1D,MAAM,SAAS,GAAG,IAAA,4BAAiB,EAAY,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;AAElE,MAAM,UAAU,GAAG,cAAI,CAAC,MAAM,CAAC;IAC9B,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CACvE,CAAC,CAAC;AASH,MAAM,eAAe,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC/E,cAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAiBtE,MAAM,oBAAoB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACpF,cAAI,CAAC,MAAM,CACV;IACC,IAAI,EAAE,4BAAiB;IACvB,OAAO,EAAE,cAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACpC,EACD,iBAAiB,CACjB,CAAC;AAQI,MAAM,kBAAkB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACzF,cAAI,CAAC,MAAM,CACV;IACC,OAAO,EAAE,cAAI,CAAC,KAAK,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,cAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,KAAK,EAAE,cAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,EAAE,cAAI,CAAC,KAAK,CAAC,cAAI,CAAC,KAAK,CAAC,CAAC,0BAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAClF,EACD,iBAAiB,CACjB,CAAC;AARU,QAAA,kBAAkB,sBAQ5B","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { ObjectOptions, Static, TSchema, Type } from \"@sinclair/typebox\";\n\nimport {\n\tEncodedRevisionTag,\n\tRevisionTag,\n\tRevisionTagSchema,\n\tSessionIdSchema,\n} from \"../core/index.js\";\nimport { Brand, brandedNumberType } from \"../util/index.js\";\n\n/**\n * Contains a single change to the `SharedTree` and associated metadata.\n *\n * TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, clarify the difference between it and EncodedCommit.\n */\nexport interface Commit<TChangeset> {\n\treadonly revision: RevisionTag;\n\treadonly change: TChangeset;\n\t/** An identifier representing the session/user/client that made this commit */\n\treadonly sessionId: SessionId;\n}\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport type EncodedCommit<TChangeset> = {\n\treadonly revision: EncodedRevisionTag;\n\treadonly change: TChangeset;\n\treadonly sessionId: SessionId;\n};\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst CommitBase = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\tchange: tChange,\n\t\tsessionId: SessionIdSchema,\n\t});\n/**\n * @privateRemarks Commits are generally encoded from `GraphCommit`s, which often contain extra data.\n * This `noAdditionalProps` is especially important in that light.\n */\nconst Commit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange)], noAdditionalProps);\n\nexport type SeqNumber = Brand<number, \"edit-manager.SeqNumber\">;\nconst SeqNumber = brandedNumberType<SeqNumber>({ multipleOf: 1 });\n\nconst SequenceId = Type.Object({\n\tsequenceNumber: SeqNumber,\n\tindexInBatch: Type.Optional(Type.Number({ multipleOf: 1, minimum: 0 })),\n});\n\nexport type SequenceId = Static<typeof SequenceId>;\n\n/**\n * A commit with a sequence number but no parentage; used for serializing the `EditManager` into a summary\n */\nexport interface SequencedCommit<TChangeset> extends Commit<TChangeset>, SequenceId {}\n\nconst SequencedCommit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange), SequenceId], noAdditionalProps);\n\n/**\n * A branch off of the trunk for use in summaries.\n *\n * TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, use EncodedCommit instead of Commit or clarify that Commit is also an encoded format.\n */\nexport interface SummarySessionBranch<TChangeset> {\n\treadonly base: RevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\n\nexport interface EncodedSummarySessionBranch<TChangeset> {\n\treadonly base: EncodedRevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\nconst SummarySessionBranch = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tbase: RevisionTagSchema,\n\t\t\tcommits: Type.Array(Commit(tChange)),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n\nexport interface EncodedEditManager<TChangeset> {\n\treadonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];\n\treadonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];\n\treadonly version: 1 | 2;\n}\n\nexport const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tversion: Type.Union([Type.Literal(1), Type.Literal(2)]),\n\t\t\ttrunk: Type.Array(SequencedCommit(tChange)),\n\t\t\tbranches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n"]}

package/dist/shared-tree-core/editManagerSummarizer.d.ts

@@ -4,20 +4,21 @@
  */
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import { IGarbageCollectionData, ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions";
-import { ICodecOptions, IJsonCodec } from "../codec/index.js";
-import { ChangeEncodingContext, ChangeFamily, ChangeFamilyEditor, EncodedRevisionTag, RevisionTag } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
+import { IJsonCodec } from "../codec/index.js";
+import { ChangeFamily, ChangeFamilyEditor, SchemaAndPolicy } from "../core/index.js";
+import { JsonCompatibleReadOnly } from "../util/index.js";
+import { EditManager, SummaryData } from "./editManager.js";
+import { EditManagerEncodingContext } from "./editManagerCodecs.js";
 import { Summarizable, SummaryElementParser, SummaryElementStringifier } from "./sharedTreeCore.js";
-import { EditManager } from "./editManager.js";
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
 export declare class EditManagerSummarizer<TChangeset> implements Summarizable {
     private readonly editManager;
+    private readonly codec;
     private readonly schemaAndPolicy?;
     readonly key = "EditManager";
-    private readonly codec;
-    constructor(editManager: EditManager<ChangeFamilyEditor, TChangeset, ChangeFamily<ChangeFamilyEditor, TChangeset>>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions, schemaAndPolicy?: SchemaAndPolicy | undefined);
+    constructor(editManager: EditManager<ChangeFamilyEditor, TChangeset, ChangeFamily<ChangeFamilyEditor, TChangeset>>, codec: IJsonCodec<SummaryData<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, EditManagerEncodingContext>, schemaAndPolicy?: SchemaAndPolicy | undefined);
     getAttachSummary(stringify: SummaryElementStringifier, fullTree?: boolean, trackState?: boolean, telemetryContext?: ITelemetryContext): ISummaryTreeWithStats;
     summarize(stringify: SummaryElementStringifier, fullTree?: boolean, trackState?: boolean, telemetryContext?: ITelemetryContext): Promise<ISummaryTreeWithStats>;
     private summarizeCore;

package/dist/shared-tree-core/editManagerSummarizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editManagerSummarizer.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EACN,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EACN,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,WAAW,EAAe,MAAM,kBAAkB,CAAC;AAO5D;;GAEG;AACH,qBAAa,qBAAqB,CAAC,UAAU,CAAE,YAAW,YAAY;IAepE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAY5B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IA1BlC,SAAgB,GAAG,iBAAiB;IAOpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAKpB;gBAEgB,WAAW,EAAE,WAAW,CACxC,kBAAkB,EAClB,UAAU,EACV,YAAY,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAC5C,EACD,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,EACL,eAAe,CAAC,6BAAiB;IAM5C,gBAAgB,CACtB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,qBAAqB;IAIX,SAAS,CACrB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,qBAAqB,CAAC;IAIjC,OAAO,CAAC,aAAa;IAQd,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,sBAAsB;IAU7C,IAAI,CAChB,QAAQ,EAAE,sBAAsB,EAChC,KAAK,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;CAehB"}
+{"version":3,"file":"editManagerSummarizer.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EACN,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAIpG;;GAEG;AACH,qBAAa,qBAAqB,CAAC,UAAU,CAAE,YAAW,YAAY;IAIpE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAK5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAMtB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAdlC,SAAgB,GAAG,iBAAiB;gBAGlB,WAAW,EAAE,WAAW,CACxC,kBAAkB,EAClB,UAAU,EACV,YAAY,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAC5C,EACgB,KAAK,EAAE,UAAU,CACjC,WAAW,CAAC,UAAU,CAAC,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,EACgB,eAAe,CAAC,6BAAiB;IAG5C,gBAAgB,CACtB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,qBAAqB;IAIX,SAAS,CACrB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,qBAAqB,CAAC;IAIjC,OAAO,CAAC,aAAa;IAQd,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,sBAAsB;IAU7C,IAAI,CAChB,QAAQ,EAAE,sBAAsB,EAChC,KAAK,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;CAehB"}

package/dist/shared-tree-core/editManagerSummarizer.js

@@ -6,21 +6,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditManagerSummarizer = void 0;
 const client_utils_1 = require("@fluid-internal/client-utils");
-const core_utils_1 = require("@fluidframework/core-utils");
-const shared_object_base_1 = require("@fluidframework/shared-object-base");
-const editManagerCodecs_js_1 = require("./editManagerCodecs.js");
+const internal_1 = require("@fluidframework/core-utils/internal");
+const internal_2 = require("@fluidframework/shared-object-base/internal");
 const stringKey = "String";
-const formatVersion = 0;
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
 class EditManagerSummarizer {
-    constructor(editManager, revisionTagCodec, options, schemaAndPolicy) {
+    constructor(editManager, codec, schemaAndPolicy) {
         this.editManager = editManager;
+        this.codec = codec;
         this.schemaAndPolicy = schemaAndPolicy;
         this.key = "EditManager";
-        const changesetCodec = this.editManager.changeFamily.codecs.resolve(formatVersion);
-        this.codec = (0, editManagerCodecs_js_1.makeEditManagerCodec)(changesetCodec, revisionTagCodec, options);
     }
     getAttachSummary(stringify, fullTree, trackState, telemetryContext) {
         return this.summarizeCore(stringify);
@@ -32,7 +29,7 @@ class EditManagerSummarizer {
         const context = this.schemaAndPolicy !== undefined ? { schema: this.schemaAndPolicy } : {};
         const jsonCompatible = this.codec.encode(this.editManager.getSummaryData(), context);
         const dataString = stringify(jsonCompatible);
-        return (0, shared_object_base_1.createSingleBlobSummary)(stringKey, dataString);
+        return (0, internal_2.createSingleBlobSummary)(stringKey, dataString);
     }
     getGCData(fullGC) {
         // TODO: Properly implement garbage collection. Right now, garbage collection is performed automatically
@@ -48,7 +45,7 @@ class EditManagerSummarizer {
         // After the awaits, validate that the data is in a clean state.
         // This detects any data that could have been accidentally added through
         // invalid means and is about to be overwritten.
-        (0, core_utils_1.assert)(this.editManager.isEmpty(), 0x42c /* There should not already be stored EditManager data when loading from summary */);
+        (0, internal_1.assert)(this.editManager.isEmpty(), 0x42c /* There should not already be stored EditManager data when loading from summary */);
         const summary = parse((0, client_utils_1.bufferToString)(schemaBuffer, "utf-8"));
         const data = this.codec.decode(summary, {});
         this.editManager.loadSummaryData(data);

package/dist/shared-tree-core/editManagerSummarizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"editManagerSummarizer.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAA8D;AAC9D,2DAAoD;AAOpD,2EAA6E;AAa7E,iEAA0F;AAE1F,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB;;GAEG;AACH,MAAa,qBAAqB;IAcjC,YACkB,WAIhB,EACD,gBAKC,EACD,OAAsB,EACL,eAAiC;QAZjC,gBAAW,GAAX,WAAW,CAI3B;QAQgB,oBAAe,GAAf,eAAe,CAAkB;QA1BnC,QAAG,GAAG,aAAa,CAAC;QA4BnC,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACnF,IAAI,CAAC,KAAK,GAAG,IAAA,2CAAoB,EAAC,cAAc,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAEM,gBAAgB,CACtB,SAAoC,EACpC,QAAkB,EAClB,UAAoB,EACpB,gBAAoC;QAEpC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,SAAS,CACrB,SAAoC,EACpC,QAAkB,EAClB,UAAoB,EACpB,gBAAoC;QAEpC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAEO,aAAa,CAAC,SAAoC;QACzD,MAAM,OAAO,GACZ,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QAC7C,OAAO,IAAA,4CAAuB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,SAAS,CAAC,MAAgB;QAChC,wGAAwG;QACxG,0GAA0G;QAC1G,2GAA2G;QAC3G,QAAQ;QACR,OAAO;YACN,OAAO,EAAE,EAAE;SACX,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAChB,QAAgC,EAChC,KAA2B;QAE3B,MAAM,YAAY,GAAoB,MAAM,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzE,gEAAgE;QAChE,wEAAwE;QACxE,gDAAgD;QAChD,IAAA,mBAAM,EACL,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAC1B,KAAK,CAAC,mFAAmF,CACzF,CAAC;QAEF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAA,6BAAc,EAAC,YAAY,EAAE,OAAO,CAAC,CAA2B,CAAC;QACvF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACD;AAvFD,sDAuFC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils\";\nimport { IChannelStorageService } from \"@fluidframework/datastore-definitions\";\nimport {\n\tIGarbageCollectionData,\n\tISummaryTreeWithStats,\n\tITelemetryContext,\n} from \"@fluidframework/runtime-definitions\";\nimport { createSingleBlobSummary } from \"@fluidframework/shared-object-base\";\nimport { ICodecOptions, IJsonCodec } from \"../codec/index.js\";\nimport {\n\tChangeEncodingContext,\n\tChangeFamily,\n\tChangeFamilyEditor,\n\tEncodedRevisionTag,\n\tRevisionTag,\n} from \"../core/index.js\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\nimport { SchemaAndPolicy } from \"../feature-libraries/index.js\";\nimport { Summarizable, SummaryElementParser, SummaryElementStringifier } from \"./sharedTreeCore.js\";\nimport { EditManager, SummaryData } from \"./editManager.js\";\nimport { EditManagerEncodingContext, makeEditManagerCodec } from \"./editManagerCodecs.js\";\n\nconst stringKey = \"String\";\n\nconst formatVersion = 0;\n\n/**\n * Provides methods for summarizing and loading an `EditManager`\n */\nexport class EditManagerSummarizer<TChangeset> implements Summarizable {\n\tpublic readonly key = \"EditManager\";\n\n\t// Note: since there is only one format, this can just be cached on the class.\n\t// With more write formats active, it may make sense to keep around the \"usual\" format codec\n\t// (the one for the current persisted configuration) and resolve codecs for different versions\n\t// as necessary (e.g. an upgrade op came in, or the configuration changed within the collab window\n\t// and an op needs to be interpreted which isn't written with the current configuration).\n\tprivate readonly codec: IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tEditManagerEncodingContext\n\t>;\n\tpublic constructor(\n\t\tprivate readonly editManager: EditManager<\n\t\t\tChangeFamilyEditor,\n\t\t\tTChangeset,\n\t\t\tChangeFamily<ChangeFamilyEditor, TChangeset>\n\t\t>,\n\t\trevisionTagCodec: IJsonCodec<\n\t\t\tRevisionTag,\n\t\t\tEncodedRevisionTag,\n\t\t\tEncodedRevisionTag,\n\t\t\tChangeEncodingContext\n\t\t>,\n\t\toptions: ICodecOptions,\n\t\tprivate readonly schemaAndPolicy?: SchemaAndPolicy,\n\t) {\n\t\tconst changesetCodec = this.editManager.changeFamily.codecs.resolve(formatVersion);\n\t\tthis.codec = makeEditManagerCodec(changesetCodec, revisionTagCodec, options);\n\t}\n\n\tpublic getAttachSummary(\n\t\tstringify: SummaryElementStringifier,\n\t\tfullTree?: boolean,\n\t\ttrackState?: boolean,\n\t\ttelemetryContext?: ITelemetryContext,\n\t): ISummaryTreeWithStats {\n\t\treturn this.summarizeCore(stringify);\n\t}\n\n\tpublic async summarize(\n\t\tstringify: SummaryElementStringifier,\n\t\tfullTree?: boolean,\n\t\ttrackState?: boolean,\n\t\ttelemetryContext?: ITelemetryContext,\n\t): Promise<ISummaryTreeWithStats> {\n\t\treturn this.summarizeCore(stringify);\n\t}\n\n\tprivate summarizeCore(stringify: SummaryElementStringifier): ISummaryTreeWithStats {\n\t\tconst context: EditManagerEncodingContext =\n\t\t\tthis.schemaAndPolicy !== undefined ? { schema: this.schemaAndPolicy } : {};\n\t\tconst jsonCompatible = this.codec.encode(this.editManager.getSummaryData(), context);\n\t\tconst dataString = stringify(jsonCompatible);\n\t\treturn createSingleBlobSummary(stringKey, dataString);\n\t}\n\n\tpublic getGCData(fullGC?: boolean): IGarbageCollectionData {\n\t\t// TODO: Properly implement garbage collection. Right now, garbage collection is performed automatically\n\t\t// by the code in SharedObject (from which SharedTreeCore extends). The `runtime.uploadBlob` API delegates\n\t\t// to the `BlobManager`, which automatically populates the summary with ISummaryAttachment entries for each\n\t\t// blob.\n\t\treturn {\n\t\t\tgcNodes: {},\n\t\t};\n\t}\n\n\tpublic async load(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(stringKey);\n\n\t\t// After the awaits, validate that the data is in a clean state.\n\t\t// This detects any data that could have been accidentally added through\n\t\t// invalid means and is about to be overwritten.\n\t\tassert(\n\t\t\tthis.editManager.isEmpty(),\n\t\t\t0x42c /* There should not already be stored EditManager data when loading from summary */,\n\t\t);\n\n\t\tconst summary = parse(bufferToString(schemaBuffer, \"utf-8\")) as JsonCompatibleReadOnly;\n\t\tconst data = this.codec.decode(summary, {});\n\t\tthis.editManager.loadSummaryData(data);\n\t}\n}\n"]}
+{"version":3,"file":"editManagerSummarizer.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAA8D;AAC9D,kEAA6D;AAO7D,0EAAsF;AAUtF,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B;;GAEG;AACH,MAAa,qBAAqB;IAGjC,YACkB,WAIhB,EACgB,KAKhB,EACgB,eAAiC;QAXjC,gBAAW,GAAX,WAAW,CAI3B;QACgB,UAAK,GAAL,KAAK,CAKrB;QACgB,oBAAe,GAAf,eAAe,CAAkB;QAdnC,QAAG,GAAG,aAAa,CAAC;IAejC,CAAC;IAEG,gBAAgB,CACtB,SAAoC,EACpC,QAAkB,EAClB,UAAoB,EACpB,gBAAoC;QAEpC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,SAAS,CACrB,SAAoC,EACpC,QAAkB,EAClB,UAAoB,EACpB,gBAAoC;QAEpC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAEO,aAAa,CAAC,SAAoC;QACzD,MAAM,OAAO,GACZ,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QAC7C,OAAO,IAAA,kCAAuB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,SAAS,CAAC,MAAgB;QAChC,wGAAwG;QACxG,0GAA0G;QAC1G,2GAA2G;QAC3G,QAAQ;QACR,OAAO;YACN,OAAO,EAAE,EAAE;SACX,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAChB,QAAgC,EAChC,KAA2B;QAE3B,MAAM,YAAY,GAAoB,MAAM,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzE,gEAAgE;QAChE,wEAAwE;QACxE,gDAAgD;QAChD,IAAA,iBAAM,EACL,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAC1B,KAAK,CAAC,mFAAmF,CACzF,CAAC;QAEF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAA,6BAAc,EAAC,YAAY,EAAE,OAAO,CAAC,CAA2B,CAAC;QACvF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACD;AAxED,sDAwEC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport { IChannelStorageService } from \"@fluidframework/datastore-definitions\";\nimport {\n\tIGarbageCollectionData,\n\tISummaryTreeWithStats,\n\tITelemetryContext,\n} from \"@fluidframework/runtime-definitions\";\nimport { createSingleBlobSummary } from \"@fluidframework/shared-object-base/internal\";\n\nimport { IJsonCodec } from \"../codec/index.js\";\nimport { ChangeFamily, ChangeFamilyEditor, SchemaAndPolicy } from \"../core/index.js\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\n\nimport { EditManager, SummaryData } from \"./editManager.js\";\nimport { EditManagerEncodingContext } from \"./editManagerCodecs.js\";\nimport { Summarizable, SummaryElementParser, SummaryElementStringifier } from \"./sharedTreeCore.js\";\n\nconst stringKey = \"String\";\n\n/**\n * Provides methods for summarizing and loading an `EditManager`\n */\nexport class EditManagerSummarizer<TChangeset> implements Summarizable {\n\tpublic readonly key = \"EditManager\";\n\n\tpublic constructor(\n\t\tprivate readonly editManager: EditManager<\n\t\t\tChangeFamilyEditor,\n\t\t\tTChangeset,\n\t\t\tChangeFamily<ChangeFamilyEditor, TChangeset>\n\t\t>,\n\t\tprivate readonly codec: IJsonCodec<\n\t\t\tSummaryData<TChangeset>,\n\t\t\tJsonCompatibleReadOnly,\n\t\t\tJsonCompatibleReadOnly,\n\t\t\tEditManagerEncodingContext\n\t\t>,\n\t\tprivate readonly schemaAndPolicy?: SchemaAndPolicy,\n\t) {}\n\n\tpublic getAttachSummary(\n\t\tstringify: SummaryElementStringifier,\n\t\tfullTree?: boolean,\n\t\ttrackState?: boolean,\n\t\ttelemetryContext?: ITelemetryContext,\n\t): ISummaryTreeWithStats {\n\t\treturn this.summarizeCore(stringify);\n\t}\n\n\tpublic async summarize(\n\t\tstringify: SummaryElementStringifier,\n\t\tfullTree?: boolean,\n\t\ttrackState?: boolean,\n\t\ttelemetryContext?: ITelemetryContext,\n\t): Promise<ISummaryTreeWithStats> {\n\t\treturn this.summarizeCore(stringify);\n\t}\n\n\tprivate summarizeCore(stringify: SummaryElementStringifier): ISummaryTreeWithStats {\n\t\tconst context: EditManagerEncodingContext =\n\t\t\tthis.schemaAndPolicy !== undefined ? { schema: this.schemaAndPolicy } : {};\n\t\tconst jsonCompatible = this.codec.encode(this.editManager.getSummaryData(), context);\n\t\tconst dataString = stringify(jsonCompatible);\n\t\treturn createSingleBlobSummary(stringKey, dataString);\n\t}\n\n\tpublic getGCData(fullGC?: boolean): IGarbageCollectionData {\n\t\t// TODO: Properly implement garbage collection. Right now, garbage collection is performed automatically\n\t\t// by the code in SharedObject (from which SharedTreeCore extends). The `runtime.uploadBlob` API delegates\n\t\t// to the `BlobManager`, which automatically populates the summary with ISummaryAttachment entries for each\n\t\t// blob.\n\t\treturn {\n\t\t\tgcNodes: {},\n\t\t};\n\t}\n\n\tpublic async load(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(stringKey);\n\n\t\t// After the awaits, validate that the data is in a clean state.\n\t\t// This detects any data that could have been accidentally added through\n\t\t// invalid means and is about to be overwritten.\n\t\tassert(\n\t\t\tthis.editManager.isEmpty(),\n\t\t\t0x42c /* There should not already be stored EditManager data when loading from summary */,\n\t\t);\n\n\t\tconst summary = parse(bufferToString(schemaBuffer, \"utf-8\")) as JsonCompatibleReadOnly;\n\t\tconst data = this.codec.decode(summary, {});\n\t\tthis.editManager.loadSummaryData(data);\n\t}\n}\n"]}

package/dist/shared-tree-core/index.d.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 export { onForkTransitive, SharedTreeBranch, SharedTreeBranchChange, SharedTreeBranchEvents, getChangeReplaceType, } from "./branch.js";
-export { SharedTreeCore, Summarizable, SummaryElementParser, SummaryElementStringifier, } from "./sharedTreeCore.js";
+export { ExplicitCoreCodecVersions, SharedTreeCore, Summarizable, SummaryElementParser, SummaryElementStringifier, } from "./sharedTreeCore.js";
 export { TransactionStack } from "./transactionStack.js";
 export { makeEditManagerCodec } from "./editManagerCodecs.js";
 export { EditManagerSummarizer } from "./editManagerSummarizer.js";

package/dist/shared-tree-core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,GACpB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,yBAAyB,GACzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACN,MAAM,EACN,SAAS,EACT,eAAe,EACf,oBAAoB,EACpB,aAAa,GACb,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,GACpB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,yBAAyB,EACzB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,yBAAyB,GACzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACN,MAAM,EACN,SAAS,EACT,eAAe,EACf,oBAAoB,EACpB,aAAa,GACb,MAAM,wBAAwB,CAAC"}

package/dist/shared-tree-core/index.js

@@ -1,10 +1,10 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.minimumPossibleSequenceNumber = exports.EditManager = exports.EditManagerSummarizer = exports.makeEditManagerCodec = exports.TransactionStack = exports.SharedTreeCore = exports.getChangeReplaceType = exports.SharedTreeBranch = exports.onForkTransitive = void 0;
 /*!
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.minimumPossibleSequenceNumber = exports.EditManager = exports.EditManagerSummarizer = exports.makeEditManagerCodec = exports.TransactionStack = exports.SharedTreeCore = exports.getChangeReplaceType = exports.SharedTreeBranch = exports.onForkTransitive = void 0;
 var branch_js_1 = require("./branch.js");
 Object.defineProperty(exports, "onForkTransitive", { enumerable: true, get: function () { return branch_js_1.onForkTransitive; } });
 Object.defineProperty(exports, "SharedTreeBranch", { enumerable: true, get: function () { return branch_js_1.SharedTreeBranch; } });

package/dist/shared-tree-core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shared-tree-core/index.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,yCAMqB;AALpB,6GAAA,gBAAgB,OAAA;AAChB,6GAAA,gBAAgB,OAAA;AAGhB,iHAAA,oBAAoB,OAAA;AAGrB,yDAK6B;AAJ5B,mHAAA,cAAc,OAAA;AAMf,6DAAyD;AAAhD,uHAAA,gBAAgB,OAAA;AAEzB,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,mDAA2F;AAAlF,6GAAA,WAAW,OAAA;AAAE,+HAAA,6BAA6B,OAAA","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nexport {\n\tonForkTransitive,\n\tSharedTreeBranch,\n\tSharedTreeBranchChange,\n\tSharedTreeBranchEvents,\n\tgetChangeReplaceType,\n} from \"./branch.js\";\n\nexport {\n\tSharedTreeCore,\n\tSummarizable,\n\tSummaryElementParser,\n\tSummaryElementStringifier,\n} from \"./sharedTreeCore.js\";\n\nexport { TransactionStack } from \"./transactionStack.js\";\n\nexport { makeEditManagerCodec } from \"./editManagerCodecs.js\";\nexport { EditManagerSummarizer } from \"./editManagerSummarizer.js\";\nexport { EditManager, minimumPossibleSequenceNumber, SummaryData } from \"./editManager.js\";\nexport {\n\tCommit,\n\tSeqNumber,\n\tSequencedCommit,\n\tSummarySessionBranch,\n\tEncodedCommit,\n} from \"./editManagerFormat.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shared-tree-core/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,yCAMqB;AALpB,6GAAA,gBAAgB,OAAA;AAChB,6GAAA,gBAAgB,OAAA;AAGhB,iHAAA,oBAAoB,OAAA;AAGrB,yDAM6B;AAJ5B,mHAAA,cAAc,OAAA;AAMf,6DAAyD;AAAhD,uHAAA,gBAAgB,OAAA;AAEzB,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,mDAA2F;AAAlF,6GAAA,WAAW,OAAA;AAAE,+HAAA,6BAA6B,OAAA","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport {\n\tonForkTransitive,\n\tSharedTreeBranch,\n\tSharedTreeBranchChange,\n\tSharedTreeBranchEvents,\n\tgetChangeReplaceType,\n} from \"./branch.js\";\n\nexport {\n\tExplicitCoreCodecVersions,\n\tSharedTreeCore,\n\tSummarizable,\n\tSummaryElementParser,\n\tSummaryElementStringifier,\n} from \"./sharedTreeCore.js\";\n\nexport { TransactionStack } from \"./transactionStack.js\";\n\nexport { makeEditManagerCodec } from \"./editManagerCodecs.js\";\nexport { EditManagerSummarizer } from \"./editManagerSummarizer.js\";\nexport { EditManager, minimumPossibleSequenceNumber, SummaryData } from \"./editManager.js\";\nexport {\n\tCommit,\n\tSeqNumber,\n\tSequencedCommit,\n\tSummarySessionBranch,\n\tEncodedCommit,\n} from \"./editManagerFormat.js\";\n"]}

package/dist/shared-tree-core/messageCodecs.d.ts

@@ -2,13 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { type ICodecFamily, ICodecOptions, IJsonCodec } from "../codec/index.js";
+import { ChangeEncodingContext, EncodedRevisionTag, RevisionTag, SchemaAndPolicy } from "../core/index.js";
 import { JsonCompatibleReadOnly } from "../util/index.js";
-import { ICodecOptions, IJsonCodec } from "../codec/index.js";
-import { ChangeEncodingContext, ChangeFamilyCodec, EncodedRevisionTag, RevisionTag } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
 import { DecodedMessage } from "./messageTypes.js";
 export interface MessageEncodingContext {
     schema?: SchemaAndPolicy;
 }
-export declare function makeMessageCodec<TChangeset>(changeCodec: ChangeFamilyCodec<TChangeset>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions): IJsonCodec<DecodedMessage<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, MessageEncodingContext>;
+export declare function makeMessageCodec<TChangeset>(changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions, writeVersion: number): IJsonCodec<DecodedMessage<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, MessageEncodingContext>;
+/**
+ * @privateRemarks - Exported for testing.
+ */
+export declare function makeMessageCodecs<TChangeset>(changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions): ICodecFamily<DecodedMessage<TChangeset>, MessageEncodingContext>;
 //# sourceMappingURL=messageCodecs.d.ts.map

package/dist/shared-tree-core/messageCodecs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageCodecs.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAwB,MAAM,mBAAmB,CAAC;AACpF,OAAO,EACN,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,WAAW,sBAAsB;IACtC,MAAM,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAC1C,WAAW,EAAE,iBAAiB,CAAC,UAAU,CAAC,EAC1C,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,GACpB,UAAU,CACZ,cAAc,CAAC,UAAU,CAAC,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,CACtB,CAsCA"}
+{"version":3,"file":"messageCodecs.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EACN,KAAK,YAAY,EACjB,aAAa,EACb,UAAU,EAIV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,qBAAqB,EAErB,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,sBAAsB;IACtC,MAAM,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAC1C,YAAY,EAAE,YAAY,CAAC,UAAU,EAAE,qBAAqB,CAAC,EAC7D,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,GAClB,UAAU,CACZ,cAAc,CAAC,UAAU,CAAC,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,CACtB,CAGA;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAC3C,YAAY,EAAE,YAAY,CAAC,UAAU,EAAE,qBAAqB,CAAC,EAC7D,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,GACpB,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,sBAAsB,CAAC,CAalE"}

package/dist/shared-tree-core/messageCodecs.js

@@ -4,12 +4,29 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMessageCodec = void 0;
+exports.makeMessageCodecs = exports.makeMessageCodec = void 0;
 const typebox_1 = require("@sinclair/typebox");
 const index_js_1 = require("../codec/index.js");
 const messageFormat_js_1 = require("./messageFormat.js");
-function makeMessageCodec(changeCodec, revisionTagCodec, options) {
-    // TODO: consider adding version and using makeVersionedValidatedCodec
+function makeMessageCodec(changeCodecs, revisionTagCodec, options, writeVersion) {
+    const family = makeMessageCodecs(changeCodecs, revisionTagCodec, options);
+    return (0, index_js_1.makeVersionDispatchingCodec)(family, { ...options, writeVersion });
+}
+exports.makeMessageCodec = makeMessageCodec;
+/**
+ * @privateRemarks - Exported for testing.
+ */
+function makeMessageCodecs(changeCodecs, revisionTagCodec, options) {
+    const v1Codec = makeV1CodecWithVersion(changeCodecs.resolve(1).json, revisionTagCodec, options, 1);
+    return (0, index_js_1.makeCodecFamily)([
+        // Back-compat: messages weren't always written with an explicit version field.
+        [undefined, v1Codec],
+        [1, v1Codec],
+        [2, makeV1CodecWithVersion(changeCodecs.resolve(2).json, revisionTagCodec, options, 2)],
+    ]);
+}
+exports.makeMessageCodecs = makeMessageCodecs;
+function makeV1CodecWithVersion(changeCodec, revisionTagCodec, options, version) {
     return (0, index_js_1.withSchemaValidation)((0, messageFormat_js_1.Message)(changeCodec.encodedSchema ?? typebox_1.Type.Any()), {
         encode: ({ commit, sessionId: originatorId }, context) => {
             const message = {
@@ -19,6 +36,7 @@ function makeMessageCodec(changeCodec, revisionTagCodec, options) {
                     originatorId,
                     schema: context.schema,
                 }),
+                version,
             };
             return message;
         },
@@ -34,5 +52,4 @@ function makeMessageCodec(changeCodec, revisionTagCodec, options) {
         },
     }, options.jsonValidator);
 }
-exports.makeMessageCodec = makeMessageCodec;
 //# sourceMappingURL=messageCodecs.js.map

package/dist/shared-tree-core/messageCodecs.js.map

@@ -1 +1 @@
-{"version":3,"file":"messageCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageCodecs.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAqD;AAErD,gDAAoF;AASpF,yDAA6C;AAM7C,SAAgB,gBAAgB,CAC/B,WAA0C,EAC1C,gBAKC,EACD,OAAsB;IAOtB,sEAAsE;IACtE,OAAO,IAAA,+BAAoB,EAO1B,IAAA,0BAAO,EAAC,WAAW,CAAC,aAAa,IAAI,cAAI,CAAC,GAAG,EAAE,CAAC,EAChD;QACC,MAAM,EAAE,CACP,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAA8B,EAC/D,OAA+B,EAC9B,EAAE;YACH,MAAM,OAAO,GAAY;gBACxB,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC;gBACpE,YAAY;gBACZ,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;oBAC5C,YAAY;oBACZ,MAAM,EAAE,OAAO,CAAC,MAAM;iBACtB,CAAC;aACF,CAAC;YACF,OAAO,OAA4C,CAAC;QACrD,CAAC;QACD,MAAM,EAAE,CAAC,OAA+B,EAAE,EAAE;YAC3C,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAA6B,CAAC;YAC5E,OAAO;gBACN,MAAM,EAAE;oBACP,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC;oBAC7D,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,CAAC;iBACvD;gBACD,SAAS,EAAE,YAAY;aACvB,CAAC;QACH,CAAC;KACD,EACD,OAAO,CAAC,aAAa,CACrB,CAAC;AACH,CAAC;AApDD,4CAoDC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { TAnySchema, Type } from \"@sinclair/typebox\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\nimport { ICodecOptions, IJsonCodec, withSchemaValidation } from \"../codec/index.js\";\nimport {\n\tChangeEncodingContext,\n\tChangeFamilyCodec,\n\tEncodedRevisionTag,\n\tRevisionTag,\n} from \"../core/index.js\";\nimport { SchemaAndPolicy } from \"../feature-libraries/index.js\";\nimport { DecodedMessage } from \"./messageTypes.js\";\nimport { Message } from \"./messageFormat.js\";\n\nexport interface MessageEncodingContext {\n\tschema?: SchemaAndPolicy;\n}\n\nexport function makeMessageCodec<TChangeset>(\n\tchangeCodec: ChangeFamilyCodec<TChangeset>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): IJsonCodec<\n\tDecodedMessage<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tMessageEncodingContext\n> {\n\t// TODO: consider adding version and using makeVersionedValidatedCodec\n\treturn withSchemaValidation<\n\t\tDecodedMessage<TChangeset>,\n\t\tTAnySchema,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tMessageEncodingContext\n\t>(\n\t\tMessage(changeCodec.encodedSchema ?? Type.Any()),\n\t\t{\n\t\t\tencode: (\n\t\t\t\t{ commit, sessionId: originatorId }: DecodedMessage<TChangeset>,\n\t\t\t\tcontext: MessageEncodingContext,\n\t\t\t) => {\n\t\t\t\tconst message: Message = {\n\t\t\t\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId }),\n\t\t\t\t\toriginatorId,\n\t\t\t\t\tchangeset: changeCodec.encode(commit.change, {\n\t\t\t\t\t\toriginatorId,\n\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t}),\n\t\t\t\t};\n\t\t\t\treturn message as unknown as JsonCompatibleReadOnly;\n\t\t\t},\n\t\t\tdecode: (encoded: JsonCompatibleReadOnly) => {\n\t\t\t\tconst { revision, originatorId, changeset } = encoded as unknown as Message;\n\t\t\t\treturn {\n\t\t\t\t\tcommit: {\n\t\t\t\t\t\trevision: revisionTagCodec.decode(revision, { originatorId }),\n\t\t\t\t\t\tchange: changeCodec.decode(changeset, { originatorId }),\n\t\t\t\t\t},\n\t\t\t\t\tsessionId: originatorId,\n\t\t\t\t};\n\t\t\t},\n\t\t},\n\t\toptions.jsonValidator,\n\t);\n}\n"]}
+{"version":3,"file":"messageCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageCodecs.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAqD;AAErD,gDAO2B;AAU3B,yDAA6C;AAO7C,SAAgB,gBAAgB,CAC/B,YAA6D,EAC7D,gBAKC,EACD,OAAsB,EACtB,YAAoB;IAOpB,MAAM,MAAM,GAAG,iBAAiB,CAAC,YAAY,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC1E,OAAO,IAAA,sCAA2B,EAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;AAC1E,CAAC;AAlBD,4CAkBC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAChC,YAA6D,EAC7D,gBAKC,EACD,OAAsB;IAEtB,MAAM,OAAO,GAAG,sBAAsB,CACrC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAC5B,gBAAgB,EAChB,OAAO,EACP,CAAC,CACD,CAAC;IACF,OAAO,IAAA,0BAAe,EAAC;QACtB,+EAA+E;QAC/E,CAAC,SAAS,EAAE,OAAO,CAAC;QACpB,CAAC,CAAC,EAAE,OAAO,CAAC;QACZ,CAAC,CAAC,EAAE,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;KACvF,CAAC,CAAC;AACJ,CAAC;AAtBD,8CAsBC;AAED,SAAS,sBAAsB,CAC9B,WAA0C,EAC1C,gBAKC,EACD,OAAsB,EACtB,OAAc;IAOd,OAAO,IAAA,+BAAoB,EAO1B,IAAA,0BAAO,EAAC,WAAW,CAAC,aAAa,IAAI,cAAI,CAAC,GAAG,EAAE,CAAC,EAChD;QACC,MAAM,EAAE,CACP,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAA8B,EAC/D,OAA+B,EAC9B,EAAE;YACH,MAAM,OAAO,GAAY;gBACxB,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC;gBACpE,YAAY;gBACZ,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;oBAC5C,YAAY;oBACZ,MAAM,EAAE,OAAO,CAAC,MAAM;iBACtB,CAAC;gBACF,OAAO;aACP,CAAC;YACF,OAAO,OAA4C,CAAC;QACrD,CAAC;QACD,MAAM,EAAE,CAAC,OAA+B,EAAE,EAAE;YAC3C,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAA6B,CAAC;YAC5E,OAAO;gBACN,MAAM,EAAE;oBACP,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC;oBAC7D,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,CAAC;iBACvD;gBACD,SAAS,EAAE,YAAY;aACvB,CAAC;QACH,CAAC;KACD,EACD,OAAO,CAAC,aAAa,CACrB,CAAC;AACH,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { TAnySchema, Type } from \"@sinclair/typebox\";\n\nimport {\n\ttype ICodecFamily,\n\tICodecOptions,\n\tIJsonCodec,\n\tmakeCodecFamily,\n\tmakeVersionDispatchingCodec,\n\twithSchemaValidation,\n} from \"../codec/index.js\";\nimport {\n\tChangeEncodingContext,\n\tChangeFamilyCodec,\n\tEncodedRevisionTag,\n\tRevisionTag,\n\tSchemaAndPolicy,\n} from \"../core/index.js\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\n\nimport { Message } from \"./messageFormat.js\";\nimport { DecodedMessage } from \"./messageTypes.js\";\n\nexport interface MessageEncodingContext {\n\tschema?: SchemaAndPolicy;\n}\n\nexport function makeMessageCodec<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\twriteVersion: number,\n): IJsonCodec<\n\tDecodedMessage<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tMessageEncodingContext\n> {\n\tconst family = makeMessageCodecs(changeCodecs, revisionTagCodec, options);\n\treturn makeVersionDispatchingCodec(family, { ...options, writeVersion });\n}\n\n/**\n * @privateRemarks - Exported for testing.\n */\nexport function makeMessageCodecs<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): ICodecFamily<DecodedMessage<TChangeset>, MessageEncodingContext> {\n\tconst v1Codec = makeV1CodecWithVersion(\n\t\tchangeCodecs.resolve(1).json,\n\t\trevisionTagCodec,\n\t\toptions,\n\t\t1,\n\t);\n\treturn makeCodecFamily([\n\t\t// Back-compat: messages weren't always written with an explicit version field.\n\t\t[undefined, v1Codec],\n\t\t[1, v1Codec],\n\t\t[2, makeV1CodecWithVersion(changeCodecs.resolve(2).json, revisionTagCodec, options, 2)],\n\t]);\n}\n\nfunction makeV1CodecWithVersion<TChangeset>(\n\tchangeCodec: ChangeFamilyCodec<TChangeset>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\tversion: 1 | 2,\n): IJsonCodec<\n\tDecodedMessage<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tMessageEncodingContext\n> {\n\treturn withSchemaValidation<\n\t\tDecodedMessage<TChangeset>,\n\t\tTAnySchema,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tMessageEncodingContext\n\t>(\n\t\tMessage(changeCodec.encodedSchema ?? Type.Any()),\n\t\t{\n\t\t\tencode: (\n\t\t\t\t{ commit, sessionId: originatorId }: DecodedMessage<TChangeset>,\n\t\t\t\tcontext: MessageEncodingContext,\n\t\t\t) => {\n\t\t\t\tconst message: Message = {\n\t\t\t\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId }),\n\t\t\t\t\toriginatorId,\n\t\t\t\t\tchangeset: changeCodec.encode(commit.change, {\n\t\t\t\t\t\toriginatorId,\n\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t}),\n\t\t\t\t\tversion,\n\t\t\t\t};\n\t\t\t\treturn message as unknown as JsonCompatibleReadOnly;\n\t\t\t},\n\t\t\tdecode: (encoded: JsonCompatibleReadOnly) => {\n\t\t\t\tconst { revision, originatorId, changeset } = encoded as unknown as Message;\n\t\t\t\treturn {\n\t\t\t\t\tcommit: {\n\t\t\t\t\t\trevision: revisionTagCodec.decode(revision, { originatorId }),\n\t\t\t\t\t\tchange: changeCodec.decode(changeset, { originatorId }),\n\t\t\t\t\t},\n\t\t\t\t\tsessionId: originatorId,\n\t\t\t\t};\n\t\t\t},\n\t\t},\n\t\toptions.jsonValidator,\n\t);\n}\n"]}

package/dist/shared-tree-core/messageFormat.d.ts

@@ -2,10 +2,10 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { TSchema } from "@sinclair/typebox";
 import { SessionId } from "@fluidframework/id-compressor";
-import { JsonCompatibleReadOnly } from "../util/index.js";
+import { TSchema } from "@sinclair/typebox";
 import { EncodedRevisionTag } from "../core/index.js";
+import { JsonCompatibleReadOnly } from "../util/index.js";
 /**
  * The format of messages that SharedTree sends and receives.
  */
@@ -22,10 +22,18 @@ export interface Message {
      * The changeset to be applied.
      */
     readonly changeset: JsonCompatibleReadOnly;
+    /**
+     * The version of the message. This controls how the message is encoded.
+     *
+     * This was not set historically and was added before making any breaking changes to the format.
+     * For that reason, absence of a 'version' field is synonymous with version 1.
+     */
+    readonly version?: number;
 }
 export declare const Message: <ChangeSchema extends TSchema>(tChange: ChangeSchema) => import("@sinclair/typebox").TObject<{
     revision: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<import("../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>;
     originatorId: import("@sinclair/typebox").TUnsafe<SessionId>;
     changeset: ChangeSchema;
+    version: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
 }>;
 //# sourceMappingURL=messageFormat.d.ts.map

package/dist/shared-tree-core/messageFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAsC,MAAM,kBAAkB,CAAC;AAE1F;;GAEG;AACH,MAAM,WAAW,OAAO;IACvB;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IACjC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,sBAAsB,CAAC;CAC3C;AAED,eAAO,MAAM,OAAO;;;;EAKjB,CAAC"}
+{"version":3,"file":"messageFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAQ,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAsC,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,OAAO;IACvB;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IACjC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,sBAAsB,CAAC;IAE3C;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,OAAO;;;;;EAMjB,CAAC"}

package/dist/shared-tree-core/messageFormat.js

@@ -11,6 +11,7 @@ const Message = (tChange) => typebox_1.Type.Object({
     revision: index_js_1.RevisionTagSchema,
     originatorId: index_js_1.SessionIdSchema,
     changeset: tChange,
+    version: typebox_1.Type.Optional(typebox_1.Type.Number()),
 });
 exports.Message = Message;
 //# sourceMappingURL=messageFormat.js.map

package/dist/shared-tree-core/messageFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"messageFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageFormat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+CAAkD;AAGlD,+CAA0F;AAoBnF,MAAM,OAAO,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC9E,cAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,4BAAiB;IAC3B,YAAY,EAAE,0BAAe;IAC7B,SAAS,EAAE,OAAO;CAClB,CAAC,CAAC;AALS,QAAA,OAAO,WAKhB","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { Type, TSchema } from \"@sinclair/typebox\";\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\nimport { EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from \"../core/index.js\";\n\n/**\n * The format of messages that SharedTree sends and receives.\n */\nexport interface Message {\n\t/**\n\t * The revision tag for the change in this message\n\t */\n\treadonly revision: EncodedRevisionTag;\n\t/**\n\t * The stable ID that identifies the originator of the message.\n\t */\n\treadonly originatorId: SessionId;\n\t/**\n\t * The changeset to be applied.\n\t */\n\treadonly changeset: JsonCompatibleReadOnly;\n}\n\nexport const Message = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\toriginatorId: SessionIdSchema,\n\t\tchangeset: tChange,\n\t});\n"]}
+{"version":3,"file":"messageFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageFormat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,+CAAkD;AAElD,+CAA0F;AA6BnF,MAAM,OAAO,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC9E,cAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,4BAAiB;IAC3B,YAAY,EAAE,0BAAe;IAC7B,SAAS,EAAE,OAAO;IAClB,OAAO,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,EAAE,CAAC;CACrC,CAAC,CAAC;AANS,QAAA,OAAO,WAMhB","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { TSchema, Type } from \"@sinclair/typebox\";\n\nimport { EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from \"../core/index.js\";\nimport { JsonCompatibleReadOnly } from \"../util/index.js\";\n\n/**\n * The format of messages that SharedTree sends and receives.\n */\nexport interface Message {\n\t/**\n\t * The revision tag for the change in this message\n\t */\n\treadonly revision: EncodedRevisionTag;\n\t/**\n\t * The stable ID that identifies the originator of the message.\n\t */\n\treadonly originatorId: SessionId;\n\t/**\n\t * The changeset to be applied.\n\t */\n\treadonly changeset: JsonCompatibleReadOnly;\n\n\t/**\n\t * The version of the message. This controls how the message is encoded.\n\t *\n\t * This was not set historically and was added before making any breaking changes to the format.\n\t * For that reason, absence of a 'version' field is synonymous with version 1.\n\t */\n\treadonly version?: number;\n}\n\nexport const Message = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\toriginatorId: SessionIdSchema,\n\t\tchangeset: tChange,\n\t\tversion: Type.Optional(Type.Number()),\n\t});\n"]}

package/dist/shared-tree-core/messageTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,cAAc,CAAC,OAAO;IACtC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;CACrB"}
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/messageTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,cAAc,CAAC,OAAO;IACtC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;CACrB"}

package/dist/shared-tree-core/messageTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { GraphCommit } from \"../core/index.js\";\n\nexport interface DecodedMessage<TChange> {\n\tcommit: GraphCommit<TChange>;\n\tsessionId: SessionId;\n}\n"]}
+{"version":3,"file":"messageTypes.js","sourceRoot":"","sources":["../../src/shared-tree-core/messageTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { SessionId } from \"@fluidframework/id-compressor\";\n\nimport { GraphCommit } from \"../core/index.js\";\n\nexport interface DecodedMessage<TChange> {\n\tcommit: GraphCommit<TChange>;\n\tsessionId: SessionId;\n}\n"]}

package/dist/shared-tree-core/sequenceIdUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequenceIdUtils.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,eAAO,MAAM,oBAAoB,MAAO,UAAU,KAAK,UAAU,WAGhB,CAAC;AAClD,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAAqC,CAAC;AACnG,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU;;;CACnB,CAAC;AACxC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU;;;CACnB,CAAC;AACxC,eAAO,MAAM,mBAAmB,eAAgB,UAAU,KAAG,UAO5D,CAAC"}
+{"version":3,"file":"sequenceIdUtils.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,eAAO,MAAM,oBAAoB,MAAO,UAAU,KAAK,UAAU,WAGhB,CAAC;AAClD,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAAqC,CAAC;AACnG,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU;;;CACnB,CAAC;AACxC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU;;;CACnB,CAAC;AACxC,eAAO,MAAM,mBAAmB,eAAgB,UAAU,KAAG,UAO5D,CAAC"}