@fluidframework/tree 2.103.0 → 2.111.0

package/dist/shared-tree/treeCheckout.js

@@ -3,53 +3,9 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
-var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
-    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _, done = false;
-    for (var i = decorators.length - 1; i >= 0; i--) {
-        var context = {};
-        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-        if (kind === "accessor") {
-            if (result === void 0) continue;
-            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-            if (_ = accept(result.get)) descriptor.get = _;
-            if (_ = accept(result.set)) descriptor.set = _;
-            if (_ = accept(result.init)) initializers.unshift(_);
-        }
-        else if (_ = accept(result)) {
-            if (kind === "field") initializers.unshift(_);
-            else descriptor[key] = _;
-        }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeCheckout = exports.assertValidConstraint = exports.addConstraintsToTransaction = exports.createTreeCheckout = void 0;
+const tslib_1 = require("tslib");
 const client_utils_1 = require("@fluid-internal/client-utils");
 const internal_1 = require("@fluidframework/core-utils/internal");
 const internal_2 = require("@fluidframework/id-compressor/internal");
@@ -63,6 +19,7 @@ const index_js_6 = require("../util/index.js");
 const schematizingTreeView_js_1 = require("./schematizingTreeView.js");
 const sharedTreeChangeEnricher_js_1 = require("./sharedTreeChangeEnricher.js");
 const sharedTreeChangeFamily_js_1 = require("./sharedTreeChangeFamily.js");
+const transactionPostProcessor_js_1 = require("./transactionPostProcessor.js");
 /**
  * Yields all defined (non-`undefined`) labels from a {@link LabelTree}, depth-first.
  */
@@ -129,7 +86,7 @@ function createTreeCheckout(idCompressor, mintRevisionTag, revisionTagCodec, arg
             change: changeFamily.rebaser.compose([]),
             revision: "root",
         }, changeFamily, () => idCompressor.generateCompressedId());
