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

package/dist/shared-tree/treeView.d.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 import { FieldKey } from "../core/index.js";
-import { FlexFieldSchema, FlexTreeSchema, FlexTreeTypedField, FlexTreeContext, NodeKeyManager, Context } from "../feature-libraries/index.js";
+import { Context, FlexFieldSchema, FlexTreeContext, FlexTreeSchema, FlexTreeTypedField, NodeKeyManager } from "../feature-libraries/index.js";
 import { IDisposable, disposeSymbol } from "../util/index.js";
-import { ITreeCheckoutFork, ITreeCheckout, TreeCheckout } from "./treeCheckout.js";
+import { ITreeCheckout, ITreeCheckoutFork, TreeCheckout } from "./treeCheckout.js";
 /**
  * An editable view of a (version control style) branch of a shared tree.
  * @privateRemarks
@@ -16,7 +16,7 @@ import { ITreeCheckoutFork, ITreeCheckout, TreeCheckout } from "./treeCheckout.j
  */
 export interface FlexTreeView<in out TRoot extends FlexFieldSchema> extends IDisposable {
     /**
-     * Context for controlling the EditableTree nodes produced from {@link FlexTreeView.flexTree}.
+     * Context for controlling the FlexTree nodes produced from {@link FlexTreeView.flexTree}.
      *
      * @remarks
      * This is an owning reference: disposing of this view disposes its context.

package/dist/shared-tree/treeView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"treeView.d.ts","sourceRoot":"","sources":["../../src/shared-tree/treeView.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACN,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,cAAc,EAEd,OAAO,EACP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEnF;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,CAAE,SAAQ,WAAW;IACtF;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE7C;;;OAGG;IACH,IAAI,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,CAAE,SAAQ,YAAY,CAAC,KAAK,CAAC;IAC/F,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;CACrC;AAED;;GAEG;AACH,qBAAa,oBAAoB,CAChC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,EACpC,GAAG,CAAC,SAAS,SAAS,YAAY,GAAG,YAAY,CAChD,YAAW,YAAY,CAAC,KAAK,CAAC;aAKd,QAAQ,EAAE,SAAS;aACnB,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,cAAc,EAAE,cAAc;aAC9B,eAAe,EAAE,QAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAP5B,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAEnC,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,EAC7B,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,QAAQ,EACxB,SAAS,CAAC,SAAQ,IAAI,aAAA;IAajC,CAAC,aAAa,CAAC,IAAI,IAAI;IAKvB,IAAI,IAAI,oBAAoB,CAAC,KAAK,EAAE,YAAY,GAAG,iBAAiB,CAAC;CAS5E;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,2DAAoD,CAAC"}
+{"version":3,"file":"treeView.d.ts","sourceRoot":"","sources":["../../src/shared-tree/treeView.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACN,OAAO,EACP,eAAe,EACf,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,cAAc,EAEd,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEnF;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,CAAE,SAAQ,WAAW;IACtF;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE7C;;;OAGG;IACH,IAAI,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,CAAE,SAAQ,YAAY,CAAC,KAAK,CAAC;IAC/F,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;CACrC;AAED;;GAEG;AACH,qBAAa,oBAAoB,CAChC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,eAAe,EACpC,GAAG,CAAC,SAAS,SAAS,YAAY,GAAG,YAAY,CAChD,YAAW,YAAY,CAAC,KAAK,CAAC;aAKd,QAAQ,EAAE,SAAS;aACnB,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,cAAc,EAAE,cAAc;aAC9B,eAAe,EAAE,QAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAP5B,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAEnC,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,EAC7B,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,QAAQ,EACxB,SAAS,CAAC,SAAQ,IAAI,aAAA;IAajC,CAAC,aAAa,CAAC,IAAI,IAAI;IAKvB,IAAI,IAAI,oBAAoB,CAAC,KAAK,EAAE,YAAY,GAAG,iBAAiB,CAAC;CAS5E;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,2DAAoD,CAAC"}

package/dist/shared-tree/treeView.js.map

@@ -1 +1 @@
-{"version":3,"file":"treeView.js","sourceRoot":"","sources":["../../src/shared-tree/treeView.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,4DAQuC;AACvC,+CAA8D;AAkD9D;;GAEG;AACH,MAAa,oBAAoB;IAOhC,YACiB,QAAmB,EACnB,MAA6B,EAC7B,cAA8B,EAC9B,eAAyB,EACxB,SAAsB;QAJvB,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAuB;QAC7B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAU;QACxB,cAAS,GAAT,SAAS,CAAa;QAEvC,IAAI,CAAC,OAAO,GAAG,IAAA,yBAAc,EAC5B,MAAM,EACN,IAAI,CAAC,QAAQ,CAAC,MAAM,EACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,EACpB,cAAc,EACd,eAAe,CACf,CAAC;QACF,yBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAiC,CAAC;IAChE,CAAC;IAEM,CAAC,wBAAa,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,wBAAa,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;IACpB,CAAC;IAEM,IAAI;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,IAAI,oBAAoB,CAC9B,MAAM,EACN,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,eAAe,CACpB,CAAC;IACH,CAAC;CACD;AAvCD,oDAuCC;AAED;;;GAGG;AACU,QAAA,iBAAiB,GAAG,IAAI,OAAO,EAAsC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldKey } from \"../core/index.js\";\nimport {\n\tFlexFieldSchema,\n\tFlexTreeSchema,\n\tFlexTreeTypedField,\n\tFlexTreeContext,\n\tNodeKeyManager,\n\tgetTreeContext,\n\tContext,\n} from \"../feature-libraries/index.js\";\nimport { IDisposable, disposeSymbol } from \"../util/index.js\";\nimport { ITreeCheckoutFork, ITreeCheckout, TreeCheckout } from \"./treeCheckout.js\";\n\n/**\n * An editable view of a (version control style) branch of a shared tree.\n * @privateRemarks\n * TODO:\n * 1. Once ISharedTreeView is renamed this can become ISharedTreeView.\n * 2. This object should be combined with or accessible from the TreeContext to allow easy access to thinks like branching.\n * @internal\n */\nexport interface FlexTreeView<in out TRoot extends FlexFieldSchema> extends IDisposable {\n\t/**\n\t * Context for controlling the EditableTree nodes produced from {@link FlexTreeView.flexTree}.\n\t *\n\t * @remarks\n\t * This is an owning reference: disposing of this view disposes its context.\n\t */\n\treadonly context: FlexTreeContext;\n\n\t/**\n\t * Access non-view schema specific aspects of of this branch.\n\t *\n\t * @remarks\n\t * This is a non-owning reference: disposing of this view does not impact the branch.\n\t */\n\treadonly checkout: ITreeCheckout;\n\n\t/**\n\t * Get a typed view of the tree content using the editable-tree-2 API.\n\t */\n\treadonly flexTree: FlexTreeTypedField<TRoot>;\n\n\t/**\n\t * Spawn a new view which is based off of the current state of this view.\n\t * Any mutations of the new view will not apply to this view until the new view is merged back into this view via `merge()`.\n\t */\n\tfork(): ITreeViewFork<TRoot>;\n}\n\n/**\n * Branch (like in a version control system) of SharedTree.\n *\n * {@link FlexTreeView} that has forked off of the main trunk/branch.\n * @internal\n */\nexport interface ITreeViewFork<in out TRoot extends FlexFieldSchema> extends FlexTreeView<TRoot> {\n\treadonly checkout: ITreeCheckoutFork;\n}\n\n/**\n * Implementation of FlexTreeView wrapping a ITreeCheckout.\n */\nexport class CheckoutFlexTreeView<\n\tin out TRoot extends FlexFieldSchema,\n\tout TCheckout extends TreeCheckout = TreeCheckout,\n> implements FlexTreeView<TRoot>\n{\n\tpublic readonly context: Context;\n\tpublic readonly flexTree: FlexTreeTypedField<TRoot>;\n\tpublic constructor(\n\t\tpublic readonly checkout: TCheckout,\n\t\tpublic readonly schema: FlexTreeSchema<TRoot>,\n\t\tpublic readonly nodeKeyManager: NodeKeyManager,\n\t\tpublic readonly nodeKeyFieldKey: FieldKey,\n\t\tprivate readonly onDispose?: () => void,\n\t) {\n\t\tthis.context = getTreeContext(\n\t\t\tschema,\n\t\t\tthis.checkout.forest,\n\t\t\tthis.checkout.editor,\n\t\t\tnodeKeyManager,\n\t\t\tnodeKeyFieldKey,\n\t\t);\n\t\tcontextToTreeView.set(this.context, this);\n\t\tthis.flexTree = this.context.root as FlexTreeTypedField<TRoot>;\n\t}\n\n\tpublic [disposeSymbol](): void {\n\t\tthis.context[disposeSymbol]();\n\t\tthis.onDispose?.();\n\t}\n\n\tpublic fork(): CheckoutFlexTreeView<TRoot, TreeCheckout & ITreeCheckoutFork> {\n\t\tconst branch = this.checkout.fork();\n\t\treturn new CheckoutFlexTreeView(\n\t\t\tbranch,\n\t\t\tthis.schema,\n\t\t\tthis.nodeKeyManager,\n\t\t\tthis.nodeKeyFieldKey,\n\t\t);\n\t}\n}\n\n/**\n * Maps the context of every {@link CheckoutFlexTreeView} to the view.\n * In practice, this allows the view or checkout to be obtained from a flex node by first getting the context from the flex node and then using this map.\n */\nexport const contextToTreeView = new WeakMap<Context, CheckoutFlexTreeView<any>>();\n"]}
+{"version":3,"file":"treeView.js","sourceRoot":"","sources":["../../src/shared-tree/treeView.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,4DAQuC;AACvC,+CAA8D;AAmD9D;;GAEG;AACH,MAAa,oBAAoB;IAOhC,YACiB,QAAmB,EACnB,MAA6B,EAC7B,cAA8B,EAC9B,eAAyB,EACxB,SAAsB;QAJvB,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAuB;QAC7B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAU;QACxB,cAAS,GAAT,SAAS,CAAa;QAEvC,IAAI,CAAC,OAAO,GAAG,IAAA,yBAAc,EAC5B,MAAM,EACN,IAAI,CAAC,QAAQ,CAAC,MAAM,EACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,EACpB,cAAc,EACd,eAAe,CACf,CAAC;QACF,yBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAiC,CAAC;IAChE,CAAC;IAEM,CAAC,wBAAa,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,wBAAa,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;IACpB,CAAC;IAEM,IAAI;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,IAAI,oBAAoB,CAC9B,MAAM,EACN,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,eAAe,CACpB,CAAC;IACH,CAAC;CACD;AAvCD,oDAuCC;AAED;;;GAGG;AACU,QAAA,iBAAiB,GAAG,IAAI,OAAO,EAAsC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldKey } from \"../core/index.js\";\nimport {\n\tContext,\n\tFlexFieldSchema,\n\tFlexTreeContext,\n\tFlexTreeSchema,\n\tFlexTreeTypedField,\n\tNodeKeyManager,\n\tgetTreeContext,\n} from \"../feature-libraries/index.js\";\nimport { IDisposable, disposeSymbol } from \"../util/index.js\";\n\nimport { ITreeCheckout, ITreeCheckoutFork, TreeCheckout } from \"./treeCheckout.js\";\n\n/**\n * An editable view of a (version control style) branch of a shared tree.\n * @privateRemarks\n * TODO:\n * 1. Once ISharedTreeView is renamed this can become ISharedTreeView.\n * 2. This object should be combined with or accessible from the TreeContext to allow easy access to thinks like branching.\n * @internal\n */\nexport interface FlexTreeView<in out TRoot extends FlexFieldSchema> extends IDisposable {\n\t/**\n\t * Context for controlling the FlexTree nodes produced from {@link FlexTreeView.flexTree}.\n\t *\n\t * @remarks\n\t * This is an owning reference: disposing of this view disposes its context.\n\t */\n\treadonly context: FlexTreeContext;\n\n\t/**\n\t * Access non-view schema specific aspects of of this branch.\n\t *\n\t * @remarks\n\t * This is a non-owning reference: disposing of this view does not impact the branch.\n\t */\n\treadonly checkout: ITreeCheckout;\n\n\t/**\n\t * Get a typed view of the tree content using the editable-tree-2 API.\n\t */\n\treadonly flexTree: FlexTreeTypedField<TRoot>;\n\n\t/**\n\t * Spawn a new view which is based off of the current state of this view.\n\t * Any mutations of the new view will not apply to this view until the new view is merged back into this view via `merge()`.\n\t */\n\tfork(): ITreeViewFork<TRoot>;\n}\n\n/**\n * Branch (like in a version control system) of SharedTree.\n *\n * {@link FlexTreeView} that has forked off of the main trunk/branch.\n * @internal\n */\nexport interface ITreeViewFork<in out TRoot extends FlexFieldSchema> extends FlexTreeView<TRoot> {\n\treadonly checkout: ITreeCheckoutFork;\n}\n\n/**\n * Implementation of FlexTreeView wrapping a ITreeCheckout.\n */\nexport class CheckoutFlexTreeView<\n\tin out TRoot extends FlexFieldSchema,\n\tout TCheckout extends TreeCheckout = TreeCheckout,\n> implements FlexTreeView<TRoot>\n{\n\tpublic readonly context: Context;\n\tpublic readonly flexTree: FlexTreeTypedField<TRoot>;\n\tpublic constructor(\n\t\tpublic readonly checkout: TCheckout,\n\t\tpublic readonly schema: FlexTreeSchema<TRoot>,\n\t\tpublic readonly nodeKeyManager: NodeKeyManager,\n\t\tpublic readonly nodeKeyFieldKey: FieldKey,\n\t\tprivate readonly onDispose?: () => void,\n\t) {\n\t\tthis.context = getTreeContext(\n\t\t\tschema,\n\t\t\tthis.checkout.forest,\n\t\t\tthis.checkout.editor,\n\t\t\tnodeKeyManager,\n\t\t\tnodeKeyFieldKey,\n\t\t);\n\t\tcontextToTreeView.set(this.context, this);\n\t\tthis.flexTree = this.context.root as FlexTreeTypedField<TRoot>;\n\t}\n\n\tpublic [disposeSymbol](): void {\n\t\tthis.context[disposeSymbol]();\n\t\tthis.onDispose?.();\n\t}\n\n\tpublic fork(): CheckoutFlexTreeView<TRoot, TreeCheckout & ITreeCheckoutFork> {\n\t\tconst branch = this.checkout.fork();\n\t\treturn new CheckoutFlexTreeView(\n\t\t\tbranch,\n\t\t\tthis.schema,\n\t\t\tthis.nodeKeyManager,\n\t\t\tthis.nodeKeyFieldKey,\n\t\t);\n\t}\n}\n\n/**\n * Maps the context of every {@link CheckoutFlexTreeView} to the view.\n * In practice, this allows the view or checkout to be obtained from a flex node by first getting the context from the flex node and then using this map.\n */\nexport const contextToTreeView = new WeakMap<Context, CheckoutFlexTreeView<any>>();\n"]}

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

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ChangeFamily, ChangeFamilyEditor, GraphCommit, TaggedChange, RevisionTag, Revertible, BranchRebaseResult } from "../core/index.js";
+import { BranchRebaseResult, ChangeFamily, ChangeFamilyEditor, CommitKind, CommitMetadata, GraphCommit, RevisionTag, TaggedChange } from "../core/index.js";
 import { EventEmitter, ISubscribable } from "../events/index.js";
 /**
  * Describes a change to a `SharedTreeBranch`. Various operations can mutate the head of the branch;
@@ -54,17 +54,9 @@ export interface SharedTreeBranchEvents<TEditor extends ChangeFamilyEditor, TCha
      */
     afterChange(change: SharedTreeBranchChange<TChange>): void;
     /**
-     * Fired when a revertible change is made to this branch.
+     * {@inheritdoc TreeViewEvents.commitApplied}
      */
