@fluidframework/tree 2.80.0 → 2.81.0

package/lib/shared-tree-core/branchCommitEnricher.js

@@ -2,102 +2,50 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BranchCommitEnricher_transactionEnricher, _BranchCommitEnricher_enricher, _BranchCommitEnricher_preparedCommits, _BranchCommitEnricher_getOuterTransactionChange;
 import { assert } from "@fluidframework/core-utils/internal";
-import { replaceChange } from "../core/index.js";
-import { TransactionEnricher } from "./transactionEnricher.js";
+import { hasSome } from "../util/index.js";
 /**
  * Utility for enriching commits from a {@link Branch} before these commits are applied and submitted.
  */
 export class BranchCommitEnricher {
-    constructor(rebaser, enricher) {
-        _BranchCommitEnricher_transactionEnricher.set(this, void 0);
-        _BranchCommitEnricher_enricher.set(this, void 0);
+    constructor(enricher) {
+        this.enricher = enricher;
         /**
-         * Maps each local commit to the corresponding enriched commit.
+         * Maps each local commit to the corresponding enriched change.
          * @remarks
-         * Entries are added when the commits are {@link BranchCommitEnricher.processChange | processed during a change}.
-         * Each entry is removed when it is {@link BranchCommitEnricher.enrich | retrieved}.
+         * Entries are added when the commits are {@link BranchCommitEnricher.prepareChanges | prepared}.
+         * Each entry is removed when it is {@link BranchCommitEnricher.retrieveChange | retrieved}.
          * In the event that an entry is not explicitly removed, it will eventually be {@link WeakMap | dropped from memory} along with the associated commit.
          */
-        _BranchCommitEnricher_preparedCommits.set(this, new Map());
-        /**
-         * If defined, a top-level transaction has been {@link BranchCommitEnricher.commitTransaction | committed} since the last {@link BranchCommitEnricher.processChange | change has been processed}.
-         * Calling this function will compute the composition of that transaction's commits.
-         * @remarks This function will be reset to undefined after each {@link BranchCommitEnricher.processChange | change is processed}.
-         */
-        _BranchCommitEnricher_getOuterTransactionChange.set(this, void 0);
-        __classPrivateFieldSet(this, _BranchCommitEnricher_enricher, enricher, "f");
-        __classPrivateFieldSet(this, _BranchCommitEnricher_transactionEnricher, new TransactionEnricher(rebaser, __classPrivateFieldGet(this, _BranchCommitEnricher_enricher, "f")), "f");
+        this.prepared = new WeakMap();
     }
     /**
-     * Process the given change, preparing new commits for {@link BranchCommitEnricher.enrich | enrichment}.
-     * @param change - The change to process.
+     * Process the given commits for later {@link BranchCommitEnricher.retrieveChange | retrieval}.
+     * @param commits - The commits to prepare.
      */
-    processChange(change) {
-        if (change.type === "append") {
-            for (const newCommit of change.newCommits) {
-                const newChange = __classPrivateFieldGet(this, _BranchCommitEnricher_getOuterTransactionChange, "f")?.call(this) ??
-                    __classPrivateFieldGet(this, _BranchCommitEnricher_enricher, "f").updateChangeEnrichments(newCommit.change, newCommit.revision);
-                __classPrivateFieldGet(this, _BranchCommitEnricher_preparedCommits, "f").set(newCommit, replaceChange(newCommit, newChange));
+    prepareChanges(commits) {
+        if (hasSome(commits)) {
+            const startingState = commits[0].parent;
+            assert(startingState !== undefined, 0xcc1 /* New commits must have a parent. */);
+            const enrichedCommits = this.enricher.enrich(startingState, commits);
+            for (const [index, commit] of commits.entries()) {
+                const enrichedCommit = enrichedCommits[index];
+                assert(enrichedCommit !== undefined, 0xcc2 /* Missing enriched commit. */);
+                this.prepared.set(commit, enrichedCommit);
             }
         }
-        __classPrivateFieldSet(this, _BranchCommitEnricher_getOuterTransactionChange, undefined, "f");
     }
     /**
-     * Retrieves the enriched version of the given commit.
-     * @param commit - A commit {@link BranchCommitEnricher.processChange | processed during the most recent change}.
+     * Retrieves the enriched change for the given commit.
+     * @param commit - A commit that was already {@link BranchCommitEnricher.prepareChanges | prepared}.
      * @remarks A commit can only be enriched once - subsequent calls to this method with the same commit will throw an error.
+     * @returns The enriched change corresponding to the given `commit`.
      */
-    enrich(commit) {
-        const prepared = __classPrivateFieldGet(this, _BranchCommitEnricher_preparedCommits, "f").get(commit);
+    retrieveChange(commit) {
+        const prepared = this.prepared.get(commit);
         assert(prepared !== undefined, 0x980 /* Unknown commit */);
-        __classPrivateFieldGet(this, _BranchCommitEnricher_preparedCommits, "f").delete(commit);
+        this.prepared.delete(commit);
         return prepared;
     }
-    /**
-     * Notify the enricher that a new transaction has started.
-     * @remarks This may be called multiple times without calling {@link BranchCommitEnricher.commitTransaction | commitTransaction}, producing "nested transactions".
-     */
-    startTransaction() {
-        __classPrivateFieldGet(this, _BranchCommitEnricher_transactionEnricher, "f").startTransaction();
-    }
-    /**
-     * Commit the current transaction.
-     * @remarks This should be called _before_ the corresponding transaction commit change is {@link BranchCommitEnricher.processChange | processed}.
-     */
-    commitTransaction() {
-        __classPrivateFieldSet(this, _BranchCommitEnricher_getOuterTransactionChange, __classPrivateFieldGet(this, _BranchCommitEnricher_transactionEnricher, "f").commitTransaction(), "f");
-    }
-    /**
-     * Notify the enricher that the current transaction has been aborted.
-     * @remarks This will throw an error if there is no ongoing transaction.
-     */
-    abortTransaction() {
-        __classPrivateFieldGet(this, _BranchCommitEnricher_transactionEnricher, "f").abortTransaction();
-    }
-    /**
-     * Add new transaction commits to the current transaction.
-     * @param newCommits - The new commits to add.
-     * @remarks This will throw an error if there is no ongoing transaction.
-     */
-    addTransactionCommits(newCommits) {
-        assert(__classPrivateFieldGet(this, _BranchCommitEnricher_transactionEnricher, "f").isTransacting(), 0xa97 /* Not in transaction */);
-        for (const commit of newCommits) {
-            __classPrivateFieldGet(this, _BranchCommitEnricher_transactionEnricher, "f").addTransactionStep(commit);
-        }
-    }
 }
-_BranchCommitEnricher_transactionEnricher = new WeakMap(), _BranchCommitEnricher_enricher = new WeakMap(), _BranchCommitEnricher_preparedCommits = new WeakMap(), _BranchCommitEnricher_getOuterTransactionChange = new WeakMap();
 //# sourceMappingURL=branchCommitEnricher.js.map

package/lib/shared-tree-core/branchCommitEnricher.js.map

@@ -1 +1 @@
-{"version":3,"file":"branchCommitEnricher.js","sourceRoot":"","sources":["../../src/shared-tree-core/branchCommitEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;;;;;;;;;;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAwC,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAmBhC,YACC,OAA+B,EAC/B,QAAiD;QApBzC,4DAAmD;QACnD,iDAAmD;QAC5D;;;;;;WAMG;QACM,gDAAwE,IAAI,GAAG,EAAE,EAAC;QAE3F;;;;WAIG;QACH,kEAA2C;QAM1C,uBAAA,IAAI,kCAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,6CAAwB,IAAI,mBAAmB,CAAC,OAAO,EAAE,uBAAA,IAAI,sCAAU,CAAC,MAAA,CAAC;IAC9E,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,MAAuC;QAC3D,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBAC3C,MAAM,SAAS,GACd,uBAAA,IAAI,uDAA2B,EAAE,KAAjC,IAAI,CAA+B;oBACnC,uBAAA,IAAI,sCAAU,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAE9E,uBAAA,IAAI,6CAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC3E,CAAC;QACF,CAAC;QAED,uBAAA,IAAI,mDAA8B,SAAS,MAAA,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,MAA4B;QACzC,MAAM,QAAQ,GAAG,uBAAA,IAAI,6CAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC3D,uBAAA,IAAI,6CAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,gBAAgB;QACtB,uBAAA,IAAI,iDAAqB,CAAC,gBAAgB,EAAE,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,iBAAiB;QACvB,uBAAA,IAAI,mDAA8B,uBAAA,IAAI,iDAAqB,CAAC,iBAAiB,EAAE,MAAA,CAAC;IACjF,CAAC;IAED;;;OAGG;IACI,gBAAgB;QACtB,uBAAA,IAAI,iDAAqB,CAAC,gBAAgB,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,UAA0C;QACtE,MAAM,CAAC,uBAAA,IAAI,iDAAqB,CAAC,aAAa,EAAE,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClF,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;YACjC,uBAAA,IAAI,iDAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtD,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 } from \"@fluidframework/core-utils/internal\";\n\nimport { type ChangeRebaser, type GraphCommit, replaceChange } from \"../core/index.js\";\n\nimport type { SharedTreeBranchChange } from \"./branch.js\";\nimport type { ChangeEnricherReadonlyCheckout } from \"./changeEnricher.js\";\nimport { TransactionEnricher } from \"./transactionEnricher.js\";\n\n/**\n * Utility for enriching commits from a {@link Branch} before these commits are applied and submitted.\n */\nexport class BranchCommitEnricher<TChange> {\n\treadonly #transactionEnricher: TransactionEnricher<TChange>;\n\treadonly #enricher: ChangeEnricherReadonlyCheckout<TChange>;\n\t/**\n\t * Maps each local commit to the corresponding enriched commit.\n\t * @remarks\n\t * Entries are added when the commits are {@link BranchCommitEnricher.processChange | processed during a change}.\n\t * Each entry is removed when it is {@link BranchCommitEnricher.enrich | retrieved}.\n\t * In the event that an entry is not explicitly removed, it will eventually be {@link WeakMap | dropped from memory} along with the associated commit.\n\t */\n\treadonly #preparedCommits: WeakMap<GraphCommit<TChange>, GraphCommit<TChange>> = new Map();\n\n\t/**\n\t * If defined, a top-level transaction has been {@link BranchCommitEnricher.commitTransaction | committed} since the last {@link BranchCommitEnricher.processChange | change has been processed}.\n\t * Calling this function will compute the composition of that transaction's commits.\n\t * @remarks This function will be reset to undefined after each {@link BranchCommitEnricher.processChange | change is processed}.\n\t */\n\t#getOuterTransactionChange?: () => TChange;\n\n\tpublic constructor(\n\t\trebaser: ChangeRebaser<TChange>,\n\t\tenricher: ChangeEnricherReadonlyCheckout<TChange>,\n\t) {\n\t\tthis.#enricher = enricher;\n\t\tthis.#transactionEnricher = new TransactionEnricher(rebaser, this.#enricher);\n\t}\n\n\t/**\n\t * Process the given change, preparing new commits for {@link BranchCommitEnricher.enrich | enrichment}.\n\t * @param change - The change to process.\n\t */\n\tpublic processChange(change: SharedTreeBranchChange<TChange>): void {\n\t\tif (change.type === \"append\") {\n\t\t\tfor (const newCommit of change.newCommits) {\n\t\t\t\tconst newChange =\n\t\t\t\t\tthis.#getOuterTransactionChange?.() ??\n\t\t\t\t\tthis.#enricher.updateChangeEnrichments(newCommit.change, newCommit.revision);\n\n\t\t\t\tthis.#preparedCommits.set(newCommit, replaceChange(newCommit, newChange));\n\t\t\t}\n\t\t}\n\n\t\tthis.#getOuterTransactionChange = undefined;\n\t}\n\n\t/**\n\t * Retrieves the enriched version of the given commit.\n\t * @param commit - A commit {@link BranchCommitEnricher.processChange | processed during the most recent change}.\n\t * @remarks A commit can only be enriched once - subsequent calls to this method with the same commit will throw an error.\n\t */\n\tpublic enrich(commit: GraphCommit<TChange>): GraphCommit<TChange> {\n\t\tconst prepared = this.#preparedCommits.get(commit);\n\t\tassert(prepared !== undefined, 0x980 /* Unknown commit */);\n\t\tthis.#preparedCommits.delete(commit);\n\t\treturn prepared;\n\t}\n\n\t/**\n\t * Notify the enricher that a new transaction has started.\n\t * @remarks This may be called multiple times without calling {@link BranchCommitEnricher.commitTransaction | commitTransaction}, producing \"nested transactions\".\n\t */\n\tpublic startTransaction(): void {\n\t\tthis.#transactionEnricher.startTransaction();\n\t}\n\n\t/**\n\t * Commit the current transaction.\n\t * @remarks This should be called _before_ the corresponding transaction commit change is {@link BranchCommitEnricher.processChange | processed}.\n\t */\n\tpublic commitTransaction(): void {\n\t\tthis.#getOuterTransactionChange = this.#transactionEnricher.commitTransaction();\n\t}\n\n\t/**\n\t * Notify the enricher that the current transaction has been aborted.\n\t * @remarks This will throw an error if there is no ongoing transaction.\n\t */\n\tpublic abortTransaction(): void {\n\t\tthis.#transactionEnricher.abortTransaction();\n\t}\n\n\t/**\n\t * Add new transaction commits to the current transaction.\n\t * @param newCommits - The new commits to add.\n\t * @remarks This will throw an error if there is no ongoing transaction.\n\t */\n\tpublic addTransactionCommits(newCommits: Iterable<GraphCommit<TChange>>): void {\n\t\tassert(this.#transactionEnricher.isTransacting(), 0xa97 /* Not in transaction */);\n\t\tfor (const commit of newCommits) {\n\t\t\tthis.#transactionEnricher.addTransactionStep(commit);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"branchCommitEnricher.js","sourceRoot":"","sources":["../../src/shared-tree-core/branchCommitEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAG7D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAI3C;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAUhC,YAAoC,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;QATrE;;;;;;WAMG;QACc,aAAQ,GAA2C,IAAI,OAAO,EAAE,CAAC;IAEV,CAAC;IAEzE;;;OAGG;IACI,cAAc,CAAC,OAAwC;QAC7D,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACxC,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACjF,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACrE,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACjD,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC9C,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBAC3E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;IACF,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,MAA4B;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/core-utils/internal\";\n\nimport type { GraphCommit } from \"../core/index.js\";\nimport { hasSome } from \"../util/index.js\";\n\nimport type { ChangeEnricher } from \"./changeEnricher.js\";\n\n/**\n * Utility for enriching commits from a {@link Branch} before these commits are applied and submitted.\n */\nexport class BranchCommitEnricher<TChange> {\n\t/**\n\t * Maps each local commit to the corresponding enriched change.\n\t * @remarks\n\t * Entries are added when the commits are {@link BranchCommitEnricher.prepareChanges | prepared}.\n\t * Each entry is removed when it is {@link BranchCommitEnricher.retrieveChange | retrieved}.\n\t * In the event that an entry is not explicitly removed, it will eventually be {@link WeakMap | dropped from memory} along with the associated commit.\n\t */\n\tprivate readonly prepared: WeakMap<GraphCommit<TChange>, TChange> = new WeakMap();\n\n\tpublic constructor(private readonly enricher: ChangeEnricher<TChange>) {}\n\n\t/**\n\t * Process the given commits for later {@link BranchCommitEnricher.retrieveChange | retrieval}.\n\t * @param commits - The commits to prepare.\n\t */\n\tpublic prepareChanges(commits: readonly GraphCommit<TChange>[]): void {\n\t\tif (hasSome(commits)) {\n\t\t\tconst startingState = commits[0].parent;\n\t\t\tassert(startingState !== undefined, 0xcc1 /* New commits must have a parent. */);\n\t\t\tconst enrichedCommits = this.enricher.enrich(startingState, commits);\n\t\t\tfor (const [index, commit] of commits.entries()) {\n\t\t\t\tconst enrichedCommit = enrichedCommits[index];\n\t\t\t\tassert(enrichedCommit !== undefined, 0xcc2 /* Missing enriched commit. */);\n\t\t\t\tthis.prepared.set(commit, enrichedCommit);\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Retrieves the enriched change for the given commit.\n\t * @param commit - A commit that was already {@link BranchCommitEnricher.prepareChanges | prepared}.\n\t * @remarks A commit can only be enriched once - subsequent calls to this method with the same commit will throw an error.\n\t * @returns The enriched change corresponding to the given `commit`.\n\t */\n\tpublic retrieveChange(commit: GraphCommit<TChange>): TChange {\n\t\tconst prepared = this.prepared.get(commit);\n\t\tassert(prepared !== undefined, 0x980 /* Unknown commit */);\n\t\tthis.prepared.delete(commit);\n\t\treturn prepared;\n\t}\n}\n"]}

package/lib/shared-tree-core/branchIdCodec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branchIdCodec.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/branchIdCodec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACX,aAAa,EACb,mBAAmB,EACnB,SAAS,EACT,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,wBAAgB,cAAc,CAC7B,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,QAAQ,GAChB,mBAAmB,GAAG,SAAS,CAEjC;AAED,wBAAgB,cAAc,CAC7B,YAAY,EAAE,aAAa,EAC3B,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,OAAO,EAAE;IAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAA;CAAE,GAC3C,QAAQ,CAIV"}
+{"version":3,"file":"branchIdCodec.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/branchIdCodec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACX,aAAa,EACb,mBAAmB,EACnB,SAAS,EACT,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,wBAAgB,cAAc,CAC7B,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,QAAQ,GAChB,mBAAmB,GAAG,SAAS,CAEjC;AAED,wBAAgB,cAAc,CAC7B,YAAY,EAAE,aAAa,EAC3B,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,OAAO,EAAE;IAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAA;CAAE,GAC3C,QAAQ,CAIV"}

package/lib/shared-tree-core/branchIdCodec.js.map

@@ -1 +1 @@
-{"version":3,"file":"branchIdCodec.js","sourceRoot":"","sources":["../../src/shared-tree-core/branchIdCodec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,UAAU,cAAc,CAC7B,YAA2B,EAC3B,QAAkB;IAElB,OAAO,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,cAAc,CAC7B,YAA2B,EAC3B,OAAwC,EACxC,OAA6C;IAE7C,OAAO,OAAO,KAAK,SAAS;QAC3B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,YAAY,CAAC,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AACxE,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type {\n\tIIdCompressor,\n\tOpSpaceCompressedId,\n\tSessionId,\n} from \"@fluidframework/id-compressor\";\nimport type { BranchId } from \"./branch.js\";\n\nexport function encodeBranchId(\n\tidCompressor: IIdCompressor,\n\tbranchId: BranchId,\n): OpSpaceCompressedId | undefined {\n\treturn branchId === \"main\" ? undefined : idCompressor.normalizeToOpSpace(branchId);\n}\n\nexport function decodeBranchId(\n\tidCompressor: IIdCompressor,\n\tencoded: OpSpaceCompressedId | undefined,\n\tcontext: { readonly originatorId: SessionId },\n): BranchId {\n\treturn encoded === undefined\n\t\t? \"main\"\n\t\t: idCompressor.normalizeToSessionSpace(encoded, context.originatorId);\n}\n"]}
+{"version":3,"file":"branchIdCodec.js","sourceRoot":"","sources":["../../src/shared-tree-core/branchIdCodec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,UAAU,cAAc,CAC7B,YAA2B,EAC3B,QAAkB;IAElB,OAAO,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,cAAc,CAC7B,YAA2B,EAC3B,OAAwC,EACxC,OAA6C;IAE7C,OAAO,OAAO,KAAK,SAAS;QAC3B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,YAAY,CAAC,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AACxE,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type {\n\tIIdCompressor,\n\tOpSpaceCompressedId,\n\tSessionId,\n} from \"@fluidframework/id-compressor\";\n\nimport type { BranchId } from \"./branch.js\";\n\nexport function encodeBranchId(\n\tidCompressor: IIdCompressor,\n\tbranchId: BranchId,\n): OpSpaceCompressedId | undefined {\n\treturn branchId === \"main\" ? undefined : idCompressor.normalizeToOpSpace(branchId);\n}\n\nexport function decodeBranchId(\n\tidCompressor: IIdCompressor,\n\tencoded: OpSpaceCompressedId | undefined,\n\tcontext: { readonly originatorId: SessionId },\n): BranchId {\n\treturn encoded === undefined\n\t\t? \"main\"\n\t\t: idCompressor.normalizeToSessionSpace(encoded, context.originatorId);\n}\n"]}

package/lib/shared-tree-core/changeEnricher.d.ts

@@ -2,52 +2,17 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import type { RevisionTag } from "../core/index.js";
-import { disposeSymbol } from "../util/index.js";
+import type { GraphCommit, TaggedChange } from "../core/index.js";
 /**
- * A checkout that can be used by {@link SharedTreeCore} or {@link DefaultResubmitMachine} to enrich changes with refreshers.
- *
- * This is similar to a {@link TreeCheckout} in that it represents the state of the tree at a specific revision.
- * But unlike a `TreeCheckout`...
- * - It is not backed by a branch because the `CommitEnricher` that owns it controls which revision it should represent.
- * - The host application has no knowledge of it, so applying changes to it has no impact on the application.
- * - It need not maintain any state or indexes that do not play a role in enriching changes.
- *
- * See implementations for examples.
+ * Allows change to be enriched by using a {@link ChangeEnricherCheckout}.
  */
-export interface ChangeEnricherReadonlyCheckout<TChange> {
+export interface ChangeEnricher<TChange> {
     /**
-     * Updates the set of refreshers on a change.
-     * @param change - the change to enrich. Not mutated.
-     * @param revision - the revision associated with the change.
-     * @returns the enriched change. Possibly the same as the one passed in.
+     * Runs a batch of change enrichments.
+     * @param context - The branch head after which the `changes` would apply.
+     * @param changes - The changes to be enriched.
+     * @returns The enriched changes.
      */
-    updateChangeEnrichments(change: TChange, revision: RevisionTag): TChange;
-    /**
-     * Forks the checkout, creating a new checkout that represents the same state but can be mutated.
-     */
-    fork(): ChangeEnricherMutableCheckout<TChange>;
-}
-/**
- * A {@link ChangeEnricherReadonlyCheckout} whose state can be controlled by a {@link CommitEnricher}.
- */
-export interface ChangeEnricherMutableCheckout<TChange> extends ChangeEnricherReadonlyCheckout<TChange> {
-    /**
-     * Applies a change to the tip state.
-     * @param change - the change to apply. Not mutated.
-     * @param revision - the revision associated with the change.
-     * Can be undefined when the applied change is a rollback.
-     */
-    applyTipChange(change: TChange, revision?: RevisionTag): void;
-    /**
-     * Disposes of the enricher.
-     */
-    [disposeSymbol](): void;
-}
-export declare class NoOpChangeEnricher<TChange> implements ChangeEnricherMutableCheckout<TChange> {
-    applyTipChange(change: TChange, revision?: RevisionTag | undefined): void;
-    updateChangeEnrichments(change: TChange, revision: RevisionTag): TChange;
-    fork(): ChangeEnricherMutableCheckout<TChange>;
-    [disposeSymbol](): void;
+    enrich(context: GraphCommit<TChange>, changes: readonly TaggedChange<TChange>[]): TChange[];
 }
 //# sourceMappingURL=changeEnricher.d.ts.map

package/lib/shared-tree-core/changeEnricher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changeEnricher.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/changeEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO;IACtD;;;;;OAKG;IACH,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC;IAEzE;;OAEG;IACH,IAAI,IAAI,6BAA6B,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B,CAAC,OAAO,CACrD,SAAQ,8BAA8B,CAAC,OAAO,CAAC;IAC/C;;;;;OAKG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAE9D;;OAEG;IACH,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;CACxB;AAED,qBAAa,kBAAkB,CAAC,OAAO,CAAE,YAAW,6BAA6B,CAAC,OAAO,CAAC;IAClF,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI;IACzE,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO;IAGxE,IAAI,IAAI,6BAA6B,CAAC,OAAO,CAAC;IAG9C,CAAC,aAAa,CAAC,IAAI,IAAI;CAC9B"}
+{"version":3,"file":"changeEnricher.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/changeEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAElE;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,OAAO;IACtC;;;;;OAKG;IACH,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,SAAS,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;CAC5F"}

package/lib/shared-tree-core/changeEnricher.js

@@ -2,15 +2,5 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { disposeSymbol } from "../util/index.js";
-export class NoOpChangeEnricher {
-    applyTipChange(change, revision) { }
-    updateChangeEnrichments(change, revision) {
-        return change;
-    }
-    fork() {
-        return new NoOpChangeEnricher();
-    }
-    [disposeSymbol]() { }
-}
+export {};
 //# sourceMappingURL=changeEnricher.js.map

package/lib/shared-tree-core/changeEnricher.js.map

@@ -1 +1 @@
-{"version":3,"file":"changeEnricher.js","sourceRoot":"","sources":["../../src/shared-tree-core/changeEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA+CjD,MAAM,OAAO,kBAAkB;IACvB,cAAc,CAAC,MAAe,EAAE,QAAkC,IAAS,CAAC;IAC5E,uBAAuB,CAAC,MAAe,EAAE,QAAqB;QACpE,OAAO,MAAM,CAAC;IACf,CAAC;IACM,IAAI;QACV,OAAO,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IACM,CAAC,aAAa,CAAC,KAAU,CAAC;CACjC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { RevisionTag } from \"../core/index.js\";\nimport { disposeSymbol } from \"../util/index.js\";\n\n/**\n * A checkout that can be used by {@link SharedTreeCore} or {@link DefaultResubmitMachine} to enrich changes with refreshers.\n *\n * This is similar to a {@link TreeCheckout} in that it represents the state of the tree at a specific revision.\n * But unlike a `TreeCheckout`...\n * - It is not backed by a branch because the `CommitEnricher` that owns it controls which revision it should represent.\n * - The host application has no knowledge of it, so applying changes to it has no impact on the application.\n * - It need not maintain any state or indexes that do not play a role in enriching changes.\n *\n * See implementations for examples.\n */\nexport interface ChangeEnricherReadonlyCheckout<TChange> {\n\t/**\n\t * Updates the set of refreshers on a change.\n\t * @param change - the change to enrich. Not mutated.\n\t * @param revision - the revision associated with the change.\n\t * @returns the enriched change. Possibly the same as the one passed in.\n\t */\n\tupdateChangeEnrichments(change: TChange, revision: RevisionTag): TChange;\n\n\t/**\n\t * Forks the checkout, creating a new checkout that represents the same state but can be mutated.\n\t */\n\tfork(): ChangeEnricherMutableCheckout<TChange>;\n}\n\n/**\n * A {@link ChangeEnricherReadonlyCheckout} whose state can be controlled by a {@link CommitEnricher}.\n */\nexport interface ChangeEnricherMutableCheckout<TChange>\n\textends ChangeEnricherReadonlyCheckout<TChange> {\n\t/**\n\t * Applies a change to the tip state.\n\t * @param change - the change to apply. Not mutated.\n\t * @param revision - the revision associated with the change.\n\t * Can be undefined when the applied change is a rollback.\n\t */\n\tapplyTipChange(change: TChange, revision?: RevisionTag): void;\n\n\t/**\n\t * Disposes of the enricher.\n\t */\n\t[disposeSymbol](): void;\n}\n\nexport class NoOpChangeEnricher<TChange> implements ChangeEnricherMutableCheckout<TChange> {\n\tpublic applyTipChange(change: TChange, revision?: RevisionTag | undefined): void {}\n\tpublic updateChangeEnrichments(change: TChange, revision: RevisionTag): TChange {\n\t\treturn change;\n\t}\n\tpublic fork(): ChangeEnricherMutableCheckout<TChange> {\n\t\treturn new NoOpChangeEnricher();\n\t}\n\tpublic [disposeSymbol](): void {}\n}\n"]}
+{"version":3,"file":"changeEnricher.js","sourceRoot":"","sources":["../../src/shared-tree-core/changeEnricher.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { GraphCommit, TaggedChange } from \"../core/index.js\";\n\n/**\n * Allows change to be enriched by using a {@link ChangeEnricherCheckout}.\n */\nexport interface ChangeEnricher<TChange> {\n\t/**\n\t * Runs a batch of change enrichments.\n\t * @param context - The branch head after which the `changes` would apply.\n\t * @param changes - The changes to be enriched.\n\t * @returns The enriched changes.\n\t */\n\tenrich(context: GraphCommit<TChange>, changes: readonly TaggedChange<TChange>[]): TChange[];\n}\n"]}

package/lib/shared-tree-core/defaultResubmitMachine.d.ts

@@ -2,22 +2,18 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import type { GraphCommit, RevisionTag, TaggedChange } from "../core/index.js";
-import type { ChangeEnricherReadonlyCheckout } from "./changeEnricher.js";
+import type { GraphCommit, RevisionTag } from "../core/index.js";
+import type { ChangeEnricher } from "./changeEnricher.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
 /**
  * Default implementation of {@link ResubmitMachine}.
  */
 export declare class DefaultResubmitMachine<TChange> implements ResubmitMachine<TChange> {
-    /**
-     * A function that can create a rollback for a given change.
-     */
-    private readonly makeRollback;
     /**
      * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight
      * commits are applied and automatically rebased).
      */
-    private readonly tip;
+    private readonly enricher;
     /**
      * Maps from revision of submitted commit to the pending change for that commit.
      */
@@ -28,15 +24,11 @@ export declare class DefaultResubmitMachine<TChange> implements ResubmitMachine<
      */
     private currentEnrichment;
     constructor(
-    /**
-     * A function that can create a rollback for a given change.
-     */
-    makeRollback: (change: TaggedChange<TChange>) => TChange, 
     /**
      * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight
      * commits are applied and automatically rebased).
      */
-    tip: ChangeEnricherReadonlyCheckout<TChange>);
+    enricher: ChangeEnricher<TChange>);
     onCommitSubmitted(commit: GraphCommit<TChange>): void;
     onCommitRollback(commit: GraphCommit<TChange>): void;
     private updateEnrichments;

package/lib/shared-tree-core/defaultResubmitMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultResubmitMachine.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/defaultResubmitMachine.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG/E,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO5D;;GAEG;AACH,qBAAa,sBAAsB,CAAC,OAAO,CAAE,YAAW,eAAe,CAAC,OAAO,CAAC;IAa9E;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,GAAG;IApBrB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuD;IAEtF;;;OAGG;IACH,OAAO,CAAC,iBAAiB,CAAa;;IAGrC;;OAEG;IACc,YAAY,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,OAAO;IACzE;;;OAGG;IACc,GAAG,EAAE,8BAA8B,CAAC,OAAO,CAAC;IAGvD,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAOrD,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAI3D,OAAO,CAAC,iBAAiB;IA+DlB,iBAAiB,CACvB,QAAQ,EAAE,WAAW,EACrB,oBAAoB,EAAE,MAAM,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE,GACzD,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS;IAMnC,OAAO,CAAC,gBAAgB;IAOjB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;CAU9E"}
+{"version":3,"file":"defaultResubmitMachine.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/defaultResubmitMachine.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO5D;;GAEG;AACH,qBAAa,sBAAsB,CAAC,OAAO,CAAE,YAAW,eAAe,CAAC,OAAO,CAAC;IAa9E;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhB1B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuD;IAEtF;;;OAGG;IACH,OAAO,CAAC,iBAAiB,CAAa;;IAGrC;;;OAGG;IACc,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC;IAG5C,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAOrD,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAI3D,OAAO,CAAC,iBAAiB;IAuDlB,iBAAiB,CACvB,QAAQ,EAAE,WAAW,EACrB,oBAAoB,EAAE,MAAM,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE,GACzD,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS;IAMnC,OAAO,CAAC,gBAAgB;IAOjB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;CAU9E"}

package/lib/shared-tree-core/defaultResubmitMachine.js

@@ -2,24 +2,19 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert, fail, oob } from "@fluidframework/core-utils/internal";
-import { disposeSymbol } from "../util/index.js";
+import { assert, fail } from "@fluidframework/core-utils/internal";
+import { hasSome } from "../util/index.js";
 /**
  * Default implementation of {@link ResubmitMachine}.
  */
 export class DefaultResubmitMachine {
     constructor(
-    /**
-     * A function that can create a rollback for a given change.
-     */
-    makeRollback, 
     /**
      * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight
      * commits are applied and automatically rebased).
      */
-    tip) {
-        this.makeRollback = makeRollback;
-        this.tip = tip;
+    enricher) {
+        this.enricher = enricher;
         /**
          * Maps from revision of submitted commit to the pending change for that commit.
          */
@@ -46,37 +41,32 @@ export class DefaultResubmitMachine {
             // The first commit to resubmit has a valid enrichment, so all pending commits must be valid.
             return;
         }
-        const localCommits = getLocalCommits();
-        assert(localCommits[0]?.revision === revision, 0xc79 /* Expected local commits to start with specified revision */);
-        // Some in-flight commits have stale enrichments, so we recompute them.
-        const checkout = this.tip.fork();
-        // Roll back the checkout to the state before the oldest commit
-        for (let iCommit = localCommits.length - 1; iCommit >= 0; iCommit -= 1) {
-            const commit = localCommits[iCommit] ?? oob();
-            const rollback = this.makeRollback(commit);
-            // WARNING: it's not currently possible to roll back past a schema change (see AB#7265).
-            // Either we have to make it possible to do so, or this logic will have to change to work
-            // forwards from an earlier fork instead of backwards.
-            checkout.applyTipChange(rollback);
-        }
-        // Update the enrichments of the stale commits.
-        for (const [iCommit, commit] of localCommits.entries()) {
-            const current = this.getPendingChange(commit.revision);
-            assert(current !== undefined, 0xbda /* there must be an inflight commit for each resubmit commit */);
-            if (current.lastEnrichment < this.currentEnrichment) {
-                const enrichedChange = checkout.updateChangeEnrichments(commit.change, commit.revision);
-                const enrichedCommit = { ...commit, change: enrichedChange };
-                // Optimization: only apply the enriched change if the next commit also needs enrichment.
-                const nextCommit = localCommits[iCommit + 1];
-                if (nextCommit !== undefined &&
-                    this.getPendingChange(nextCommit.revision).lastEnrichment < this.currentEnrichment) {
-                    checkout.applyTipChange(enrichedChange, commit.revision);
-                }
-                current.commit = enrichedCommit;
-                current.lastEnrichment = this.currentEnrichment;
+        const newCommits = getLocalCommits();
+        const staleChanges = [];
+        for (const newCommit of newCommits) {
+            const pending = this.getPendingChange(newCommit.revision);
+            assert(pending !== undefined, 0xbda /* there must be an inflight commit for each resubmit commit */);
+            const isStale = pending.lastEnrichment < this.currentEnrichment;
+            if (isStale) {
+                staleChanges.push({ pending, newCommit });
             }
+            else {
+                // We have reached a commit with a valid enrichment. Later commits must also be valid.
+                break;
+            }
+        }
+        assert(hasSome(staleChanges) && staleChanges[0].newCommit.revision === revision, 0xc79 /* Expected local commits to start with specified revision */);
+        const startingState = staleChanges[0].newCommit.parent;
+        assert(startingState !== undefined, 0xcc3 /* New commits must have a parent. */);
+        // Some in-flight commits have stale enrichments, so we recompute them.
+        const enriched = this.enricher.enrich(startingState, newCommits.slice(0, staleChanges.length));
+        for (const [index, { pending, newCommit }] of staleChanges.entries()) {
+            const enrichedChange = enriched[index];
+            assert(enrichedChange !== undefined, 0xcc4 /* Missing enriched commit. */);
+            const enrichedCommit = { ...newCommit, change: enrichedChange };
+            pending.commit = enrichedCommit;
+            pending.lastEnrichment = this.currentEnrichment;
         }
-        checkout[disposeSymbol]();
     }
     getEnrichedCommit(revision, getLocalCommitsSince) {
         this.updateEnrichments(revision, getLocalCommitsSince);

package/lib/shared-tree-core/defaultResubmitMachine.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultResubmitMachine.js","sourceRoot":"","sources":["../../src/shared-tree-core/defaultResubmitMachine.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, fail, oob } from \"@fluidframework/core-utils/internal\";\n\nimport type { GraphCommit, RevisionTag, TaggedChange } from \"../core/index.js\";\nimport { disposeSymbol } from \"../util/index.js\";\n\nimport type { ChangeEnricherReadonlyCheckout } from \"./changeEnricher.js\";\nimport type { ResubmitMachine } from \"./resubmitMachine.js\";\n\ninterface PendingChange<TChange> {\n\tcommit: GraphCommit<TChange>;\n\tlastEnrichment: number;\n}\n\n/**\n * Default implementation of {@link ResubmitMachine}.\n */\nexport class DefaultResubmitMachine<TChange> implements ResubmitMachine<TChange> {\n\t/**\n\t * Maps from revision of submitted commit to the pending change for that commit.\n\t */\n\tprivate readonly pendingChanges: Map<RevisionTag, PendingChange<TChange>> = new Map();\n\n\t/**\n\t * The current enrichment version for in-flight commits.\n\t * Incremented when a peer commit is sequenced.\n\t */\n\tprivate currentEnrichment: number = 0;\n\n\tpublic constructor(\n\t\t/**\n\t\t * A function that can create a rollback for a given change.\n\t\t */\n\t\tprivate readonly makeRollback: (change: TaggedChange<TChange>) => TChange,\n\t\t/**\n\t\t * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight\n\t\t * commits are applied and automatically rebased).\n\t\t */\n\t\tprivate readonly tip: ChangeEnricherReadonlyCheckout<TChange>,\n\t) {}\n\n\tpublic onCommitSubmitted(commit: GraphCommit<TChange>): void {\n\t\tthis.pendingChanges.set(commit.revision, {\n\t\t\tcommit,\n\t\t\tlastEnrichment: this.currentEnrichment,\n\t\t});\n\t}\n\n\tpublic onCommitRollback(commit: GraphCommit<TChange>): void {\n\t\tthis.pendingChanges.delete(commit.revision);\n\t}\n\n\tprivate updateEnrichments(\n\t\trevision: RevisionTag,\n\t\tgetLocalCommits: () => readonly GraphCommit<TChange>[],\n\t): void {\n\t\tconst pendingChange = this.pendingChanges.get(revision);\n\t\tif (\n\t\t\tpendingChange === undefined ||\n\t\t\tpendingChange.lastEnrichment === this.currentEnrichment\n\t\t) {\n\t\t\t// The first commit to resubmit has a valid enrichment, so all pending commits must be valid.\n\t\t\treturn;\n\t\t}\n\n\t\tconst localCommits = getLocalCommits();\n\t\tassert(\n\t\t\tlocalCommits[0]?.revision === revision,\n\t\t\t0xc79 /* Expected local commits to start with specified revision */,\n\t\t);\n\n\t\t// Some in-flight commits have stale enrichments, so we recompute them.\n\t\tconst checkout = this.tip.fork();\n\n\t\t// Roll back the checkout to the state before the oldest commit\n\t\tfor (let iCommit = localCommits.length - 1; iCommit >= 0; iCommit -= 1) {\n\t\t\tconst commit = localCommits[iCommit] ?? oob();\n\t\t\tconst rollback = this.makeRollback(commit);\n\t\t\t// WARNING: it's not currently possible to roll back past a schema change (see AB#7265).\n\t\t\t// Either we have to make it possible to do so, or this logic will have to change to work\n\t\t\t// forwards from an earlier fork instead of backwards.\n\t\t\tcheckout.applyTipChange(rollback);\n\t\t}\n\n\t\t// Update the enrichments of the stale commits.\n\t\tfor (const [iCommit, commit] of localCommits.entries()) {\n\t\t\tconst current = this.getPendingChange(commit.revision);\n\t\t\tassert(\n\t\t\t\tcurrent !== undefined,\n\t\t\t\t0xbda /* there must be an inflight commit for each resubmit commit */,\n\t\t\t);\n\n\t\t\tif (current.lastEnrichment < this.currentEnrichment) {\n\t\t\t\tconst enrichedChange = checkout.updateChangeEnrichments(\n\t\t\t\t\tcommit.change,\n\t\t\t\t\tcommit.revision,\n\t\t\t\t);\n\t\t\t\tconst enrichedCommit = { ...commit, change: enrichedChange };\n\n\t\t\t\t// Optimization: only apply the enriched change if the next commit also needs enrichment.\n\t\t\t\tconst nextCommit = localCommits[iCommit + 1];\n\t\t\t\tif (\n\t\t\t\t\tnextCommit !== undefined &&\n\t\t\t\t\tthis.getPendingChange(nextCommit.revision).lastEnrichment < this.currentEnrichment\n\t\t\t\t) {\n\t\t\t\t\tcheckout.applyTipChange(enrichedChange, commit.revision);\n\t\t\t\t}\n\n\t\t\t\tcurrent.commit = enrichedCommit;\n\t\t\t\tcurrent.lastEnrichment = this.currentEnrichment;\n\t\t\t}\n\t\t}\n\t\tcheckout[disposeSymbol]();\n\t}\n\n\tpublic getEnrichedCommit(\n\t\trevision: RevisionTag,\n\t\tgetLocalCommitsSince: () => readonly GraphCommit<TChange>[],\n\t): GraphCommit<TChange> | undefined {\n\t\tthis.updateEnrichments(revision, getLocalCommitsSince);\n\t\tconst pendingChange = this.pendingChanges.get(revision);\n\t\treturn pendingChange?.commit;\n\t}\n\n\tprivate getPendingChange(revision: RevisionTag): PendingChange<TChange> {\n\t\treturn (\n\t\t\tthis.pendingChanges.get(revision) ??\n\t\t\tfail(0xc7a /* No pending change stored for this revision */)\n\t\t);\n\t}\n\n\tpublic onSequencedCommitApplied(revision: RevisionTag, isLocal: boolean): void {\n\t\t// We no longer need to track enrichment for the commit with this revision.\n\t\t// Note that we may have a commit for this revision even if this is not a local change,\n\t\t// as this client and another peer may have merged the same commit from a shared branch.\n\t\tthis.pendingChanges.delete(revision);\n\t\tif (!isLocal) {\n\t\t\t// A peer commit has been sequenced, invalidating the enrichment of our in-flight commits.\n\t\t\tthis.currentEnrichment++;\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"defaultResubmitMachine.js","sourceRoot":"","sources":["../../src/shared-tree-core/defaultResubmitMachine.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, fail } from \"@fluidframework/core-utils/internal\";\n\nimport type { GraphCommit, RevisionTag } from \"../core/index.js\";\nimport { hasSome } from \"../util/index.js\";\n\nimport type { ChangeEnricher } from \"./changeEnricher.js\";\nimport type { ResubmitMachine } from \"./resubmitMachine.js\";\n\ninterface PendingChange<TChange> {\n\tcommit: GraphCommit<TChange>;\n\tlastEnrichment: number;\n}\n\n/**\n * Default implementation of {@link ResubmitMachine}.\n */\nexport class DefaultResubmitMachine<TChange> implements ResubmitMachine<TChange> {\n\t/**\n\t * Maps from revision of submitted commit to the pending change for that commit.\n\t */\n\tprivate readonly pendingChanges: Map<RevisionTag, PendingChange<TChange>> = new Map();\n\n\t/**\n\t * The current enrichment version for in-flight commits.\n\t * Incremented when a peer commit is sequenced.\n\t */\n\tprivate currentEnrichment: number = 0;\n\n\tpublic constructor(\n\t\t/**\n\t\t * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight\n\t\t * commits are applied and automatically rebased).\n\t\t */\n\t\tprivate readonly enricher: ChangeEnricher<TChange>,\n\t) {}\n\n\tpublic onCommitSubmitted(commit: GraphCommit<TChange>): void {\n\t\tthis.pendingChanges.set(commit.revision, {\n\t\t\tcommit,\n\t\t\tlastEnrichment: this.currentEnrichment,\n\t\t});\n\t}\n\n\tpublic onCommitRollback(commit: GraphCommit<TChange>): void {\n\t\tthis.pendingChanges.delete(commit.revision);\n\t}\n\n\tprivate updateEnrichments(\n\t\trevision: RevisionTag,\n\t\tgetLocalCommits: () => readonly GraphCommit<TChange>[],\n\t): void {\n\t\tconst pendingChange = this.pendingChanges.get(revision);\n\t\tif (\n\t\t\tpendingChange === undefined ||\n\t\t\tpendingChange.lastEnrichment === this.currentEnrichment\n\t\t) {\n\t\t\t// The first commit to resubmit has a valid enrichment, so all pending commits must be valid.\n\t\t\treturn;\n\t\t}\n\n\t\tconst newCommits = getLocalCommits();\n\n\t\tconst staleChanges: {\n\t\t\treadonly pending: PendingChange<TChange>;\n\t\t\treadonly newCommit: GraphCommit<TChange>;\n\t\t}[] = [];\n\t\tfor (const newCommit of newCommits) {\n\t\t\tconst pending = this.getPendingChange(newCommit.revision);\n\t\t\tassert(\n\t\t\t\tpending !== undefined,\n\t\t\t\t0xbda /* there must be an inflight commit for each resubmit commit */,\n\t\t\t);\n\t\t\tconst isStale = pending.lastEnrichment < this.currentEnrichment;\n\t\t\tif (isStale) {\n\t\t\t\tstaleChanges.push({ pending, newCommit });\n\t\t\t} else {\n\t\t\t\t// We have reached a commit with a valid enrichment. Later commits must also be valid.\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\n\t\tassert(\n\t\t\thasSome(staleChanges) && staleChanges[0].newCommit.revision === revision,\n\t\t\t0xc79 /* Expected local commits to start with specified revision */,\n\t\t);\n\n\t\tconst startingState = staleChanges[0].newCommit.parent;\n\t\tassert(startingState !== undefined, 0xcc3 /* New commits must have a parent. */);\n\t\t// Some in-flight commits have stale enrichments, so we recompute them.\n\t\tconst enriched = this.enricher.enrich(\n\t\t\tstartingState,\n\t\t\tnewCommits.slice(0, staleChanges.length),\n\t\t);\n\t\tfor (const [index, { pending, newCommit }] of staleChanges.entries()) {\n\t\t\tconst enrichedChange = enriched[index];\n\t\t\tassert(enrichedChange !== undefined, 0xcc4 /* Missing enriched commit. */);\n\t\t\tconst enrichedCommit = { ...newCommit, change: enrichedChange };\n\t\t\tpending.commit = enrichedCommit;\n\t\t\tpending.lastEnrichment = this.currentEnrichment;\n\t\t}\n\t}\n\n\tpublic getEnrichedCommit(\n\t\trevision: RevisionTag,\n\t\tgetLocalCommitsSince: () => readonly GraphCommit<TChange>[],\n\t): GraphCommit<TChange> | undefined {\n\t\tthis.updateEnrichments(revision, getLocalCommitsSince);\n\t\tconst pendingChange = this.pendingChanges.get(revision);\n\t\treturn pendingChange?.commit;\n\t}\n\n\tprivate getPendingChange(revision: RevisionTag): PendingChange<TChange> {\n\t\treturn (\n\t\t\tthis.pendingChanges.get(revision) ??\n\t\t\tfail(0xc7a /* No pending change stored for this revision */)\n\t\t);\n\t}\n\n\tpublic onSequencedCommitApplied(revision: RevisionTag, isLocal: boolean): void {\n\t\t// We no longer need to track enrichment for the commit with this revision.\n\t\t// Note that we may have a commit for this revision even if this is not a local change,\n\t\t// as this client and another peer may have merged the same commit from a shared branch.\n\t\tthis.pendingChanges.delete(revision);\n\t\tif (!isLocal) {\n\t\t\t// A peer commit has been sequenced, invalidating the enrichment of our in-flight commits.\n\t\t\tthis.currentEnrichment++;\n\t\t}\n\t}\n}\n"]}

package/lib/shared-tree-core/editManager.d.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 import type { SessionId } from "@fluidframework/id-compressor";
+import { type ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 import { type ChangeFamily, type ChangeFamilyEditor, type GraphCommit, type RevisionTag } from "../core/index.js";
 import { SharedTreeBranch, type BranchId } from "./branch.js";
 import type { SeqNumber, SequencedCommit, SummarySessionBranch } from "./editManagerFormatCommons.js";
-import { type ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 export declare const minimumPossibleSequenceNumber: SeqNumber;
 /**
  * Represents a local branch of a document and interprets the effect on the document of adding sequenced changes,

package/lib/shared-tree-core/editManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editManager.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editManager.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAEN,KAAK,mBAAmB,EACxB,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAMhB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACN,gBAAgB,EAGhB,KAAK,QAAQ,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAEX,SAAS,EAET,eAAe,EACf,oBAAoB,EACpB,MAAM,+BAA+B,CAAC;AASvC,eAAO,MAAM,6BAA6B,EAAE,SAA0C,CAAC;AAkBvF;;;GAGG;AAEH,qBAAa,WAAW,CACvB,OAAO,SAAS,kBAAkB,EAClC,UAAU,EACV,aAAa,SAAS,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC;aA8CtC,YAAY,EAAE,aAAa;aAC3B,cAAc,EAAE,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IA/CxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IAEjE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0D;IAEzF;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAGK;IAEnC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB,CAAiC;IAE9D;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAA0B;IAE3C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAEzB;IAEb;;;;;OAKG;gBAEc,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,SAAS,EACxB,eAAe,EAAE,MAAM,WAAW,EAClC,qBAAqB,CAAC,cAAa,QAAQ,KAAK,IAAI,aAAA,EACrE,MAAM,CAAC,EAAE,mBAAmB;IA6BtB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;IAIhF,OAAO,CAAC,eAAe;IAIvB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAerB;;OAEG;IACI,uBAAuB,IAAI,SAAS,GAAG,SAAS;IAcvD;;;;;;OAMG;IACI,4BAA4B,CAClC,qBAAqB,EAAE,SAAS,EAChC,WAAW,UAAO,GAChB,IAAI;IAgBP;;;OAGG;IACH,OAAO,CAAC,WAAW;IA8EZ,OAAO,IAAI,OAAO;IAUlB,cAAc,IAAI,WAAW,CAAC,UAAU,CAAC;IA0BzC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI;IA0BpD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC;IAIzD,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU,EAAE;IAIjD,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,EAAE;IAI9D,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,WAAW,CAAC,UAAU,CAAC,EAAE;IAK9E;;;;;;;OAOG;IACI,sBAAsB,IAAI,MAAM;IAQhC,sBAAsB,CAC5B,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,SAAS,EAClC,QAAQ,EAAE,QAAQ,GAChB,IAAI;IAWA,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAUtC,kBAAkB,IAAI,QAAQ,EAAE;IAIhC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAM7C,OAAO,CAAC,wBAAwB;IAWhC,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;OAQG;IAEI,mBAAmB,CACzB,UAAU,EAAE,SAAS,WAAW,CAAC,UAAU,CAAC,EAAE,EAC9C,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,SAAS,EAClC,QAAQ,EAAE,QAAQ,GAChB,IAAI;IAsDA,eAAe,CACrB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,WAAW,GACnB,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;CAS7E;AAED;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,UAAU;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/E;AAED,MAAM,WAAW,uBAAuB,CAAC,UAAU;IAClD,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;IACvD,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,SAAS,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;CACrF"}

package/lib/shared-tree-core/editManager.js

@@ -2,14 +2,14 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert, fail } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
+import { assert, fail } from "@fluidframework/core-utils/internal";
+import { TelemetryEventBatcher, } from "@fluidframework/telemetry-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 import { findAncestor, findCommonAncestor, mintCommit, tagChange, } from "../core/index.js";
 import { brand, getOrCreate, mapIterable } from "../util/index.js";
 import { SharedTreeBranch, onForkTransitive, } from "./branch.js";
 import { getUpperBoundOfPreviousSequenceId, equalSequenceIds, maxSequenceId, minSequenceId, sequenceIdComparator, } from "./sequenceIdUtils.js";
-import { TelemetryEventBatcher, } from "@fluidframework/telemetry-utils/internal";
 export const minimumPossibleSequenceNumber = brand(Number.MIN_SAFE_INTEGER);
 const minimumPossibleSequenceId = {
     sequenceNumber: minimumPossibleSequenceNumber,
@@ -688,7 +688,8 @@ class SharedBranch {
         assert((this.parentBranch === undefined) === (data.base === undefined), 0xc60 /* Expected branch base to match presence of parent branch */);
         const parentTrunkBase = trunkRevisionCache.get(data.base ?? rootRevision) ??
             fail(0xc61 /* Expected base revision to be in trunk cache */);
-        this.trunk.setHead(data.trunk.reduce((base, c) => {
+        let trunkHead = parentTrunkBase;
+        for (const c of data.trunk) {
             const sequenceId = c.indexInBatch === undefined
                 ? {
                     sequenceNumber: c.sequenceNumber,
@@ -697,20 +698,25 @@ class SharedBranch {
                     sequenceNumber: c.sequenceNumber,
                     indexInBatch: c.indexInBatch,
                 };
-            const commit = mintCommit(base, c);
+            const commit = mintCommit(trunkHead, c);
             this.sequenceIdToCommit.set(sequenceId, commit);
             this.commitMetadata.set(c.revision, {
                 sequenceId,
                 sessionId: c.sessionId,
             });
             trunkRevisionCache.set(c.revision, commit);
-            return commit;
-        }, parentTrunkBase));
+            trunkHead = commit;
+        }
+        this.trunk.setHead(trunkHead);
         this.localBranch.setHead(this.trunk.getHead());
         for (const [sessionId, branch] of data.peerLocalBranches) {
             const commit = trunkRevisionCache.get(branch.base) ??
                 fail(0xad7 /* Expected summary branch to be based off of a revision in the trunk */);
-            this.peerLocalBranches.set(sessionId, new SharedTreeBranch(branch.commits.reduce(mintCommit, commit), this.changeFamily, this.mintRevisionTag));
+            let branchHead = commit;
+            for (const c of branch.commits) {
+                branchHead = mintCommit(branchHead, c);
+            }
+            this.peerLocalBranches.set(sessionId, new SharedTreeBranch(branchHead, this.changeFamily, this.mintRevisionTag));
         }
     }
 }