-    return new TreeCheckout(branch, true, changeFamily, schema, forest, mintRevisionTag, revisionTagCodec, idCompressor, args?.removedRoots, args?.logger, breaker, args?.disposeForksAfterTransaction);
+    return new TreeCheckout(branch, true, changeFamily, schema, forest, mintRevisionTag, revisionTagCodec, idCompressor, args?.removedRoots, args?.logger, breaker);
 }
 exports.createTreeCheckout = createTreeCheckout;
 /**
@@ -151,7 +108,7 @@ function getCheckout(context) {
  * @param constraintsOnRevert - If true, use {@link ISharedTreeEditor.addNodeExistsConstraintOnRevert}.
  * @param constraints - The constraints to add to the transaction.
  *
- * @see {@link RunTransactionParams.preconditions}.
+ * @see {@link RunTransactionParamsAlpha.preconditions}.
  */
 function addConstraintsToTransaction(checkout, constraintsOnRevert, constraints = []) {
     for (const constraint of constraints) {
@@ -226,8 +183,8 @@ let TreeCheckout = (() => {
             /** True if and only if this checkout is for a branch which is persisted and shared with other clients. */
             isSharedBranch, changeFamily, storedSchema, forest, mintRevisionTag, revisionTagCodec, idCompressor, _removedRoots = (0, index_js_2.makeDetachedFieldIndex)("repair", revisionTagCodec, idCompressor), 
             /** Optional logger for telemetry. */
-            logger, breaker = new index_js_6.Breakable("TreeCheckout"), disposeForksAfterTransaction = true) {
-                this.isSharedBranch = (__runInitializers(this, _instanceExtraInitializers), isSharedBranch);
+            logger, breaker = new index_js_6.Breakable("TreeCheckout")) {
+                this.isSharedBranch = (tslib_1.__runInitializers(this, _instanceExtraInitializers), isSharedBranch);
                 this.changeFamily = changeFamily;
                 this.storedSchema = storedSchema;
                 this.forest = forest;
@@ -237,13 +194,12 @@ let TreeCheckout = (() => {
                 this._removedRoots = _removedRoots;
                 this.logger = logger;
                 this.breaker = breaker;
-                this.disposeForksAfterTransaction = disposeForksAfterTransaction;
                 this.disposed = false;
                 this.views = new Set();
                 /**
-                 * Set of revertibles maintained for automatic disposal
+                 * Revertibles maintained for automatic disposal
                  */
-                this.revertibles = new Set();
+                this.revertibles = new Map();
                 /**
                  * Each branch's head commit corresponds to a revertible commit.
                  * Maintaining a whole branch ensures the commit graph is not pruned in a way that would prevent the commit from
@@ -251,7 +207,7 @@ let TreeCheckout = (() => {
                  */
                 this.revertibleCommitBranches = new Map();
                 _TreeCheckout_events.set(this, (0, client_utils_1.createEmitter)());
-                this.events = __classPrivateFieldGet(this, _TreeCheckout_events, "f");
+                this.events = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f");
                 this.onAfterBranchChange = (event) => {
                     // The following logic allows revertibles to be generated for the change.
                     // Currently only appends (including merges and transaction commits) are supported.
@@ -275,8 +231,8 @@ let TreeCheckout = (() => {
                                         throw new internal_3.UsageError("Cannot generate the same revertible more than once. Note that this can happen when multiple changed event listeners are registered.");
                                     }
                                     const revertible = this.createRevertible(revision, kind, this, onRevertibleDisposed, commitLabelTree);
-                                    this.revertibleCommitBranches.set(revision, __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.fork(commit));
-                                    this.revertibles.add(revertible);
+                                    this.revertibleCommitBranches.set(revision, tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.fork(commit));
+                                    this.revertibles.set(revision, revertible);
                                     return revertible;
                                 };
                             let withinEventContext = true;
@@ -303,29 +259,39 @@ let TreeCheckout = (() => {
                                 label: this.labelTreeNode?.label,
                                 labels: buildLabelsSet(this.labelTreeNode),
                             };
-                            __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("changed", metadata, getRevertible);
+                            this.emitChangedLocked(() => {
+                                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("changed", metadata, getRevertible);
+                            });
                             withinEventContext = false;
                         }
                     }
+                    else if (event.type === "remove") {
+                        // Commits that are rolled back should no longer be revertible
+                        for (const commit of event.removedCommits) {
+                            this.revertibles.get(commit.revision)?.dispose();
+                        }
+                    }
                     else if (this.isRemoteChangeEvent(event)) {
                         // TODO: figure out how to plumb through commit kind info for remote changes
-                        __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("changed", {
-                            isLocal: false,
-                            kind: index_js_2.CommitKind.Default,
-                            labels: new Set(),
+                        this.emitChangedLocked(() => {
+                            tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("changed", {
+                                isLocal: false,
+                                kind: index_js_2.CommitKind.Default,
+                                labels: new Set(),
+                            });
                         });
                     }
                 };
                 this.onAfterChange = (event) => {
                     this.editLock.lock();
-                    __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("beforeBatch", event);
+                    tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("beforeBatch", event);
                     if (event.change !== undefined) {
                         const revision = event.type === "rebase"
-                            ? __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead().revision
+                            ? tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead().revision
                             : event.change.revision;
                         this.applyInternalChange(event.change.change, revision);
                     }
-                    __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
+                    tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
                     this.editLock.unlock();
                     if (event.type === "append") {
                         for (const commit of event.newCommits) {
@@ -370,8 +336,8 @@ let TreeCheckout = (() => {
                  * The performance cost of maintaining this information is negligible.
                  */
                 this.enrichmentStats = { batches: 0, diffs: 0, commitsEnriched: 0, refreshers: 0, forks: 0, applied: 0 };
-                __classPrivateFieldSet(this, _TreeCheckout_transaction, this.createTransactionStack(branch), "f");
-                this.editLock = new EditLock(__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEditor);
+                tslib_1.__classPrivateFieldSet(this, _TreeCheckout_transaction, this.createTransactionStack(branch), "f");
+                this.editLock = new EditLock(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEditor);
                 this.registerForBranchEvents();
             }
             /**
@@ -479,24 +445,21 @@ let TreeCheckout = (() => {
                 return this._removedRoots;
             }
             registerForBranchEvents() {
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.events.on("afterChange", this.onAfterBranchChange);
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.on("afterChange", this.onAfterChange);
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.on("ancestryTrimmed", this.onAncestryTrimmed);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.events.on("afterChange", this.onAfterBranchChange);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.on("afterChange", this.onAfterChange);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.on("ancestryTrimmed", this.onAncestryTrimmed);
             }
             unregisterFromBranchEvents() {
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.events.off("afterChange", this.onAfterBranchChange);
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.off("afterChange", this.onAfterChange);
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.off("ancestryTrimmed", this.onAncestryTrimmed);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.events.off("afterChange", this.onAfterBranchChange);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.off("afterChange", this.onAfterChange);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEvents.off("ancestryTrimmed", this.onAncestryTrimmed);
             }
             createTransactionStack(branch) {
                 return new index_js_4.SquashingTransactionStack(branch, this.mintRevisionTag, () => {
-                    const disposeForks = this.disposeForksAfterTransaction
-                        ? trackForksForDisposal(this)
-                        : undefined;
                     // When each transaction is started, make a restorable checkpoint of the current state of removed roots
                     const restoreRemovedRoots = this._removedRoots.createCheckpoint();
                     return (result, viewUpdate) => {
-                        const newHead = __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead();
+                        const newHead = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead();
                         switch (result) {
                             case index_js_4.TransactionResult.Abort: {
                                 restoreRemovedRoots();
@@ -519,7 +482,6 @@ let TreeCheckout = (() => {
                                 (0, internal_1.unreachableCase)(result);
                             }
                         }
-                        disposeForks?.();
                     };
                 });
             }
@@ -543,6 +505,31 @@ let TreeCheckout = (() => {
                     cursor.free();
                 }
             }
+            /**
+             * Hold the `editLock` for the duration of `emit`, so that re-entrant edits, transactions,
+             * branch operations, etc. attempted from inside a `changed` listener throw the canonical
+             * "forbidden during a change event" {@link UsageError} via {@link EditLock.checkUnlocked}.
+             *
+             * @remarks
+             * Shared by both the local and remote `changed` emission paths in {@link TreeCheckout.onAfterBranchChange}.
+             * The `try`/`finally` ensures the lock is released even if a listener throws.
+             */
+            emitChangedLocked(emit) {
+                this.editLock.lock();
+                try {
+                    emit();
+                }
+                finally {
+                    // TODO: any event that throws potentially leaves the code which triggered that event,
+                    // and thus this checkout (and likely more) in a broken state.
+                    // Unlocking this editLock prevents future use of this broken state from giving a confusing error in this case,
+                    // however, a better approach would probably be to put something (this checkout and/or the editLock)
+                    // into a broken state (using a properly scoped `Breakable`),
+                    // likely by moving emitChangedLocked into EditLock, and having EditLock get a Breakable,
+                    // and having the new emitChangedLocked use `Breakable.use`.
+                    this.editLock.unlock();
+                }
+            }
             /**
              * Applies the given serialized change (as was produced via a `"changed"` event of another checkout) to this checkout.
              */
@@ -562,7 +549,7 @@ let TreeCheckout = (() => {
                 };
                 const decodedChange = this.changeFamily.codecs.resolve(4).decode(change, context);
                 // Apply the change to the branch, but _not_ the `activeBranch` - we do not support squashing serialized commits in a transaction.
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.apply((0, index_js_2.tagChange)(decodedChange, revision));
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.apply((0, index_js_2.tagChange)(decodedChange, revision));
             }
             // #region TreeBranchAlpha
             applyChange(change) {
@@ -586,11 +573,22 @@ let TreeCheckout = (() => {
             }
             mountTransaction(params, isAsync) {
                 this.checkNotDisposed();
+                // Starting a transaction is an edit, so it is forbidden from within a change-event
+                // callback (where the edit lock is held), the same as direct edits. For the async
+                // entry point this throw is captured as a rejected promise by the `async` wrapper.
+                //
+                // Note: because runTransaction/runTransactionAsync are `@breakingMethod`, this throw also
+                // puts the checkout into a broken state (unlike a direct edit, which throws recoverably).
+                // That is the same pre-existing broken-state limitation tracked by the TODO in
+                // `emitChangedLocked`, not something specific to transactions.
+                this.editLock.checkUnlocked("Running a transaction");
                 if (isAsync && this.transaction.size > 0) {
                     throw new internal_3.UsageError("An asynchronous transaction cannot be started while another transaction is already in progress.");
                 }
                 this.pushLabelFrame(params?.label);
-                this.transaction.start();
+                this.transaction.start({
+                    postProcessor: (0, transactionPostProcessor_js_1.extractTransactionChangeProcessor)(params?.postProcessor),
+                });
                 addConstraintsToTransaction(this, false, params?.preconditions);
             }
             unmountTransaction(transactionCallbackStatus, params) {
@@ -704,7 +702,7 @@ let TreeCheckout = (() => {
                             throw new internal_3.UsageError("Unable to clone a revertible that has been disposed.");
                         }
                         const commitToRevert = revertibleBranch.getHead();
-                        const activeBranchHead = __classPrivateFieldGet(targetCheckout, _TreeCheckout_transaction, "f").activeBranch.getHead();
+                        const activeBranchHead = tslib_1.__classPrivateFieldGet(targetCheckout, _TreeCheckout_transaction, "f").activeBranch.getHead();
                         if ((0, index_js_2.isAncestor)(commitToRevert, activeBranchHead, true) === false) {
                             throw new internal_3.UsageError("Cannot clone revertible for a commit that is not present on the given branch.");
                         }
@@ -715,7 +713,7 @@ let TreeCheckout = (() => {
                         if (revertible.status === index_js_2.RevertibleStatus.Disposed) {
                             throw new internal_3.UsageError("Unable to dispose a revertible that has already been disposed.");
                         }
-                        checkout.disposeRevertible(revertible, revision);
+                        checkout.disposeRevertible(revision);
                         onRevertibleDisposed?.(revertible);
                     },
                 };
@@ -740,7 +738,7 @@ let TreeCheckout = (() => {
                 return this.forest.anchors.locate(anchor);
             }
             get transaction() {
-                return __classPrivateFieldGet(this, _TreeCheckout_transaction, "f");
+                return tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f");
             }
             fork() {
                 this.checkNotDisposed("The parent branch has already been disposed and can no longer create new branches.");
@@ -748,26 +746,25 @@ let TreeCheckout = (() => {
                 if (this.transaction.size > 0) {
                     throw new internal_3.UsageError("A view cannot be forked while it has a pending transaction.");
                 }
-                this.editLock.checkUnlocked("Branching");
-                const branch = __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.fork();
+                const branch = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.fork();
                 const storedSchema = this.storedSchema.clone();
                 const forkBreaker = new index_js_6.Breakable("TreeCheckout");
                 const forest = this.forest.clone(storedSchema, forkBreaker);
-                const checkout = new _a(branch, false, this.changeFamily, storedSchema, forest, this.mintRevisionTag, this.revisionTagCodec, this.idCompressor, this._removedRoots.clone(), this.logger, forkBreaker, this.disposeForksAfterTransaction);
-                __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("fork", checkout);
+                const checkout = new _a(branch, false, this.changeFamily, storedSchema, forest, this.mintRevisionTag, this.revisionTagCodec, this.idCompressor, this._removedRoots.clone(), this.logger, forkBreaker);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("fork", checkout);
                 return checkout;
             }
             switchBranch(branch) {
                 // TODO: Dispose old branch, if necessary
-                (0, internal_1.assert)(__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").size === 0, 0xc55 /* Cannot switch branches during a transaction */);
-                const diff = (0, index_js_2.diffHistories)(this.changeFamily.rebaser, __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead(), branch.getHead(), this.mintRevisionTag);
+                (0, internal_1.assert)(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").size === 0, 0xc55 /* Cannot switch branches during a transaction */);
+                const diff = (0, index_js_2.diffHistories)(this.changeFamily.rebaser, tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead(), branch.getHead(), this.mintRevisionTag);
                 this.unregisterFromBranchEvents();
-                __classPrivateFieldSet(this, _TreeCheckout_transaction, this.createTransactionStack(branch), "f");
-                this.editLock = new EditLock(__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEditor);
+                tslib_1.__classPrivateFieldSet(this, _TreeCheckout_transaction, this.createTransactionStack(branch), "f");
+                this.editLock = new EditLock(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranchEditor);
                 this.registerForBranchEvents();
                 // TODO: Rework eventing
                 this.applyInternalChange(diff);
-                __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
             }
             rebase(branch) {
                 const checkout = getCheckout(branch);
@@ -781,11 +778,23 @@ let TreeCheckout = (() => {
                     throw new internal_3.UsageError("A view cannot be rebased while it has a pending transaction.");
                 }
                 (0, internal_1.assert)(!checkout.isSharedBranch, 0xa5d /* Shared branches cannot be rebased onto another branch. */);
-                __classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").activeBranch.rebaseOnto(__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch);
+                tslib_1.__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").activeBranch.rebaseOnto(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch);
             }
             rebaseOnto(branch) {
                 getCheckout(branch).rebase(this);
             }
+            isMissingEditsFrom(branch) {
+                const branchCheckout = getCheckout(branch);
+                const targetPath = [];
+                const ancestor = (0, index_js_2.findCommonAncestor)(this.mainBranch.getHead(), [
+                    branchCheckout.mainBranch.getHead(),
+                    targetPath,
+                ]);
+                if (ancestor === undefined) {
+                    throw new internal_3.UsageError("Branches do not share a common ancestor.");
+                }
+                return targetPath.length > 0;
+            }
             merge(branch, disposeMerged = true) {
                 const checkout = getCheckout(branch);
                 this.checkNotDisposed("The target branch of the merge has been disposed and cannot be merged.");
@@ -797,7 +806,7 @@ let TreeCheckout = (() => {
                 if (checkout.transaction.size > 0) {
                     throw new internal_3.UsageError("Views with an open transaction cannot be merged into another view.");
                 }
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.merge(__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").activeBranch);
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.merge(tslib_1.__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").activeBranch);
                 if (disposeMerged && !checkout.isSharedBranch) {
                     // Dispose the merged checkout unless it is a shared branch.
                     checkout[index_js_6.disposeSymbol]();
@@ -817,13 +826,13 @@ let TreeCheckout = (() => {
             [(_TreeCheckout_events = new WeakMap(), _TreeCheckout_transaction = new WeakMap(), _TreeCheckout_validatedCommits = new WeakMap(), _exportVerbose_decorators = [index_js_6.throwIfBroken], _applySerializedChange_decorators = [index_js_6.throwIfBroken], _applyChange_decorators = [index_js_6.throwIfBroken], _runTransaction_decorators = [index_js_6.breakingMethod], _runTransactionAsync_decorators = [index_js_6.breakingMethod], _viewWith_decorators = [index_js_6.throwIfBroken], _fork_decorators = [index_js_6.throwIfBroken], index_js_6.disposeSymbol)]() {
                 this.checkNotDisposed("The branch has already been disposed and cannot be disposed again.");
                 this.disposed = true;
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.dispose();
-                __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").dispose();
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.dispose();
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").dispose();
                 this.purgeRevertibles();
                 for (const view of this.views) {
                     view.dispose();
                 }
-                __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("dispose");
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("dispose");
             }
             getRemovedRoots() {
                 this.assertNoUntrackedRoots();
@@ -849,19 +858,19 @@ let TreeCheckout = (() => {
             load() {
                 // Set the tip revision as the latest relevant revision for any removed roots that are loaded from a summary - this allows them to be garbage collected later.
                 // When a load happens, the head of the trunk and the head of the local/main branch must be the same (this is enforced by SharedTree).
-                this._removedRoots.setRevisionsForLoadedData(__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead().revision);
+                this._removedRoots.setRevisionsForLoadedData(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead().revision);
                 // The content of the checkout (e.g. the forest) has (maybe) changed, so fire an afterBatch event.
-                __classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
+                tslib_1.__classPrivateFieldGet(this, _TreeCheckout_events, "f").emit("afterBatch");
             }
             purgeRevertibles() {
-                for (const revertible of this.revertibles) {
+                for (const revertible of this.revertibles.values()) {
                     revertible.dispose();
                 }
             }
-            disposeRevertible(revertible, revision) {
+            disposeRevertible(revision) {
                 this.revertibleCommitBranches.get(revision)?.dispose();
                 this.revertibleCommitBranches.delete(revision);
-                this.revertibles.delete(revertible);
+                this.revertibles.delete(revision);
             }
             revertRevertible(revision, kind, labelTree) {
                 this.editLock.checkUnlocked("Reverting a commit");
@@ -873,7 +882,7 @@ let TreeCheckout = (() => {
                 const commitToRevert = revertibleBranch.getHead();
                 const revisionForInvert = this.mintRevisionTag();
                 let change = (0, index_js_2.tagChange)(this.changeFamily.rebaser.invert(commitToRevert, false, revisionForInvert), revisionForInvert);
-                const headCommit = __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead();
+                const headCommit = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead();
                 // Rebase the inverted change onto any commits that occurred after the undoable commits.
                 if (commitToRevert !== headCommit) {
                     // The inverse may be rebased over newer commits which (despite being present in the history)
@@ -889,7 +898,7 @@ let TreeCheckout = (() => {
                 const previousLabelTreeNode = this.labelTreeNode;
                 this.labelTreeNode = labelTree;
                 try {
-                    __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.apply(change, kind === index_js_2.CommitKind.Default || kind === index_js_2.CommitKind.Redo
+                    tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.apply(change, kind === index_js_2.CommitKind.Default || kind === index_js_2.CommitKind.Redo
                         ? index_js_2.CommitKind.Undo
                         : index_js_2.CommitKind.Redo);
                 }
@@ -943,7 +952,7 @@ let TreeCheckout = (() => {
              * Otherwise, the function is registered to be called later and this function returns `false`.
              */
             onCommitValid(commit, fn) {
-                const validated = (0, index_js_6.getOrCreate)(__classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f"), commit, () => []);
+                const validated = (0, index_js_6.getOrCreate)(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f"), commit, () => []);
                 if (validated === true) {
                     fn(commit);
                     return true;
@@ -953,12 +962,12 @@ let TreeCheckout = (() => {
             }
             /** Mark the given commit as "validated" according to the contract of {@link onCommitValid}(). */
             validateCommit(commit) {
-                const validated = (0, index_js_6.getOrCreate)(__classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f"), commit, () => []);
+                const validated = (0, index_js_6.getOrCreate)(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f"), commit, () => []);
                 if (validated !== true) {
                     for (const fn of validated) {
                         fn(commit);
                     }
-                    __classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f").set(commit, true);
+                    tslib_1.__classPrivateFieldGet(this, _TreeCheckout_validatedCommits, "f").set(commit, true);
                 }
             }
             resetEnrichmentStats() {
@@ -980,7 +989,7 @@ let TreeCheckout = (() => {
                 const enricher = new sharedTreeChangeEnricher_js_1.SharedTreeChangeEnricher(this.forest, this._removedRoots, this.storedSchema, this.idCompressor, () => (this.enrichmentStats.commitsEnriched += 1), () => (this.enrichmentStats.refreshers += 1), () => (this.enrichmentStats.forks += 1), () => (this.enrichmentStats.applied += 1));
                 // This `lastCommitApplied` may be on the main branch or on a transaction branch.
                 // In either case, it is crucial that the state of the forest & detached field index reflects all changes up to and including this commit.
-                const lastCommitApplied = __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead();
+                const lastCommitApplied = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").activeBranch.getHead();
                 if (context !== lastCommitApplied) {
                     enricher.enqueueChange(() => {
                         this.enrichmentStats.diffs += 1;
@@ -997,18 +1006,18 @@ let TreeCheckout = (() => {
                 return enriched;
             }
             get mainBranch() {
-                return __classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch;
+                return tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch;
             }
         },
         (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            __esDecorate(_a, null, _exportVerbose_decorators, { kind: "method", name: "exportVerbose", static: false, private: false, access: { has: obj => "exportVerbose" in obj, get: obj => obj.exportVerbose }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _applySerializedChange_decorators, { kind: "method", name: "applySerializedChange", static: false, private: false, access: { has: obj => "applySerializedChange" in obj, get: obj => obj.applySerializedChange }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _applyChange_decorators, { kind: "method", name: "applyChange", static: false, private: false, access: { has: obj => "applyChange" in obj, get: obj => obj.applyChange }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _runTransaction_decorators, { kind: "method", name: "runTransaction", static: false, private: false, access: { has: obj => "runTransaction" in obj, get: obj => obj.runTransaction }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _runTransactionAsync_decorators, { kind: "method", name: "runTransactionAsync", static: false, private: false, access: { has: obj => "runTransactionAsync" in obj, get: obj => obj.runTransactionAsync }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _viewWith_decorators, { kind: "method", name: "viewWith", static: false, private: false, access: { has: obj => "viewWith" in obj, get: obj => obj.viewWith }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _fork_decorators, { kind: "method", name: "fork", static: false, private: false, access: { has: obj => "fork" in obj, get: obj => obj.fork }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _exportVerbose_decorators, { kind: "method", name: "exportVerbose", static: false, private: false, access: { has: obj => "exportVerbose" in obj, get: obj => obj.exportVerbose }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _applySerializedChange_decorators, { kind: "method", name: "applySerializedChange", static: false, private: false, access: { has: obj => "applySerializedChange" in obj, get: obj => obj.applySerializedChange }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _applyChange_decorators, { kind: "method", name: "applyChange", static: false, private: false, access: { has: obj => "applyChange" in obj, get: obj => obj.applyChange }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _runTransaction_decorators, { kind: "method", name: "runTransaction", static: false, private: false, access: { has: obj => "runTransaction" in obj, get: obj => obj.runTransaction }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _runTransactionAsync_decorators, { kind: "method", name: "runTransactionAsync", static: false, private: false, access: { has: obj => "runTransactionAsync" in obj, get: obj => obj.runTransactionAsync }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _viewWith_decorators, { kind: "method", name: "viewWith", static: false, private: false, access: { has: obj => "viewWith" in obj, get: obj => obj.viewWith }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib_1.__esDecorate(_a, null, _fork_decorators, { kind: "method", name: "fork", static: false, private: false, access: { has: obj => "fork" in obj, get: obj => obj.fork }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         /**
@@ -1101,10 +1110,7 @@ class EditLock {
      */
     checkUnlocked(action) {
         if (this.locked) {
-            // These type assertions ensure that the event name strings used here match the actual event names
-            const nodeChanged = "nodeChanged";
-            const treeChanged = "treeChanged";
-            throw new internal_3.UsageError(`${action} is forbidden during a ${nodeChanged} or ${treeChanged} event`);
+            throw new internal_3.UsageError(`${action} is forbidden during a change event callback`);
         }
     }
     /**
@@ -1116,33 +1122,6 @@ class EditLock {
         this.locked = false;
     }
 }
-/**
- * Keeps track of all new forks created until the returned function is invoked, which will dispose all of those for.
- * The returned function may only be called once.
- *
- * @param checkout - The tree checkout for which you want to monitor forks for disposal.
- * @returns a function which can be called to dispose all of the tracked forks.
- */
-function trackForksForDisposal(checkout) {
-    const forks = new Set();
-    const onDisposeUnSubscribes = [];
-    const onForkUnSubscribe = (0, index_js_4.onForkTransitive)(checkout, (fork) => {
-        forks.add(fork);
-        onDisposeUnSubscribes.push(fork.events.on("dispose", () => forks.delete(fork)));
-    });
-    let disposed = false;
-    return () => {
-        (0, internal_1.assert)(!disposed, 0xaa9 /* Forks may only be disposed once */);
-        for (const fork of forks) {
-            fork.dispose();
-        }
-        for (const unsubscribe of onDisposeUnSubscribes) {
-            unsubscribe();
-        }
-        onForkUnSubscribe();
-        disposed = true;
-    };
-}
 function verboseFromCursor(reader, schema) {
     const fields = (0, index_js_5.customFromCursorStored)(reader, schema, verboseFromCursor);
     const nodeSchema = schema.get(reader.type) ?? (0, internal_1.fail)(0xac9 /* missing schema for type in cursor */);