-    newRevertible(revertible: Revertible): void;
-    /**
-     * Fired when a revertible made on this branch is disposed.
-     *
-     * @param revertible - The revertible that was disposed.
-     * This revertible was previously passed to the `newRevertible` event.
-     * @param revision - The revision associated with the revertible that was disposed.
-     */
-    revertibleDisposed(revertible: Revertible, revision: RevisionTag): void;
+    commitApplied(data: CommitMetadata): void;
     /**
      * Fired when this branch forks
      * @param fork - the new branch that forked off of this branch
@@ -83,8 +75,6 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
     readonly changeFamily: ChangeFamily<TEditor, TChange>;
     private readonly mintRevisionTag;
     readonly editor: TEditor;
-    private readonly revertibles;
-    private readonly _revertibleCommits;
     private readonly transactions;
     /**
      * After pushing a starting revision to the transaction stack, this branch might be rebased
@@ -124,10 +114,10 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
      * Apply a change to this branch.
      * @param change - the change to apply
      * @param revision - the revision of the new head commit of the branch that contains `change`
+     * @param changeKind - the kind of change to apply
      * @returns the change that was applied and the new head commit of the branch
      */
-    apply(change: TChange, revision: RevisionTag): [change: TChange, newCommit: GraphCommit<TChange>];
-    private applyChange;
+    apply(change: TChange, revision: RevisionTag, changeKind?: CommitKind): [change: TChange, newCommit: GraphCommit<TChange>];
     /**
      * @returns the commit at the head of this branch.
      */
@@ -161,16 +151,6 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
      */
     isTransacting(): boolean;
     private popTransaction;
-    revertibleCommits(): IterableIterator<RevisionTag>;
-    purgeRevertibles(): void;
-    /**
-     * Associate a revertible with a new commit of the same revision.
-     * This is applicable when a commit is replaced by a rebase or a local commit is sequenced.
-     */
-    updateRevertibleCommit(commit: GraphCommit<TChange>): void;
-    private emitNewRevertible;
-    private disposeRevertible;
-    private revertRevertible;
     /**
      * Spawn a new branch that is based off of the current state of this branch.
      * Changes made to the new branch will not be applied to this branch until the new branch is merged back in.
@@ -182,10 +162,6 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
      * Rebase the changes that have been applied to this branch over divergent changes in the given branch.
      * After this operation completes, this branch will be based off of `branch`.
      *
-     * @remarks
-     * This operation can change the relative ordering between revertible commits therefore, the revertible event
-     * is not emitted during this operation.
-     *
      * @param branch - the branch to rebase onto
      * @param upTo - the furthest commit on `branch` over which to rebase (inclusive). Defaults to the head commit of `branch`.
      * @returns the result of the rebase or undefined if nothing changed
@@ -194,9 +170,6 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
     /**
      * Apply all the divergent changes on the given branch to this branch.
      *
-     * @remarks
-     * Revertible events are emitted for new local commits merged into this branch.
-     *
      * @param branch - the branch to merge into this branch
      * @returns the net change to this branch and the commits that were added to this branch by the merge,
      * or undefined if nothing changed

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

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/branch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/branch.ts"],"names":[],"mappings":"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"}

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

@@ -5,7 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onForkTransitive = exports.SharedTreeBranch = exports.getChangeReplaceType = void 0;
-const core_utils_1 = require("@fluidframework/core-utils");
+const internal_1 = require("@fluidframework/core-utils/internal");
 const index_js_1 = require("../core/index.js");
 const index_js_2 = require("../events/index.js");
 const transactionStack_js_1 = require("./transactionStack.js");
@@ -47,9 +47,6 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         this.head = head;
         this.changeFamily = changeFamily;
         this.mintRevisionTag = mintRevisionTag;
-        // set of revertibles maintained for automatic disposal
-        this.revertibles = new Set();
-        this._revertibleCommits = new Map();
         this.transactions = new transactionStack_js_1.TransactionStack();
         /**
          * After pushing a starting revision to the transaction stack, this branch might be rebased
@@ -82,19 +79,17 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
      */
     setHead(head) {
         this.assertNotDisposed();
-        (0, core_utils_1.assert)(!this.isTransacting(), 0x685 /* Cannot set head during a transaction */);
+        (0, internal_1.assert)(!this.isTransacting(), 0x685 /* Cannot set head during a transaction */);
         this.head = head;
     }
     /**
      * Apply a change to this branch.
      * @param change - the change to apply
      * @param revision - the revision of the new head commit of the branch that contains `change`
+     * @param changeKind - the kind of change to apply
      * @returns the change that was applied and the new head commit of the branch
      */
-    apply(change, revision) {
-        return this.applyChange(change, revision, index_js_1.RevertibleKind.Default);
-    }
-    applyChange(change, revision, revertibleKind) {
+    apply(change, revision, changeKind = index_js_1.CommitKind.Default) {
         this.assertNotDisposed();
         const newHead = (0, index_js_1.mintCommit)(this.head, {
             revision,
@@ -107,9 +102,9 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         };
         this.emit("beforeChange", changeEvent);
         this.head = newHead;
-        // If this is not part of a transaction, emit a revertible event
+        // If this is not part of a transaction, emit a commitApplied event
         if (!this.isTransacting()) {
-            this.emitNewRevertible(newHead, revertibleKind);
+            this.emit("commitApplied", { isLocal: true, kind: changeKind });
         }
         this.emit("afterChange", changeEvent);
         return [change, newHead];
@@ -172,9 +167,9 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         };
         this.emit("beforeChange", changeEvent);
         this.head = newHead;
-        // If this transaction is not nested, emit a revertible event
+        // If this transaction is not nested, emit a commitApplied event
         if (!this.isTransacting()) {
-            this.emitNewRevertible(newHead, index_js_1.RevertibleKind.Default);
+            this.emit("commitApplied", { isLocal: true, kind: index_js_1.CommitKind.Default });
         }
         this.emit("afterChange", changeEvent);
         return [commits, newHead];
@@ -226,62 +221,9 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         }
         const commits = [];
         const startCommit = (0, index_js_1.findAncestor)([this.head, commits], (c) => c.revision === startRevision);
-        (0, core_utils_1.assert)(startCommit !== undefined, 0x593 /* Expected branch to be ahead of transaction start revision */);
+        (0, internal_1.assert)(startCommit !== undefined, 0x593 /* Expected branch to be ahead of transaction start revision */);
         return [startCommit, commits];
     }
-    revertibleCommits() {
-        return this._revertibleCommits.keys();
-    }
-    purgeRevertibles() {
-        for (const revertible of this.revertibles) {
-            revertible.dispose();
-        }
-    }
-    /**
-     * Associate a revertible with a new commit of the same revision.
-     * This is applicable when a commit is replaced by a rebase or a local commit is sequenced.
-     */
-    updateRevertibleCommit(commit) {
-        if (this._revertibleCommits.get(commit.revision) !== undefined) {
-            this._revertibleCommits.set(commit.revision, commit);
-        }
-    }
-    emitNewRevertible(commit, kind) {
-        if (!this.hasListeners("newRevertible")) {
-            // No point generating revertibles if no one cares about them
-            return;
-        }
-        const revertible = new RevertibleRevision(kind, commit.revision, this.revertRevertible.bind(this), this.disposeRevertible.bind(this));
-        this._revertibleCommits.set(commit.revision, commit);
-        this.revertibles.add(revertible);
-        this.emit("newRevertible", revertible);
-        // Decrements the ref count for the revertible.
-        // This ensures that the revertible is disposed if no listener has retained it.
-        revertible.discard();
-    }
-    disposeRevertible(revertible) {
-        // TODO: delete the repair data from the forest
-        this._revertibleCommits.delete(revertible.revision);
-        this.revertibles.delete(revertible);
-        this.emit("revertibleDisposed", revertible, revertible.revision);
-    }
-    revertRevertible(revertible) {
-        (0, core_utils_1.assert)(!this.isTransacting(), 0x7cb /* Undo is not yet supported during transactions */);
-        const commit = this._revertibleCommits.get(revertible.revision);
-        (0, core_utils_1.assert)(commit !== undefined, 0x7cc /* expected to find a revertible commit */);
-        let change = this.changeFamily.rebaser.invert((0, index_js_1.tagChange)(commit.change, revertible.revision), false);
-        const headCommit = this.getHead();
-        // Rebase the inverted change onto any commits that occurred after the undoable commits.
-        if (revertible.revision !== headCommit.revision) {
-            const pathAfterUndoable = [];
-            const ancestor = (0, index_js_1.findCommonAncestor)([commit], [headCommit, pathAfterUndoable]);
-            (0, core_utils_1.assert)(ancestor === commit, 0x677 /* The head commit should be based off the undoable commit. */);
-            change = (0, index_js_1.rebaseChangeOverChanges)(this.changeFamily.rebaser, change, pathAfterUndoable);
-        }
-        this.applyChange(change, this.mintRevisionTag(), revertible.kind === index_js_1.RevertibleKind.Default || revertible.kind === index_js_1.RevertibleKind.Redo
-            ? index_js_1.RevertibleKind.Undo
-            : index_js_1.RevertibleKind.Redo);
-    }
     /**
      * Spawn a new branch that is based off of the current state of this branch.
      * Changes made to the new branch will not be applied to this branch until the new branch is merged back in.
@@ -298,10 +240,6 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
      * Rebase the changes that have been applied to this branch over divergent changes in the given branch.
      * After this operation completes, this branch will be based off of `branch`.
      *
-     * @remarks
-     * This operation can change the relative ordering between revertible commits therefore, the revertible event
-     * is not emitted during this operation.
-     *
      * @param branch - the branch to rebase onto
      * @param upTo - the furthest commit on `branch` over which to rebase (inclusive). Defaults to the head commit of `branch`.
      * @returns the result of the rebase or undefined if nothing changed
@@ -316,17 +254,10 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         // The net change to this branch is provided by the `rebaseBranch` API
         const { newSourceHead, commits } = rebaseResult;
         const { deletedSourceCommits, targetCommits, sourceCommits } = commits;
-        // It's possible that the target branch already contained some of the commits that
-        // were on this branch. When that's the case, we adopt the commit objects from the target branch.
-        // Because of that, we need to make sure that any revertibles that were based on the old commit objects
-        // now point to the new object that were adopted from the target branch.
-        for (const targetCommit of targetCommits) {
-            this.updateRevertibleCommit(targetCommit);
-        }
         const newCommits = targetCommits.concat(sourceCommits);
         if (this.isTransacting()) {
             const src = targetCommits[0].parent?.revision;
-            const dst = targetCommits.at(-1)?.revision;
+            const dst = targetCommits[targetCommits.length - 1].revision;
             if (src !== undefined && dst !== undefined) {
                 this.initialTransactionRevToRebasedRev.set(src, dst);
             }
@@ -342,19 +273,12 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         };
         this.emit("beforeChange", changeEvent);
         this.head = newSourceHead;
-        // update revertible commits that have been rebased
-        sourceCommits.forEach((commit) => {
-            this.updateRevertibleCommit(commit);
-        });
         this.emit("afterChange", changeEvent);
         return rebaseResult;
     }
     /**
      * Apply all the divergent changes on the given branch to this branch.
      *
-     * @remarks
-     * Revertible events are emitted for new local commits merged into this branch.
-     *
      * @param branch - the branch to merge into this branch
      * @returns the net change to this branch and the commits that were added to this branch by the merge,
      * or undefined if nothing changed
@@ -362,7 +286,7 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
     merge(branch) {
         this.assertNotDisposed();
         branch.assertNotDisposed();
-        (0, core_utils_1.assert)(!branch.isTransacting(), 0x597 /* Branch may not be merged while transaction is in progress */);
+        (0, internal_1.assert)(!branch.isTransacting(), 0x597 /* Branch may not be merged while transaction is in progress */);
         // Rebase the given branch onto this branch
         const rebaseResult = this.rebaseBranch(branch, this);
         if (rebaseResult === undefined) {
@@ -411,12 +335,11 @@ class SharedTreeBranch extends index_js_2.EventEmitter {
         while (this.isTransacting()) {
             this.abortTransaction();
         }
-        this.revertibles.forEach((revertible) => revertible.dispose());
         this.disposed = true;
         this.emit("dispose");
     }
     assertNotDisposed() {
-        (0, core_utils_1.assert)(!this.disposed, 0x66e /* Branch is disposed */);
+        (0, internal_1.assert)(!this.disposed, 0x66e /* Branch is disposed */);
     }
 }
 exports.SharedTreeBranch = SharedTreeBranch;
@@ -437,57 +360,4 @@ function onForkTransitive(forkable, onFork) {
     return () => offs.forEach((off) => off());
 }
 exports.onForkTransitive = onForkTransitive;
-class RevertibleRevision {
-    constructor(kind, revision, onRevert, onDispose) {
-        this.kind = kind;
-        this.revision = revision;
-        this.onRevert = onRevert;
-        this.onDispose = onDispose;
-        this.referenceCount = 1;
-        this.kind = kind;
-        this.revision = revision;
-        // This is currently always the case, but we may want to support reverting remote ops
-        this.origin = { isLocal: true };
-    }
-    get status() {
-        return this.referenceCount === 0 ? index_js_1.RevertibleStatus.Disposed : index_js_1.RevertibleStatus.Valid;
-    }
-    revert() {
-        if (this.status === index_js_1.RevertibleStatus.Valid) {
-            this.onRevert(this);
-            // If reverting leads to a schema change then the revertible will be disposed as part of the revert.
-            this.dispose(false);
-            return index_js_1.RevertibleResult.Success;
-        }
-        return index_js_1.RevertibleResult.Failure;
-    }
-    retain() {
-        if (this.status === index_js_1.RevertibleStatus.Valid) {
-            this.referenceCount += 1;
-            return index_js_1.RevertibleResult.Success;
-        }
-        return index_js_1.RevertibleResult.Failure;
-    }
-    discard() {
-        if (this.status === index_js_1.RevertibleStatus.Valid) {
-            if (this.referenceCount === 1) {
-                this.dispose();
-            }
-            else {
-                this.referenceCount -= 1;
-            }
-            return index_js_1.RevertibleResult.Success;
-        }
-        return index_js_1.RevertibleResult.Failure;
-    }
-    dispose(validateStatus = true) {
-        if (this.status === index_js_1.RevertibleStatus.Valid) {
-            this.referenceCount = 0;
-            this.onDispose(this);
-        }
-        else {
-            (0, core_utils_1.assert)(validateStatus === false, 0x8c6 /* Cannot dispose already disposed revertible */);
-        }
-    }
-}
 //# sourceMappingURL=branch.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/shared-tree-core/branch.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 } from \"@fluidframework/core-utils\";\nimport {\n\tChangeFamily,\n\tChangeFamilyEditor,\n\tfindAncestor,\n\tGraphCommit,\n\tmintCommit,\n\ttagChange,\n\tTaggedChange,\n\trebaseBranch,\n\tRevisionTag,\n\tfindCommonAncestor,\n\tmakeAnonChange,\n\tRevertible,\n\tRevertibleKind,\n\tRevertibleResult,\n\tRevertibleStatus,\n\tBranchRebaseResult,\n\trebaseChangeOverChanges,\n\ttagRollbackInverse,\n} from \"../core/index.js\";\nimport { EventEmitter, ISubscribable } from \"../events/index.js\";\nimport { TransactionStack } from \"./transactionStack.js\";\n\n/**\n * Describes a change to a `SharedTreeBranch`. Various operations can mutate the head of the branch;\n * this change format describes each in terms of the \"removed commits\" (all commits which were present\n * on the branch before the operation but are no longer present after) and the \"new commits\" (all\n * commits which are present on the branch after the operation that were not present before). Each of\n * the following event types also provides a `change` which contains the net change to the branch\n * (or is undefined if there was no net change):\n * * Append - when one or more commits are appended to the head of the branch, for example via\n * a change applied by the branch's editor, or as a result of merging another branch into this one\n * * Remove - when one or more commits are removed from the head of the branch. This occurs\n * when a transaction is aborted and all commits pending in that transaction are removed.\n * * Replace - when an operation simultaneously removes and appends commits. For example, when this\n * branch is rebased and some commits are removed and replaced with rebased versions, or when a\n * transaction completes and all pending commits are replaced with a single squash commit.\n */\nexport type SharedTreeBranchChange<TChange> =\n\t| {\n\t\t\ttype: \"append\";\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\tnewCommits: readonly GraphCommit<TChange>[];\n\t  }\n\t| {\n\t\t\ttype: \"remove\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t\t\tremovedCommits: readonly GraphCommit<TChange>[];\n\t  }\n\t| {\n\t\t\ttype: \"replace\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t\t\tremovedCommits: readonly GraphCommit<TChange>[];\n\t\t\tnewCommits: readonly GraphCommit<TChange>[];\n\t  };\n\n/**\n * Returns the operation that caused the given {@link SharedTreeBranchChange}.\n */\nexport function getChangeReplaceType(\n\tchange: SharedTreeBranchChange<unknown> & { type: \"replace\" },\n): \"transactionCommit\" | \"rebase\" {\n\t// The \"replace\" variant of the change event is emitted by two operations: committing a transaction and doing a rebase.\n\t// Committing a transaction will always remove one or more commits (the commits that were squashed),\n\t// and will add exactly one new commit (the squash commit).\n\tif (change.removedCommits.length === 0 || change.newCommits.length !== 1) {\n\t\treturn \"rebase\";\n\t}\n\n\t// There is only one case in which a rebase both removes commits and adds exactly one new commit.\n\t// This occurs when there is exactly one divergent, but equivalent, commit on each branch:\n\t//\n\t// A ─ B (branch X)\t  -- rebase Y onto X -->   A ─ B (branch X)\n\t// └─ B' (branch Y)                                └─ (branch Y)\n\t//\n\t// B' is removed and replaced by B because both have the same revision.\n\tif (\n\t\tchange.removedCommits.length === 1 &&\n\t\tchange.removedCommits[0].revision === change.newCommits[0].revision\n\t) {\n\t\treturn \"rebase\";\n\t}\n\n\treturn \"transactionCommit\";\n}\n\n/**\n * The events emitted by a `SharedTreeBranch`\n */\nexport interface SharedTreeBranchEvents<TEditor extends ChangeFamilyEditor, TChange> {\n\t/**\n\t * Fired just before the head of this branch changes.\n\t * @param change - the change to this branch's state and commits\n\t */\n\tbeforeChange(change: SharedTreeBranchChange<TChange>): void;\n\n\t/**\n\t * Fired just after the head of this branch changes.\n\t * @param change - the change to this branch's state and commits\n\t */\n\tafterChange(change: SharedTreeBranchChange<TChange>): void;\n\n\t/**\n\t * Fired when a revertible change is made to this branch.\n\t */\n\tnewRevertible(revertible: Revertible): void;\n\n\t/**\n\t * Fired when a revertible made on this branch is disposed.\n\t *\n\t * @param revertible - The revertible that was disposed.\n\t * This revertible was previously passed to the `newRevertible` event.\n\t * @param revision - The revision associated with the revertible that was disposed.\n\t */\n\trevertibleDisposed(revertible: Revertible, revision: RevisionTag): void;\n\n\t/**\n\t * Fired when this branch forks\n\t * @param fork - the new branch that forked off of this branch\n\t */\n\tfork(fork: SharedTreeBranch<TEditor, TChange>): void;\n\n\t/**\n\t * Fired after this branch is disposed\n\t */\n\tdispose(): void;\n}\n\n/**\n * A branch of changes that can be applied to a SharedTree.\n */\nexport class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> extends EventEmitter<\n\tSharedTreeBranchEvents<TEditor, TChange>\n> {\n\tpublic readonly editor: TEditor;\n\t// set of revertibles maintained for automatic disposal\n\tprivate readonly revertibles = new Set<RevertibleRevision>();\n\tprivate readonly _revertibleCommits = new Map<RevisionTag, GraphCommit<TChange>>();\n\tprivate readonly transactions = new TransactionStack();\n\t/**\n\t * After pushing a starting revision to the transaction stack, this branch might be rebased\n\t * over commits which are children of that starting revision. When the transaction is committed,\n\t * those rebased-over commits should not be included in the transaction's squash commit, even though\n\t * they exist between the starting revision and the final commit within the transaction.\n\t *\n\t * Whenever `rebaseOnto` is called during a transaction, this map is augmented with an entry from the\n\t * original merge-base to the new merge-base.\n\t *\n\t * This state need only be retained for the lifetime of the transaction.\n\t *\n\t * TODO: This strategy might need to be revisited when adding better support for async transactions.\n\t * Since:\n\t *\n\t * 1. Transactionality is guaranteed primarily by squashing at commit time\n\t * 2. Branches may be rebased with an ongoing transaction\n\t *\n\t * a rebase operation might invalidate only a portion of a transaction's commits, thus defeating the\n\t * purpose of transactionality.\n\t *\n\t * AB#6483 and children items track this work.\n\t */\n\tprivate readonly initialTransactionRevToRebasedRev = new Map<RevisionTag, RevisionTag>();\n\tprivate disposed = false;\n\t/**\n\t * Construct a new branch.\n\t * @param head - the head of the branch\n\t * @param changeFamily - determines the set of changes that this branch can commit\n\t */\n\tpublic constructor(\n\t\tprivate head: GraphCommit<TChange>,\n\t\tpublic readonly changeFamily: ChangeFamily<TEditor, TChange>,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t) {\n\t\tsuper();\n\t\tthis.editor = this.changeFamily.buildEditor((change) =>\n\t\t\tthis.apply(change, mintRevisionTag()),\n\t\t);\n\t}\n\n\t/**\n\t * Sets the head of this branch. Emits no change events.\n\t */\n\tpublic setHead(head: GraphCommit<TChange>): void {\n\t\tthis.assertNotDisposed();\n\t\tassert(!this.isTransacting(), 0x685 /* Cannot set head during a transaction */);\n\t\tthis.head = head;\n\t}\n\n\t/**\n\t * Apply a change to this branch.\n\t * @param change - the change to apply\n\t * @param revision - the revision of the new head commit of the branch that contains `change`\n\t * @returns the change that was applied and the new head commit of the branch\n\t */\n\tpublic apply(\n\t\tchange: TChange,\n\t\trevision: RevisionTag,\n\t): [change: TChange, newCommit: GraphCommit<TChange>] {\n\t\treturn this.applyChange(change, revision, RevertibleKind.Default);\n\t}\n\n\tprivate applyChange(\n\t\tchange: TChange,\n\t\trevision: RevisionTag,\n\t\trevertibleKind: RevertibleKind,\n\t): [change: TChange, newCommit: GraphCommit<TChange>] {\n\t\tthis.assertNotDisposed();\n\n\t\tconst newHead = mintCommit(this.head, {\n\t\t\trevision,\n\t\t\tchange,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tchange: tagChange(change, revision),\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\n\t\t// If this is not part of a transaction, emit a revertible event\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.emitNewRevertible(newHead, revertibleKind);\n\t\t}\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, newHead];\n\t}\n\n\t/**\n\t * @returns the commit at the head of this branch.\n\t */\n\tpublic getHead(): GraphCommit<TChange> {\n\t\treturn this.head;\n\t}\n\n\t/**\n\t * Begin a transaction on this branch. If the transaction is committed via {@link commitTransaction},\n\t * all commits made since this call will be squashed into a single head commit.\n\t * @param repairStore - the repair store associated with this transaction\n\t */\n\tpublic startTransaction(): void {\n\t\tthis.assertNotDisposed();\n\t\tconst forks = new Set<SharedTreeBranch<TEditor, TChange>>();\n\t\tconst onDisposeUnSubscribes: (() => void)[] = [];\n\t\tconst onForkUnSubscribe = onForkTransitive(this, (fork) => {\n\t\t\tforks.add(fork);\n\t\t\tonDisposeUnSubscribes.push(fork.on(\"dispose\", () => forks.delete(fork)));\n\t\t});\n\t\tthis.transactions.push(this.head.revision, () => {\n\t\t\tforks.forEach((fork) => fork.dispose());\n\t\t\tonDisposeUnSubscribes.forEach((unsubscribe) => unsubscribe());\n\t\t\tonForkUnSubscribe();\n\t\t});\n\t\tthis.editor.enterTransaction();\n\t}\n\n\t/**\n\t * Commit the current transaction. There must be a transaction in progress that was begun via {@link startTransaction}.\n\t * If there are commits in the current transaction, they will be squashed into a new single head commit.\n\t * @returns the commits that were squashed and the new squash commit if a squash occurred, otherwise `undefined`.\n\t * @remarks If the transaction had no changes applied during its lifetime, then no squash occurs (i.e. this method is a no-op).\n\t * Even if the transaction contained only one change, it will still be replaced with an (equivalent) squash change.\n\t */\n\tpublic commitTransaction():\n\t\t| [squashedCommits: GraphCommit<TChange>[], newCommit: GraphCommit<TChange>]\n\t\t| undefined {\n\t\tthis.assertNotDisposed();\n\t\tconst [startCommit, commits] = this.popTransaction();\n\t\tthis.editor.exitTransaction();\n\n\t\tif (commits.length === 0) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// Anonymize the commits from this transaction by stripping their revision tags.\n\t\t// Otherwise, the change rebaser will record their tags and those tags no longer exist.\n\t\tconst anonymousCommits = commits.map(({ change }) => ({ change, revision: undefined }));\n\t\t// Squash the changes and make the squash commit the new head of this branch\n\t\tconst squashedChange = this.changeFamily.rebaser.compose(anonymousCommits);\n\t\tconst revision = this.mintRevisionTag();\n\n\t\tconst newHead = mintCommit(startCommit, {\n\t\t\trevision,\n\t\t\tchange: squashedChange,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"replace\",\n\t\t\tchange: undefined,\n\t\t\tremovedCommits: commits,\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\n\t\t// If this transaction is not nested, emit a revertible event\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.emitNewRevertible(newHead, RevertibleKind.Default);\n\t\t}\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [commits, newHead];\n\t}\n\n\t/**\n\t * Cancel the current transaction. There must be a transaction in progress that was begun via\n\t * {@link startTransaction}. All commits made during the transaction will be removed.\n\t * @returns the change to this branch resulting in the removal of the commits, and a list of the\n\t * commits that were removed.\n\t */\n\tpublic abortTransaction(): [\n\t\tchange: TChange | undefined,\n\t\tabortedCommits: GraphCommit<TChange>[],\n\t] {\n\t\tthis.assertNotDisposed();\n\t\tconst [startCommit, commits] = this.popTransaction();\n\t\tthis.editor.exitTransaction();\n\n\t\tif (commits.length === 0) {\n\t\t\treturn [undefined, []];\n\t\t}\n\n\t\tconst inverses: TaggedChange<TChange>[] = [];\n\t\tfor (let i = commits.length - 1; i >= 0; i--) {\n\t\t\tconst inverse = this.changeFamily.rebaser.invert(commits[i], false);\n\t\t\tinverses.push(tagRollbackInverse(inverse, this.mintRevisionTag(), commits[i].revision));\n\t\t}\n\t\tconst change =\n\t\t\tinverses.length > 0 ? this.changeFamily.rebaser.compose(inverses) : undefined;\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"remove\",\n\t\t\tchange: change === undefined ? undefined : makeAnonChange(change),\n\t\t\tremovedCommits: commits,\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = startCommit;\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, commits];\n\t}\n\n\t/**\n\t * True iff this branch is in the middle of a transaction that was begin via {@link startTransaction}\n\t */\n\tpublic isTransacting(): boolean {\n\t\treturn this.transactions.size !== 0;\n\t}\n\n\tprivate popTransaction(): [GraphCommit<TChange>, GraphCommit<TChange>[]] {\n\t\tconst { startRevision: startRevisionOriginal } = this.transactions.pop();\n\t\tlet startRevision = startRevisionOriginal;\n\t\twhile (this.initialTransactionRevToRebasedRev.has(startRevision)) {\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\tstartRevision = this.initialTransactionRevToRebasedRev.get(startRevision)!;\n\t\t}\n\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.initialTransactionRevToRebasedRev.clear();\n\t\t}\n\n\t\tconst commits: GraphCommit<TChange>[] = [];\n\t\tconst startCommit = findAncestor([this.head, commits], (c) => c.revision === startRevision);\n\t\tassert(\n\t\t\tstartCommit !== undefined,\n\t\t\t0x593 /* Expected branch to be ahead of transaction start revision */,\n\t\t);\n\t\treturn [startCommit, commits];\n\t}\n\n\tpublic revertibleCommits(): IterableIterator<RevisionTag> {\n\t\treturn this._revertibleCommits.keys();\n\t}\n\n\tpublic purgeRevertibles(): void {\n\t\tfor (const revertible of this.revertibles) {\n\t\t\trevertible.dispose();\n\t\t}\n\t}\n\n\t/**\n\t * Associate a revertible with a new commit of the same revision.\n\t * This is applicable when a commit is replaced by a rebase or a local commit is sequenced.\n\t */\n\tpublic updateRevertibleCommit(commit: GraphCommit<TChange>) {\n\t\tif (this._revertibleCommits.get(commit.revision) !== undefined) {\n\t\t\tthis._revertibleCommits.set(commit.revision, commit);\n\t\t}\n\t}\n\n\tprivate emitNewRevertible(commit: GraphCommit<TChange>, kind: RevertibleKind): void {\n\t\tif (!this.hasListeners(\"newRevertible\")) {\n\t\t\t// No point generating revertibles if no one cares about them\n\t\t\treturn;\n\t\t}\n\t\tconst revertible = new RevertibleRevision(\n\t\t\tkind,\n\t\t\tcommit.revision,\n\t\t\tthis.revertRevertible.bind(this),\n\t\t\tthis.disposeRevertible.bind(this),\n\t\t);\n\t\tthis._revertibleCommits.set(commit.revision, commit);\n\t\tthis.revertibles.add(revertible);\n\t\tthis.emit(\"newRevertible\", revertible);\n\t\t// Decrements the ref count for the revertible.\n\t\t// This ensures that the revertible is disposed if no listener has retained it.\n\t\trevertible.discard();\n\t}\n\n\tprivate disposeRevertible(revertible: RevertibleRevision): void {\n\t\t// TODO: delete the repair data from the forest\n\t\tthis._revertibleCommits.delete(revertible.revision);\n\t\tthis.revertibles.delete(revertible);\n\t\tthis.emit(\"revertibleDisposed\", revertible, revertible.revision);\n\t}\n\n\tprivate revertRevertible(revertible: RevertibleRevision): void {\n\t\tassert(!this.isTransacting(), 0x7cb /* Undo is not yet supported during transactions */);\n\n\t\tconst commit = this._revertibleCommits.get(revertible.revision);\n\t\tassert(commit !== undefined, 0x7cc /* expected to find a revertible commit */);\n\n\t\tlet change = this.changeFamily.rebaser.invert(\n\t\t\ttagChange(commit.change, revertible.revision),\n\t\t\tfalse,\n\t\t);\n\n\t\tconst headCommit = this.getHead();\n\t\t// Rebase the inverted change onto any commits that occurred after the undoable commits.\n\t\tif (revertible.revision !== headCommit.revision) {\n\t\t\tconst pathAfterUndoable: GraphCommit<TChange>[] = [];\n\t\t\tconst ancestor = findCommonAncestor([commit], [headCommit, pathAfterUndoable]);\n\t\t\tassert(\n\t\t\t\tancestor === commit,\n\t\t\t\t0x677 /* The head commit should be based off the undoable commit. */,\n\t\t\t);\n\t\t\tchange = rebaseChangeOverChanges(this.changeFamily.rebaser, change, pathAfterUndoable);\n\t\t}\n\n\t\tthis.applyChange(\n\t\t\tchange,\n\t\t\tthis.mintRevisionTag(),\n\t\t\trevertible.kind === RevertibleKind.Default || revertible.kind === RevertibleKind.Redo\n\t\t\t\t? RevertibleKind.Undo\n\t\t\t\t: RevertibleKind.Redo,\n\t\t);\n\t}\n\n\t/**\n\t * Spawn a new branch that is based off of the current state of this branch.\n\t * Changes made to the new branch will not be applied to this branch until the new branch is merged back in.\n\t *\n\t * @remarks Forks created during a transaction will be disposed when the transaction ends.\n\t */\n\tpublic fork(): SharedTreeBranch<TEditor, TChange> {\n\t\tthis.assertNotDisposed();\n\t\tconst fork = new SharedTreeBranch(this.head, this.changeFamily, this.mintRevisionTag);\n\t\tthis.emit(\"fork\", fork);\n\t\treturn fork;\n\t}\n\n\t/**\n\t * Rebase the changes that have been applied to this branch over divergent changes in the given branch.\n\t * After this operation completes, this branch will be based off of `branch`.\n\t *\n\t * @remarks\n\t * This operation can change the relative ordering between revertible commits therefore, the revertible event\n\t * is not emitted during this operation.\n\t *\n\t * @param branch - the branch to rebase onto\n\t * @param upTo - the furthest commit on `branch` over which to rebase (inclusive). Defaults to the head commit of `branch`.\n\t * @returns the result of the rebase or undefined if nothing changed\n\t */\n\tpublic rebaseOnto(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t\tupTo = branch.getHead(),\n\t): BranchRebaseResult<TChange> | undefined {\n\t\tthis.assertNotDisposed();\n\n\t\t// Rebase this branch onto the given branch\n\t\tconst rebaseResult = this.rebaseBranch(this, branch, upTo);\n\t\tif (rebaseResult === undefined) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// The net change to this branch is provided by the `rebaseBranch` API\n\t\tconst { newSourceHead, commits } = rebaseResult;\n\t\tconst { deletedSourceCommits, targetCommits, sourceCommits } = commits;\n\n\t\t// It's possible that the target branch already contained some of the commits that\n\t\t// were on this branch. When that's the case, we adopt the commit objects from the target branch.\n\t\t// Because of that, we need to make sure that any revertibles that were based on the old commit objects\n\t\t// now point to the new object that were adopted from the target branch.\n\t\tfor (const targetCommit of targetCommits) {\n\t\t\tthis.updateRevertibleCommit(targetCommit);\n\t\t}\n\n\t\tconst newCommits = targetCommits.concat(sourceCommits);\n\t\tif (this.isTransacting()) {\n\t\t\tconst src = targetCommits[0].parent?.revision;\n\t\t\tconst dst = targetCommits.at(-1)?.revision;\n\t\t\tif (src !== undefined && dst !== undefined) {\n\t\t\t\tthis.initialTransactionRevToRebasedRev.set(src, dst);\n\t\t\t}\n\t\t}\n\t\tconst changeEvent = {\n\t\t\ttype: \"replace\",\n\t\t\tget change() {\n\t\t\t\tconst change = rebaseResult.sourceChange;\n\t\t\t\treturn change === undefined ? undefined : makeAnonChange(change);\n\t\t\t},\n\t\t\tremovedCommits: deletedSourceCommits,\n\t\t\tnewCommits,\n\t\t} as const;\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newSourceHead;\n\n\t\t// update revertible commits that have been rebased\n\t\tsourceCommits.forEach((commit) => {\n\t\t\tthis.updateRevertibleCommit(commit);\n\t\t});\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn rebaseResult;\n\t}\n\n\t/**\n\t * Apply all the divergent changes on the given branch to this branch.\n\t *\n\t * @remarks\n\t * Revertible events are emitted for new local commits merged into this branch.\n\t *\n\t * @param branch - the branch to merge into this branch\n\t * @returns the net change to this branch and the commits that were added to this branch by the merge,\n\t * or undefined if nothing changed\n\t */\n\tpublic merge(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t): [change: TChange, newCommits: GraphCommit<TChange>[]] | undefined {\n\t\tthis.assertNotDisposed();\n\t\tbranch.assertNotDisposed();\n\t\tassert(\n\t\t\t!branch.isTransacting(),\n\t\t\t0x597 /* Branch may not be merged while transaction is in progress */,\n\t\t);\n\n\t\t// Rebase the given branch onto this branch\n\t\tconst rebaseResult = this.rebaseBranch(branch, this);\n\t\tif (rebaseResult === undefined) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// Compute the net change to this branch\n\t\tconst sourceCommits = rebaseResult.commits.sourceCommits;\n\t\tconst change = this.changeFamily.rebaser.compose(sourceCommits);\n\t\tconst taggedChange = makeAnonChange(change);\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tget change(): TaggedChange<TChange> {\n\t\t\t\treturn taggedChange;\n\t\t\t},\n\t\t\tnewCommits: sourceCommits,\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = rebaseResult.newSourceHead;\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, sourceCommits];\n\t}\n\n\t/** Rebase `branchHead` onto `onto`, but return undefined if nothing changed */\n\tprivate rebaseBranch(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t\tonto: SharedTreeBranch<TEditor, TChange>,\n\t\tupTo = onto.getHead(),\n\t) {\n\t\tconst { head } = branch;\n\t\tif (head === upTo) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst rebaseResult = rebaseBranch(\n\t\t\tthis.mintRevisionTag,\n\t\t\tthis.changeFamily.rebaser,\n\t\t\thead,\n\t\t\tupTo,\n\t\t\tonto.getHead(),\n\t\t);\n\t\tif (this.head === rebaseResult.newSourceHead) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn rebaseResult;\n\t}\n\n\t/**\n\t * Dispose this branch, freezing its state.\n\t *\n\t * @remarks\n\t * Attempts to further mutate the branch will error.\n\t * Any transactions in progress will be aborted.\n\t * Calling dispose more than once has no effect.\n\t */\n\tpublic dispose(): void {\n\t\tif (this.disposed) {\n\t\t\treturn;\n\t\t}\n\n\t\twhile (this.isTransacting()) {\n\t\t\tthis.abortTransaction();\n\t\t}\n\n\t\tthis.revertibles.forEach((revertible) => revertible.dispose());\n\n\t\tthis.disposed = true;\n\t\tthis.emit(\"dispose\");\n\t}\n\n\tprivate assertNotDisposed(): void {\n\t\tassert(!this.disposed, 0x66e /* Branch is disposed */);\n\t}\n}\n\n/**\n * Registers an event listener that fires when the given forkable object forks.\n * The listener will also fire when any of those forks fork, and when those forks of forks fork, and so on.\n * @param forkable - an object that emits an event when it is forked\n * @param onFork - the fork event listener\n * @returns a function which when called will deregister all registrations (including transitive) created by this function.\n * The deregister function has undefined behavior if called more than once.\n */\nexport function onForkTransitive<T extends ISubscribable<{ fork: (t: T) => void }>>(\n\tforkable: T,\n\tonFork: (fork: T) => void,\n): () => void {\n\tconst offs: (() => void)[] = [];\n\toffs.push(\n\t\tforkable.on(\"fork\", (fork) => {\n\t\t\toffs.push(onForkTransitive(fork, onFork));\n\t\t\tonFork(fork);\n\t\t}),\n\t);\n\treturn () => offs.forEach((off) => off());\n}\n\nclass RevertibleRevision implements Revertible {\n\tpublic readonly origin: Revertible[\"origin\"];\n\n\tprivate referenceCount = 1;\n\n\tpublic constructor(\n\t\tpublic readonly kind: RevertibleKind,\n\t\tpublic readonly revision: RevisionTag,\n\t\tprivate readonly onRevert: (revertible: RevertibleRevision) => void,\n\t\tprivate readonly onDispose: (revertible: RevertibleRevision) => void,\n\t) {\n\t\tthis.kind = kind;\n\t\tthis.revision = revision;\n\t\t// This is currently always the case, but we may want to support reverting remote ops\n\t\tthis.origin = { isLocal: true };\n\t}\n\n\tpublic get status(): RevertibleStatus {\n\t\treturn this.referenceCount === 0 ? RevertibleStatus.Disposed : RevertibleStatus.Valid;\n\t}\n\n\tpublic revert(): RevertibleResult {\n\t\tif (this.status === RevertibleStatus.Valid) {\n\t\t\tthis.onRevert(this);\n\t\t\t// If reverting leads to a schema change then the revertible will be disposed as part of the revert.\n\t\t\tthis.dispose(false);\n\t\t\treturn RevertibleResult.Success;\n\t\t}\n\t\treturn RevertibleResult.Failure;\n\t}\n\n\tpublic retain(): RevertibleResult {\n\t\tif (this.status === RevertibleStatus.Valid) {\n\t\t\tthis.referenceCount += 1;\n\t\t\treturn RevertibleResult.Success;\n\t\t}\n\t\treturn RevertibleResult.Failure;\n\t}\n\n\tpublic discard(): RevertibleResult {\n\t\tif (this.status === RevertibleStatus.Valid) {\n\t\t\tif (this.referenceCount === 1) {\n\t\t\t\tthis.dispose();\n\t\t\t} else {\n\t\t\t\tthis.referenceCount -= 1;\n\t\t\t}\n\t\t\treturn RevertibleResult.Success;\n\t\t}\n\t\treturn RevertibleResult.Failure;\n\t}\n\n\tpublic dispose(validateStatus = true): void {\n\t\tif (this.status === RevertibleStatus.Valid) {\n\t\t\tthis.referenceCount = 0;\n\t\t\tthis.onDispose(this);\n\t\t} else {\n\t\t\tassert(\n\t\t\t\tvalidateStatus === false,\n\t\t\t\t0x8c6 /* Cannot dispose already disposed revertible */,\n\t\t\t);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/shared-tree-core/branch.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 } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\tBranchRebaseResult,\n\tChangeFamily,\n\tChangeFamilyEditor,\n\tCommitKind,\n\tCommitMetadata,\n\tGraphCommit,\n\tRevisionTag,\n\tTaggedChange,\n\tfindAncestor,\n\tmakeAnonChange,\n\tmintCommit,\n\trebaseBranch,\n\ttagChange,\n\ttagRollbackInverse,\n} from \"../core/index.js\";\nimport { EventEmitter, ISubscribable } from \"../events/index.js\";\n\nimport { TransactionStack } from \"./transactionStack.js\";\n\n/**\n * Describes a change to a `SharedTreeBranch`. Various operations can mutate the head of the branch;\n * this change format describes each in terms of the \"removed commits\" (all commits which were present\n * on the branch before the operation but are no longer present after) and the \"new commits\" (all\n * commits which are present on the branch after the operation that were not present before). Each of\n * the following event types also provides a `change` which contains the net change to the branch\n * (or is undefined if there was no net change):\n * * Append - when one or more commits are appended to the head of the branch, for example via\n * a change applied by the branch's editor, or as a result of merging another branch into this one\n * * Remove - when one or more commits are removed from the head of the branch. This occurs\n * when a transaction is aborted and all commits pending in that transaction are removed.\n * * Replace - when an operation simultaneously removes and appends commits. For example, when this\n * branch is rebased and some commits are removed and replaced with rebased versions, or when a\n * transaction completes and all pending commits are replaced with a single squash commit.\n */\nexport type SharedTreeBranchChange<TChange> =\n\t| {\n\t\t\ttype: \"append\";\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\tnewCommits: readonly GraphCommit<TChange>[];\n\t  }\n\t| {\n\t\t\ttype: \"remove\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t\t\tremovedCommits: readonly GraphCommit<TChange>[];\n\t  }\n\t| {\n\t\t\ttype: \"replace\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t\t\tremovedCommits: readonly GraphCommit<TChange>[];\n\t\t\tnewCommits: readonly GraphCommit<TChange>[];\n\t  };\n\n/**\n * Returns the operation that caused the given {@link SharedTreeBranchChange}.\n */\nexport function getChangeReplaceType(\n\tchange: SharedTreeBranchChange<unknown> & { type: \"replace\" },\n): \"transactionCommit\" | \"rebase\" {\n\t// The \"replace\" variant of the change event is emitted by two operations: committing a transaction and doing a rebase.\n\t// Committing a transaction will always remove one or more commits (the commits that were squashed),\n\t// and will add exactly one new commit (the squash commit).\n\tif (change.removedCommits.length === 0 || change.newCommits.length !== 1) {\n\t\treturn \"rebase\";\n\t}\n\n\t// There is only one case in which a rebase both removes commits and adds exactly one new commit.\n\t// This occurs when there is exactly one divergent, but equivalent, commit on each branch:\n\t//\n\t// A ─ B (branch X)\t  -- rebase Y onto X -->   A ─ B (branch X)\n\t// └─ B' (branch Y)                                └─ (branch Y)\n\t//\n\t// B' is removed and replaced by B because both have the same revision.\n\tif (\n\t\tchange.removedCommits.length === 1 &&\n\t\tchange.removedCommits[0].revision === change.newCommits[0].revision\n\t) {\n\t\treturn \"rebase\";\n\t}\n\n\treturn \"transactionCommit\";\n}\n\n/**\n * The events emitted by a `SharedTreeBranch`\n */\nexport interface SharedTreeBranchEvents<TEditor extends ChangeFamilyEditor, TChange> {\n\t/**\n\t * Fired just before the head of this branch changes.\n\t * @param change - the change to this branch's state and commits\n\t */\n\tbeforeChange(change: SharedTreeBranchChange<TChange>): void;\n\n\t/**\n\t * Fired just after the head of this branch changes.\n\t * @param change - the change to this branch's state and commits\n\t */\n\tafterChange(change: SharedTreeBranchChange<TChange>): void;\n\n\t/**\n\t * {@inheritdoc TreeViewEvents.commitApplied}\n\t */\n\tcommitApplied(data: CommitMetadata): void;\n\n\t/**\n\t * Fired when this branch forks\n\t * @param fork - the new branch that forked off of this branch\n\t */\n\tfork(fork: SharedTreeBranch<TEditor, TChange>): void;\n\n\t/**\n\t * Fired after this branch is disposed\n\t */\n\tdispose(): void;\n}\n\n/**\n * A branch of changes that can be applied to a SharedTree.\n */\nexport class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> extends EventEmitter<\n\tSharedTreeBranchEvents<TEditor, TChange>\n> {\n\tpublic readonly editor: TEditor;\n\tprivate readonly transactions = new TransactionStack();\n\t/**\n\t * After pushing a starting revision to the transaction stack, this branch might be rebased\n\t * over commits which are children of that starting revision. When the transaction is committed,\n\t * those rebased-over commits should not be included in the transaction's squash commit, even though\n\t * they exist between the starting revision and the final commit within the transaction.\n\t *\n\t * Whenever `rebaseOnto` is called during a transaction, this map is augmented with an entry from the\n\t * original merge-base to the new merge-base.\n\t *\n\t * This state need only be retained for the lifetime of the transaction.\n\t *\n\t * TODO: This strategy might need to be revisited when adding better support for async transactions.\n\t * Since:\n\t *\n\t * 1. Transactionality is guaranteed primarily by squashing at commit time\n\t * 2. Branches may be rebased with an ongoing transaction\n\t *\n\t * a rebase operation might invalidate only a portion of a transaction's commits, thus defeating the\n\t * purpose of transactionality.\n\t *\n\t * AB#6483 and children items track this work.\n\t */\n\tprivate readonly initialTransactionRevToRebasedRev = new Map<RevisionTag, RevisionTag>();\n\tprivate disposed = false;\n\t/**\n\t * Construct a new branch.\n\t * @param head - the head of the branch\n\t * @param changeFamily - determines the set of changes that this branch can commit\n\t */\n\tpublic constructor(\n\t\tprivate head: GraphCommit<TChange>,\n\t\tpublic readonly changeFamily: ChangeFamily<TEditor, TChange>,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t) {\n\t\tsuper();\n\t\tthis.editor = this.changeFamily.buildEditor((change) =>\n\t\t\tthis.apply(change, mintRevisionTag()),\n\t\t);\n\t}\n\n\t/**\n\t * Sets the head of this branch. Emits no change events.\n\t */\n\tpublic setHead(head: GraphCommit<TChange>): void {\n\t\tthis.assertNotDisposed();\n\t\tassert(!this.isTransacting(), 0x685 /* Cannot set head during a transaction */);\n\t\tthis.head = head;\n\t}\n\n\t/**\n\t * Apply a change to this branch.\n\t * @param change - the change to apply\n\t * @param revision - the revision of the new head commit of the branch that contains `change`\n\t * @param changeKind - the kind of change to apply\n\t * @returns the change that was applied and the new head commit of the branch\n\t */\n\tpublic apply(\n\t\tchange: TChange,\n\t\trevision: RevisionTag,\n\t\tchangeKind: CommitKind = CommitKind.Default,\n\t): [change: TChange, newCommit: GraphCommit<TChange>] {\n\t\tthis.assertNotDisposed();\n\n\t\tconst newHead = mintCommit(this.head, {\n\t\t\trevision,\n\t\t\tchange,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tchange: tagChange(change, revision),\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\n\t\t// If this is not part of a transaction, emit a commitApplied event\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.emit(\"commitApplied\", { isLocal: true, kind: changeKind });\n\t\t}\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, newHead];\n\t}\n\n\t/**\n\t * @returns the commit at the head of this branch.\n\t */\n\tpublic getHead(): GraphCommit<TChange> {\n\t\treturn this.head;\n\t}\n\n\t/**\n\t * Begin a transaction on this branch. If the transaction is committed via {@link commitTransaction},\n\t * all commits made since this call will be squashed into a single head commit.\n\t * @param repairStore - the repair store associated with this transaction\n\t */\n\tpublic startTransaction(): void {\n\t\tthis.assertNotDisposed();\n\t\tconst forks = new Set<SharedTreeBranch<TEditor, TChange>>();\n\t\tconst onDisposeUnSubscribes: (() => void)[] = [];\n\t\tconst onForkUnSubscribe = onForkTransitive(this, (fork) => {\n\t\t\tforks.add(fork);\n\t\t\tonDisposeUnSubscribes.push(fork.on(\"dispose\", () => forks.delete(fork)));\n\t\t});\n\t\tthis.transactions.push(this.head.revision, () => {\n\t\t\tforks.forEach((fork) => fork.dispose());\n\t\t\tonDisposeUnSubscribes.forEach((unsubscribe) => unsubscribe());\n\t\t\tonForkUnSubscribe();\n\t\t});\n\t\tthis.editor.enterTransaction();\n\t}\n\n\t/**\n\t * Commit the current transaction. There must be a transaction in progress that was begun via {@link startTransaction}.\n\t * If there are commits in the current transaction, they will be squashed into a new single head commit.\n\t * @returns the commits that were squashed and the new squash commit if a squash occurred, otherwise `undefined`.\n\t * @remarks If the transaction had no changes applied during its lifetime, then no squash occurs (i.e. this method is a no-op).\n\t * Even if the transaction contained only one change, it will still be replaced with an (equivalent) squash change.\n\t */\n\tpublic commitTransaction():\n\t\t| [squashedCommits: GraphCommit<TChange>[], newCommit: GraphCommit<TChange>]\n\t\t| undefined {\n\t\tthis.assertNotDisposed();\n\t\tconst [startCommit, commits] = this.popTransaction();\n\t\tthis.editor.exitTransaction();\n\n\t\tif (commits.length === 0) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// Anonymize the commits from this transaction by stripping their revision tags.\n\t\t// Otherwise, the change rebaser will record their tags and those tags no longer exist.\n\t\tconst anonymousCommits = commits.map(({ change }) => ({ change, revision: undefined }));\n\t\t// Squash the changes and make the squash commit the new head of this branch\n\t\tconst squashedChange = this.changeFamily.rebaser.compose(anonymousCommits);\n\t\tconst revision = this.mintRevisionTag();\n\n\t\tconst newHead = mintCommit(startCommit, {\n\t\t\trevision,\n\t\t\tchange: squashedChange,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"replace\",\n\t\t\tchange: undefined,\n\t\t\tremovedCommits: commits,\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\n\t\t// If this transaction is not nested, emit a commitApplied event\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.emit(\"commitApplied\", { isLocal: true, kind: CommitKind.Default });\n\t\t}\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [commits, newHead];\n\t}\n\n\t/**\n\t * Cancel the current transaction. There must be a transaction in progress that was begun via\n\t * {@link startTransaction}. All commits made during the transaction will be removed.\n\t * @returns the change to this branch resulting in the removal of the commits, and a list of the\n\t * commits that were removed.\n\t */\n\tpublic abortTransaction(): [\n\t\tchange: TChange | undefined,\n\t\tabortedCommits: GraphCommit<TChange>[],\n\t] {\n\t\tthis.assertNotDisposed();\n\t\tconst [startCommit, commits] = this.popTransaction();\n\t\tthis.editor.exitTransaction();\n\n\t\tif (commits.length === 0) {\n\t\t\treturn [undefined, []];\n\t\t}\n\n\t\tconst inverses: TaggedChange<TChange>[] = [];\n\t\tfor (let i = commits.length - 1; i >= 0; i--) {\n\t\t\tconst inverse = this.changeFamily.rebaser.invert(commits[i], false);\n\t\t\tinverses.push(tagRollbackInverse(inverse, this.mintRevisionTag(), commits[i].revision));\n\t\t}\n\t\tconst change =\n\t\t\tinverses.length > 0 ? this.changeFamily.rebaser.compose(inverses) : undefined;\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"remove\",\n\t\t\tchange: change === undefined ? undefined : makeAnonChange(change),\n\t\t\tremovedCommits: commits,\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = startCommit;\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, commits];\n\t}\n\n\t/**\n\t * True iff this branch is in the middle of a transaction that was begin via {@link startTransaction}\n\t */\n\tpublic isTransacting(): boolean {\n\t\treturn this.transactions.size !== 0;\n\t}\n\n\tprivate popTransaction(): [GraphCommit<TChange>, GraphCommit<TChange>[]] {\n\t\tconst { startRevision: startRevisionOriginal } = this.transactions.pop();\n\t\tlet startRevision = startRevisionOriginal;\n\t\twhile (this.initialTransactionRevToRebasedRev.has(startRevision)) {\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n\t\t\tstartRevision = this.initialTransactionRevToRebasedRev.get(startRevision)!;\n\t\t}\n\n\t\tif (!this.isTransacting()) {\n\t\t\tthis.initialTransactionRevToRebasedRev.clear();\n\t\t}\n\n\t\tconst commits: GraphCommit<TChange>[] = [];\n\t\tconst startCommit = findAncestor([this.head, commits], (c) => c.revision === startRevision);\n\t\tassert(\n\t\t\tstartCommit !== undefined,\n\t\t\t0x593 /* Expected branch to be ahead of transaction start revision */,\n\t\t);\n\t\treturn [startCommit, commits];\n\t}\n\n\t/**\n\t * Spawn a new branch that is based off of the current state of this branch.\n\t * Changes made to the new branch will not be applied to this branch until the new branch is merged back in.\n\t *\n\t * @remarks Forks created during a transaction will be disposed when the transaction ends.\n\t */\n\tpublic fork(): SharedTreeBranch<TEditor, TChange> {\n\t\tthis.assertNotDisposed();\n\t\tconst fork = new SharedTreeBranch(this.head, this.changeFamily, this.mintRevisionTag);\n\t\tthis.emit(\"fork\", fork);\n\t\treturn fork;\n\t}\n\n\t/**\n\t * Rebase the changes that have been applied to this branch over divergent changes in the given branch.\n\t * After this operation completes, this branch will be based off of `branch`.\n\t *\n\t * @param branch - the branch to rebase onto\n\t * @param upTo - the furthest commit on `branch` over which to rebase (inclusive). Defaults to the head commit of `branch`.\n\t * @returns the result of the rebase or undefined if nothing changed\n\t */\n\tpublic rebaseOnto(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t\tupTo = branch.getHead(),\n\t): BranchRebaseResult<TChange> | undefined {\n\t\tthis.assertNotDisposed();\n\n\t\t// Rebase this branch onto the given branch\n\t\tconst rebaseResult = this.rebaseBranch(this, branch, upTo);\n\t\tif (rebaseResult === undefined) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// The net change to this branch is provided by the `rebaseBranch` API\n\t\tconst { newSourceHead, commits } = rebaseResult;\n\t\tconst { deletedSourceCommits, targetCommits, sourceCommits } = commits;\n\n\t\tconst newCommits = targetCommits.concat(sourceCommits);\n\t\tif (this.isTransacting()) {\n\t\t\tconst src = targetCommits[0].parent?.revision;\n\t\t\tconst dst = targetCommits[targetCommits.length - 1].revision;\n\t\t\tif (src !== undefined && dst !== undefined) {\n\t\t\t\tthis.initialTransactionRevToRebasedRev.set(src, dst);\n\t\t\t}\n\t\t}\n\t\tconst changeEvent = {\n\t\t\ttype: \"replace\",\n\t\t\tget change() {\n\t\t\t\tconst change = rebaseResult.sourceChange;\n\t\t\t\treturn change === undefined ? undefined : makeAnonChange(change);\n\t\t\t},\n\t\t\tremovedCommits: deletedSourceCommits,\n\t\t\tnewCommits,\n\t\t} as const;\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newSourceHead;\n\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn rebaseResult;\n\t}\n\n\t/**\n\t * Apply all the divergent changes on the given branch to this branch.\n\t *\n\t * @param branch - the branch to merge into this branch\n\t * @returns the net change to this branch and the commits that were added to this branch by the merge,\n\t * or undefined if nothing changed\n\t */\n\tpublic merge(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t): [change: TChange, newCommits: GraphCommit<TChange>[]] | undefined {\n\t\tthis.assertNotDisposed();\n\t\tbranch.assertNotDisposed();\n\t\tassert(\n\t\t\t!branch.isTransacting(),\n\t\t\t0x597 /* Branch may not be merged while transaction is in progress */,\n\t\t);\n\n\t\t// Rebase the given branch onto this branch\n\t\tconst rebaseResult = this.rebaseBranch(branch, this);\n\t\tif (rebaseResult === undefined) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\t// Compute the net change to this branch\n\t\tconst sourceCommits = rebaseResult.commits.sourceCommits;\n\t\tconst change = this.changeFamily.rebaser.compose(sourceCommits);\n\t\tconst taggedChange = makeAnonChange(change);\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tget change(): TaggedChange<TChange> {\n\t\t\t\treturn taggedChange;\n\t\t\t},\n\t\t\tnewCommits: sourceCommits,\n\t\t} as const;\n\n\t\tthis.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = rebaseResult.newSourceHead;\n\t\tthis.emit(\"afterChange\", changeEvent);\n\t\treturn [change, sourceCommits];\n\t}\n\n\t/** Rebase `branchHead` onto `onto`, but return undefined if nothing changed */\n\tprivate rebaseBranch(\n\t\tbranch: SharedTreeBranch<TEditor, TChange>,\n\t\tonto: SharedTreeBranch<TEditor, TChange>,\n\t\tupTo = onto.getHead(),\n\t) {\n\t\tconst { head } = branch;\n\t\tif (head === upTo) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst rebaseResult = rebaseBranch(\n\t\t\tthis.mintRevisionTag,\n\t\t\tthis.changeFamily.rebaser,\n\t\t\thead,\n\t\t\tupTo,\n\t\t\tonto.getHead(),\n\t\t);\n\t\tif (this.head === rebaseResult.newSourceHead) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn rebaseResult;\n\t}\n\n\t/**\n\t * Dispose this branch, freezing its state.\n\t *\n\t * @remarks\n\t * Attempts to further mutate the branch will error.\n\t * Any transactions in progress will be aborted.\n\t * Calling dispose more than once has no effect.\n\t */\n\tpublic dispose(): void {\n\t\tif (this.disposed) {\n\t\t\treturn;\n\t\t}\n\n\t\twhile (this.isTransacting()) {\n\t\t\tthis.abortTransaction();\n\t\t}\n\n\t\tthis.disposed = true;\n\t\tthis.emit(\"dispose\");\n\t}\n\n\tprivate assertNotDisposed(): void {\n\t\tassert(!this.disposed, 0x66e /* Branch is disposed */);\n\t}\n}\n\n/**\n * Registers an event listener that fires when the given forkable object forks.\n * The listener will also fire when any of those forks fork, and when those forks of forks fork, and so on.\n * @param forkable - an object that emits an event when it is forked\n * @param onFork - the fork event listener\n * @returns a function which when called will deregister all registrations (including transitive) created by this function.\n * The deregister function has undefined behavior if called more than once.\n */\nexport function onForkTransitive<T extends ISubscribable<{ fork: (t: T) => void }>>(\n\tforkable: T,\n\tonFork: (fork: T) => void,\n): () => void {\n\tconst offs: (() => void)[] = [];\n\toffs.push(\n\t\tforkable.on(\"fork\", (fork) => {\n\t\t\toffs.push(onForkTransitive(fork, onFork));\n\t\t\tonFork(fork);\n\t\t}),\n\t);\n\treturn () => offs.forEach((off) => off());\n}\n"]}

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

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 import { SessionId } from "@fluidframework/id-compressor";
-import { RecursiveReadonly } from "../util/index.js";
 import { ChangeFamily, ChangeFamilyEditor, GraphCommit, RevisionTag } from "../core/index.js";
+import { RecursiveReadonly } from "../util/index.js";
 import { SharedTreeBranch } from "./branch.js";
-import { Commit, SummarySessionBranch, SeqNumber, SequencedCommit } from "./editManagerFormat.js";
+import { Commit, SeqNumber, SequencedCommit, SummarySessionBranch } from "./editManagerFormat.js";
 export declare const minimumPossibleSequenceNumber: SeqNumber;
 /**
  * Represents a local branch of a document and interprets the effect on the document of adding sequenced changes,
@@ -50,11 +50,6 @@ export declare class EditManager<TEditor extends ChangeFamilyEditor, TChangeset,
      * @remarks If there are more than one commit with the same sequence number we assume this refers to the last commit in the batch.
      */
     private minimumSequenceNumber;
-    /**
-     * The sequence ID corresponding to the oldest revertible commit owned by the local branch. This is used
-     * to prevent the trunk from trimming this commit or commits after it as they're needed for undo.
-     */
-    private _oldestRevertibleSequenceId?;
     /**
      * A special commit that is a "base" (tail) of the trunk, though not part of the trunk itself.
      * This makes it possible to model the trunk in the same way as any other branch (it branches off of a base commit)
@@ -90,14 +85,6 @@ export declare class EditManager<TEditor extends ChangeFamilyEditor, TChangeset,
      * @param newId - The ID of the new trunk head.
      */
     private fastForwardBranches;
-    /**
-     * Returns the sequence id of the oldest sequenced revertible commit on the local branch.
-     *
-     * TODO: may be more performant to maintain the oldest revertible on the branches themselves
-     * this should be tested and revisited once branches are supported
-     */
-    private getOldestRevertibleSequenceId;
-    private onRevertibleDisposed;
     /**
      * Advances the minimum sequence number, and removes all commits from the trunk which lie outside the collaboration window,
      * if they are not retained by revertibles or local branches.