@fluidframework/tree 2.116.1 → 2.117.0

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

@@ -1 +1 @@
-{"version":3,"file":"unhydratedTreeContext.js","sourceRoot":"","sources":["../../src/shared-tree/unhydratedTreeContext.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,uEAAsE;AAWtE,uDAA0D;AAE1D;;GAEG;AACH,MAAa,qBAAqB;IAGjC;QADQ,qBAAgB,GAAG,CAAC,CAAC;IACN,CAAC;IAEjB,QAAQ;QACd,OAAO,KAAK,CAAC;IACd,CAAC;IAUM,cAAc,CACpB,CAAkC,EAClC,MAAkC;QAElC,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;YACtD,IAAA,uCAAqB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC;YACJ,OAAO,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAUM,KAAK,CAAC,mBAAmB,CAC/B,CAA2C,EAC3C,MAAkC;QAElC,IAAI,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,qBAAU,CACnB,iGAAiG,CACjG,CAAC;QACH,CAAC;QACD,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;YACtD,IAAA,uCAAqB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC;YACJ,OAAO,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAEO,MAAM,CAAC,qBAAqB,CACnC,KAA+B;QAE/B,IAAI,KAAK,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;;AAnEF,sDAoEC;AAnEc,8BAAQ,GAAG,IAAI,qBAAqB,EAAE,AAA9B,CAA+B","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport type {\n\tTreeContextAlpha,\n\tTreeBranchAlpha,\n\tRunTransactionParamsAlpha,\n\tTransactionVoidResult,\n\tTransactionValueResult,\n\tWithValue,\n} from \"../simple-tree/index.js\";\n\nimport { assertValidConstraint } from \"./treeCheckout.js\";\n\n/**\n * A {@link TreeContextAlpha | tree context} that can be used for e.g. unhydrated nodes.\n */\nexport class UnhydratedTreeContext implements TreeContextAlpha {\n\tpublic static instance = new UnhydratedTreeContext();\n\tprivate transactionCount = 0;\n\tprivate constructor() {}\n\n\tpublic isBranch(): this is TreeBranchAlpha {\n\t\treturn false;\n\t}\n\n\tpublic runTransaction<TValue>(\n\t\tt: () => WithValue<TValue>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): TransactionValueResult<TValue, TValue>;\n\tpublic runTransaction(\n\t\tt: () => void,\n\t\t_params?: RunTransactionParamsAlpha,\n\t): TransactionVoidResult;\n\tpublic runTransaction(\n\t\tt: () => WithValue<unknown> | void,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): TransactionValueResult<unknown, unknown> | TransactionVoidResult {\n\t\tfor (const constraint of params?.preconditions ?? []) {\n\t\t\tassertValidConstraint(constraint, false);\n\t\t}\n\t\tthis.transactionCount += 1;\n\t\ttry {\n\t\t\treturn UnhydratedTreeContext.wrapTransactionResult(t());\n\t\t} finally {\n\t\t\tthis.transactionCount -= 1;\n\t\t}\n\t}\n\n\tpublic runTransactionAsync<TValue>(\n\t\tt: () => Promise<WithValue<TValue>>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionValueResult<TValue, TValue>>;\n\tpublic runTransactionAsync(\n\t\tt: () => Promise<void>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionVoidResult>;\n\tpublic async runTransactionAsync(\n\t\tt: () => Promise<WithValue<unknown> | void>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionValueResult<unknown, unknown> | TransactionVoidResult> {\n\t\tif (this.transactionCount > 0) {\n\t\t\tthrow new UsageError(\n\t\t\t\t\"An asynchronous transaction cannot be started while another transaction is already in progress.\",\n\t\t\t);\n\t\t}\n\t\tfor (const constraint of params?.preconditions ?? []) {\n\t\t\tassertValidConstraint(constraint, false);\n\t\t}\n\t\tthis.transactionCount += 1;\n\t\ttry {\n\t\t\treturn UnhydratedTreeContext.wrapTransactionResult(await t());\n\t\t} finally {\n\t\t\tthis.transactionCount -= 1;\n\t\t}\n\t}\n\n\tprivate static wrapTransactionResult<TValue>(\n\t\tvalue: WithValue<TValue> | void,\n\t): TransactionValueResult<TValue, TValue> | TransactionVoidResult {\n\t\tif (value?.value !== undefined) {\n\t\t\treturn { success: true, value: value.value };\n\t\t}\n\t\treturn { success: true };\n\t}\n}\n"]}
+{"version":3,"file":"unhydratedTreeContext.js","sourceRoot":"","sources":["../../src/shared-tree/unhydratedTreeContext.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,uEAAsE;AAWtE,uDAA0D;AAE1D;;GAEG;AACH,MAAa,qBAAqB;IAGjC;QADQ,qBAAgB,GAAG,CAAC,CAAC;IACN,CAAC;IAEjB,QAAQ;QACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM;QACZ,OAAO,KAAK,CAAC;IACd,CAAC;IAUM,cAAc,CACpB,CAAkC,EAClC,MAAkC;QAElC,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;YACtD,IAAA,uCAAqB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC;YACJ,OAAO,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAUM,KAAK,CAAC,mBAAmB,CAC/B,CAA2C,EAC3C,MAAkC;QAElC,IAAI,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,qBAAU,CACnB,iGAAiG,CACjG,CAAC;QACH,CAAC;QACD,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;YACtD,IAAA,uCAAqB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC;YACJ,OAAO,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAEO,MAAM,CAAC,qBAAqB,CACnC,KAA+B;QAE/B,IAAI,KAAK,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;;AAvEF,sDAwEC;AAvEc,8BAAQ,GAAG,IAAI,qBAAqB,EAAE,AAA9B,CAA+B","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport type {\n\tTreeContextAlpha,\n\tUntypedTreeViewAlpha,\n\tRunTransactionParamsAlpha,\n\tTransactionVoidResult,\n\tTransactionValueResult,\n\tWithValue,\n} from \"../simple-tree/index.js\";\n\nimport { assertValidConstraint } from \"./treeCheckout.js\";\n\n/**\n * A {@link TreeContextAlpha | tree context} that can be used for e.g. unhydrated nodes.\n */\nexport class UnhydratedTreeContext implements TreeContextAlpha {\n\tpublic static instance = new UnhydratedTreeContext();\n\tprivate transactionCount = 0;\n\tprivate constructor() {}\n\n\tpublic isBranch(): this is UntypedTreeViewAlpha {\n\t\treturn this.isView();\n\t}\n\n\tpublic isView(): this is UntypedTreeViewAlpha {\n\t\treturn false;\n\t}\n\n\tpublic runTransaction<TValue>(\n\t\tt: () => WithValue<TValue>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): TransactionValueResult<TValue, TValue>;\n\tpublic runTransaction(\n\t\tt: () => void,\n\t\t_params?: RunTransactionParamsAlpha,\n\t): TransactionVoidResult;\n\tpublic runTransaction(\n\t\tt: () => WithValue<unknown> | void,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): TransactionValueResult<unknown, unknown> | TransactionVoidResult {\n\t\tfor (const constraint of params?.preconditions ?? []) {\n\t\t\tassertValidConstraint(constraint, false);\n\t\t}\n\t\tthis.transactionCount += 1;\n\t\ttry {\n\t\t\treturn UnhydratedTreeContext.wrapTransactionResult(t());\n\t\t} finally {\n\t\t\tthis.transactionCount -= 1;\n\t\t}\n\t}\n\n\tpublic runTransactionAsync<TValue>(\n\t\tt: () => Promise<WithValue<TValue>>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionValueResult<TValue, TValue>>;\n\tpublic runTransactionAsync(\n\t\tt: () => Promise<void>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionVoidResult>;\n\tpublic async runTransactionAsync(\n\t\tt: () => Promise<WithValue<unknown> | void>,\n\t\tparams?: RunTransactionParamsAlpha,\n\t): Promise<TransactionValueResult<unknown, unknown> | TransactionVoidResult> {\n\t\tif (this.transactionCount > 0) {\n\t\t\tthrow new UsageError(\n\t\t\t\t\"An asynchronous transaction cannot be started while another transaction is already in progress.\",\n\t\t\t);\n\t\t}\n\t\tfor (const constraint of params?.preconditions ?? []) {\n\t\t\tassertValidConstraint(constraint, false);\n\t\t}\n\t\tthis.transactionCount += 1;\n\t\ttry {\n\t\t\treturn UnhydratedTreeContext.wrapTransactionResult(await t());\n\t\t} finally {\n\t\t\tthis.transactionCount -= 1;\n\t\t}\n\t}\n\n\tprivate static wrapTransactionResult<TValue>(\n\t\tvalue: WithValue<TValue> | void,\n\t): TransactionValueResult<TValue, TValue> | TransactionVoidResult {\n\t\tif (value?.value !== undefined) {\n\t\t\treturn { success: true, value: value.value };\n\t\t}\n\t\treturn { success: true };\n\t}\n}\n"]}

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

@@ -5,7 +5,7 @@
 import type { Listenable } from "@fluidframework/core-interfaces";
 import type { OpSpaceCompressedId, SessionSpaceCompressedId } from "@fluidframework/id-compressor";
 import { type TelemetryEventBatcher } from "@fluidframework/telemetry-utils/internal";
-import { type ChangeFamily, type ChangeFamilyEditor, CommitKind, type GraphCommit, type RevisionTag, type TaggedChange, type RebaseStatsWithDuration } from "../core/index.js";
+import { type ChangeFamily, type ChangeFamilyEditor, CommitKind, type CustomMetadataTree, type GraphCommit, type RevisionTag, type TaggedChange, type RebaseStatsWithDuration } from "../core/index.js";
 export type BranchId = SessionSpaceCompressedId | "main";
 export type EncodedBranchId = OpSpaceCompressedId;
 /**
@@ -29,6 +29,10 @@ export type SharedTreeBranchChange<TChange> = {
 } | {
     type: "rebase";
     change: TaggedChange<TChange> | undefined;
+    /** The commits removed from the head of the branch by this operation */
+    removedCommits: readonly GraphCommit<TChange>[];
+    /** The commits appended to the head of the branch by this operation */
+    newCommits: readonly GraphCommit<TChange>[];
 };
 /**
  * The events emitted by a `SharedTreeBranch`
@@ -113,9 +117,11 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
      * Apply a change to this branch.
      * @param change - the change to apply
      * @param kind - the kind of change to apply
+     * @param customMetadata - {@link GraphCommit.customMetadata | metadata} to attach to the new commit.
+     * Callers reconstructing an existing commit, rather than minting one, must pass that commit's metadata.
      * @returns the change that was applied and the new head commit of the branch
      */
-    apply(change: TaggedChange<TChange>, kind?: CommitKind): void;
+    apply(change: TaggedChange<TChange>, kind: CommitKind, customMetadata: CustomMetadataTree | undefined): void;
     /**
      * Notifies the branch that a commit has been sequenced by the sequencing service.
      * @param commit - The commit that was sequenced
@@ -125,6 +131,14 @@ export declare class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChang
      * Gets the commit at the head of this branch.
      */
     getHead(): GraphCommit<TChange>;
+    /**
+     * Gets the number of commits in this branch.
+     * This includes commits on ancestor branches but excludes the sentinel commit at the root of all branches.
+     * @remarks
+     * This method has linear complexity in the number of commits in the branch.
+     * See {@link BranchCommitCounter} for a cached version.
+     */
+    getCommitCount(): number;
     /**
      * Spawn a new branch that is based off of the current state of this branch.
      * @param commit - The commit to base the new branch off of. Defaults to the head of this branch.

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

@@ -33,7 +33,7 @@ class SharedTreeBranch {
         _SharedTreeBranch_events.set(this, (0, client_utils_1.createEmitter)());
         this.events = tslib_1.__classPrivateFieldGet(this, _SharedTreeBranch_events, "f");
         this.disposed = false;
-        this.editor = this.changeFamily.buildEditor(mintRevisionTag, (change) => this.apply(change));
+        this.editor = this.changeFamily.buildEditor(mintRevisionTag, (change) => this.apply(change, index_js_1.CommitKind.Default, undefined));
         this.unsubscribeBranchTrimmer = branchTrimmer?.on("ancestryTrimmed", (commit) => {
             tslib_1.__classPrivateFieldGet(this, _SharedTreeBranch_events, "f").emit("ancestryTrimmed", commit);
         });
@@ -51,15 +51,18 @@ class SharedTreeBranch {
      * Apply a change to this branch.
      * @param change - the change to apply
      * @param kind - the kind of change to apply
+     * @param customMetadata - {@link GraphCommit.customMetadata | metadata} to attach to the new commit.
+     * Callers reconstructing an existing commit, rather than minting one, must pass that commit's metadata.
      * @returns the change that was applied and the new head commit of the branch
      */
-    apply(change, kind = index_js_1.CommitKind.Default) {
+    apply(change, kind, customMetadata) {
         this.assertNotDisposed();
         const revisionTag = change.revision;
         (0, internal_1.assert)(revisionTag !== undefined, 0xa49 /* Revision tag must be provided */);
         const newHead = (0, index_js_1.mintCommit)(this.head, {
             revision: revisionTag,
             change: change.change,
+            customMetadata,
         });
         const changeEvent = {
             type: "append",
@@ -84,6 +87,21 @@ class SharedTreeBranch {
     getHead() {
         return this.head;
     }
+    /**
+     * Gets the number of commits in this branch.
+     * This includes commits on ancestor branches but excludes the sentinel commit at the root of all branches.
+     * @remarks
+     * This method has linear complexity in the number of commits in the branch.
+     * See {@link BranchCommitCounter} for a cached version.
+     */
+    getCommitCount() {
+        let count = 0;
+        for (let commit = this.head; commit !== undefined; commit = commit.parent) {
+            count++;
+        }
+        // Exclude the sentinel commit that serves as the base to all branches.
+        return count - 1;
+    }
     /**
      * Spawn a new branch that is based off of the current state of this branch.
      * @param commit - The commit to base the new branch off of. Defaults to the head of this branch.

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 { createEmitter } from \"@fluid-internal/client-utils\";\nimport type { Listenable } from \"@fluidframework/core-interfaces\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type {\n\tOpSpaceCompressedId,\n\tSessionSpaceCompressedId,\n} from \"@fluidframework/id-compressor\";\nimport { type TelemetryEventBatcher, measure } from \"@fluidframework/telemetry-utils/internal\";\n\nimport {\n\ttype BranchRebaseResult,\n\ttype ChangeFamily,\n\ttype ChangeFamilyEditor,\n\tCommitKind,\n\ttype GraphCommit,\n\ttype RevisionTag,\n\ttype TaggedChange,\n\tfindAncestor,\n\tmakeAnonChange,\n\tmintCommit,\n\trebaseBranch,\n\ttagRollbackInverse,\n\ttype RebaseStatsWithDuration,\n} from \"../core/index.js\";\nimport { hasSome, defineLazyCachedProperty } from \"../util/index.js\";\n\nexport type BranchId = SessionSpaceCompressedId | \"main\";\nexport type EncodedBranchId = OpSpaceCompressedId;\n\n/**\n * Describes a change to a `SharedTreeBranch`. Each of the following event types provides a `change` which contains the net change to the branch (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.\n * * Rebase - when a rebase operation adds commits from another branch and replaces existing commits with their rebased versions.\n */\nexport type SharedTreeBranchChange<TChange> =\n\t| {\n\t\t\ttype: \"append\";\n\t\t\tkind: CommitKind;\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\t/** The commits appended to the head of the branch by this operation */\n\t\t\tnewCommits: readonly [GraphCommit<TChange>, ...GraphCommit<TChange>[]];\n\t  }\n\t| {\n\t\t\ttype: \"remove\";\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\t/** The commits removed from the head of the branch by this operation */\n\t\t\tremovedCommits: readonly [GraphCommit<TChange>, ...GraphCommit<TChange>[]];\n\t  }\n\t| {\n\t\t\ttype: \"rebase\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t  };\n\n/**\n * The events emitted by a `SharedTreeBranch`\n */\nexport interface SharedTreeBranchEvents<\n\tTEditor extends ChangeFamilyEditor,\n\tTChange,\n\tTChangeProcessingContext,\n> extends BranchTrimmingEvents {\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 this branch forks\n\t * @param fork - the new branch that forked off of this branch\n\t */\n\tfork(fork: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>): void;\n\n\t/**\n\t * Fired when a commit is ordered by the sequencing service.\n\t * @param commit - The commit that was sequenced\n\t *\n\t * @remarks\n\t * Once a commit is sequenced, the following guarantees hold:\n\t * 1. The changes carried by the commit have been persisted and other peers are able to see them.\n\t * 2. There can be no more concurrent changes sequenced before this commit, which means this commit has reached its settled form.\n\t */\n\tcommitSequenced(commit: GraphCommit<TChange>): void;\n\n\t/**\n\t * Fired after this branch is disposed\n\t */\n\tdispose(): void;\n}\n\n/**\n * Events related to branch trimming.\n *\n * @remarks\n * Trimming is a very specific kind of mutation which is the only allowed mutations to branches.\n * References to commits from other commits are removed so that the commit objects can be GC'd by the JS engine.\n * This happens by changing a commit's parent property to undefined, which drops all commits that are in its \"ancestry\".\n * It is done as a performance optimization when it is determined that commits are no longer needed for future computation.\n */\nexport interface BranchTrimmingEvents {\n\t/**\n\t * Fired when some contiguous range of commits beginning with the \"global tail\" of this branch are trimmed from the branch.\n\t * This happens by deleting the parent pointer to the last commit in that range. This event can be fired at any time.\n\t */\n\tancestryTrimmed(trimmedRevisions: RevisionTag[]): void;\n}\n\n/**\n * A branch of changes that can be applied to a SharedTree.\n */\nexport class SharedTreeBranch<\n\tTEditor extends ChangeFamilyEditor,\n\tTChange,\n\tTChangeProcessingContext,\n> {\n\treadonly #events =\n\t\tcreateEmitter<SharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>>();\n\tpublic readonly events: Listenable<\n\t\tSharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>\n\t> = this.#events;\n\tpublic readonly editor: TEditor;\n\tprivate disposed = false;\n\tprivate readonly unsubscribeBranchTrimmer?: () => void;\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 * @param mintRevisionTag - used to generate a `RevisionTag` for each change.\n\t * @param branchTrimmer - an optional event emitter that informs the branch it has been trimmed. If this is not supplied, then the branch must\n\t * never be trimmed. See {@link BranchTrimmingEvents} for details on trimming.\n\t */\n\tpublic constructor(\n\t\tprivate head: GraphCommit<TChange>,\n\t\tpublic readonly changeFamily: ChangeFamily<TEditor, TChange, TChangeProcessingContext>,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t\tprivate readonly branchTrimmer?: Listenable<BranchTrimmingEvents>,\n\t\tprivate readonly telemetryEventBatcher?: TelemetryEventBatcher<\n\t\t\tkeyof RebaseStatsWithDuration\n\t\t>,\n\t) {\n\t\tthis.editor = this.changeFamily.buildEditor(mintRevisionTag, (change) =>\n\t\t\tthis.apply(change),\n\t\t);\n\t\tthis.unsubscribeBranchTrimmer = branchTrimmer?.on(\"ancestryTrimmed\", (commit) => {\n\t\t\tthis.#events.emit(\"ancestryTrimmed\", commit);\n\t\t});\n\t}\n\n\t/**\n\t * Sets the head of this branch.\n\t * @remarks This is a \"manual override\" of sorts, for when the branch needs to be set to a certain state without going through the usual flow of edits.\n\t * This might be necessary as a performance optimization, or to prevent parts of the system updating incorrectly (this method emits no change events!).\n\t */\n\tpublic setHead(head: GraphCommit<TChange>): void {\n\t\tthis.assertNotDisposed();\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 kind - 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(change: TaggedChange<TChange>, kind: CommitKind = CommitKind.Default): void {\n\t\tthis.assertNotDisposed();\n\n\t\tconst revisionTag = change.revision;\n\t\tassert(revisionTag !== undefined, 0xa49 /* Revision tag must be provided */);\n\n\t\tconst newHead = mintCommit(this.head, {\n\t\t\trevision: revisionTag,\n\t\t\tchange: change.change,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tkind,\n\t\t\tchange,\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t}\n\n\t/**\n\t * Notifies the branch that a commit has been sequenced by the sequencing service.\n\t * @param commit - The commit that was sequenced\n\t */\n\tpublic commitWasSequenced(commit: GraphCommit<TChange>): void {\n\t\tthis.#events.emit(\"commitSequenced\", commit);\n\t}\n\n\t/**\n\t * Gets 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 * Spawn a new branch that is based off of the current state of this branch.\n\t * @param commit - The commit to base the new branch off of. Defaults to the head of this branch.\n\t * @param mintRevisionTag - used to generate a `RevisionTag` for each change.\n\t * @remarks Changes made to the new branch will not be applied to this branch until the new branch is {@link SharedTreeBranch.merge | merged} back in.\n\t * Forks created during a transaction will be disposed when the transaction ends.\n\t */\n\tpublic fork(\n\t\tcommit: GraphCommit<TChange> = this.head,\n\t\tmintRevisionTag: () => RevisionTag = this.mintRevisionTag,\n\t): SharedTreeBranch<TEditor, TChange, TChangeProcessingContext> {\n\t\tthis.assertNotDisposed();\n\t\tconst fork = new SharedTreeBranch(\n\t\t\tcommit,\n\t\t\tthis.changeFamily,\n\t\t\tmintRevisionTag,\n\t\t\tthis.branchTrimmer,\n\t\t);\n\t\tthis.#events.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, TChangeProcessingContext>,\n\t\tupTo = branch.getHead(),\n\t): void {\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;\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\t\tassert(hasSome(targetCommits), 0xa83 /* Expected commit(s) for a non no-op rebase */);\n\n\t\tconst newCommits = [...targetCommits, ...sourceCommits];\n\t\tconst changeEvent = {\n\t\t\ttype: \"rebase\",\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\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newSourceHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t}\n\n\t/**\n\t * Remove a range of commits from this branch.\n\t * @param commit - All commits after (but not including) this commit will be removed.\n\t * @returns The net change to this branch and the commits that were removed from this branch.\n\t */\n\tpublic removeAfter(commit: GraphCommit<TChange>): void {\n\t\tif (commit === this.head) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst removedCommits: GraphCommit<TChange>[] = [];\n\t\tconst inverses: TaggedChange<TChange>[] = [];\n\t\tfindAncestor([this.head, removedCommits], (c) => {\n\t\t\t// TODO: Pull this side effect out if/when more diverse ancestry walking helpers are available\n\t\t\tif (c !== commit) {\n\t\t\t\tconst revision = this.mintRevisionTag();\n\t\t\t\tconst inverse = this.changeFamily.rebaser.invert(c, true, revision);\n\t\t\t\tinverses.push(tagRollbackInverse(inverse, revision, c.revision));\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\treturn true;\n\t\t});\n\t\tassert(hasSome(removedCommits), 0xa84 /* Commit must be in the branch's ancestry */);\n\n\t\tconst change = makeAnonChange(this.changeFamily.rebaser.compose(inverses));\n\t\tconst changeEvent = {\n\t\t\ttype: \"remove\",\n\t\t\tchange,\n\t\t\tremovedCommits,\n\t\t} as const;\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = commit;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\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 commits that were added to this branch by the merge, or undefined if nothing changed\n\t */\n\tpublic merge(\n\t\tbranch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,\n\t): { sourceCommits: GraphCommit<TChange>[] } | undefined {\n\t\tthis.assertNotDisposed();\n\t\tbranch.assertNotDisposed();\n\n\t\tif (branch === this) {\n\t\t\treturn undefined;\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\tassert(hasSome(sourceCommits), 0xa86 /* Expected source commits in non no-op merge */);\n\t\tconst { rebaser } = this.changeFamily;\n\t\tconst changeEvent = defineLazyCachedProperty(\n\t\t\t{\n\t\t\t\ttype: \"append\",\n\t\t\t\tkind: CommitKind.Default,\n\t\t\t\tnewCommits: sourceCommits,\n\t\t\t} as const,\n\t\t\t\"change\",\n\t\t\t() => makeAnonChange(rebaser.compose(sourceCommits)),\n\t\t);\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = rebaseResult.newSourceHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t\treturn { 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, TChangeProcessingContext>,\n\t\tonto: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,\n\t\tupTo = onto.getHead(),\n\t): BranchRebaseResult<TChange> | undefined {\n\t\tconst { head } = branch;\n\t\tif (head === upTo) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst { duration, output } = measure(() =>\n\t\t\trebaseBranch(\n\t\t\t\tthis.mintRevisionTag,\n\t\t\t\tthis.changeFamily.rebaser,\n\t\t\t\thead,\n\t\t\t\tupTo,\n\t\t\t\tonto.getHead(),\n\t\t\t),\n\t\t);\n\n\t\tthis.telemetryEventBatcher?.accumulateAndLog({ duration, ...output.telemetryProperties });\n\n\t\tif (this.head === output.newSourceHead) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn output;\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\tthis.unsubscribeBranchTrimmer?.();\n\n\t\tthis.disposed = true;\n\t\tthis.#events.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 branch 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 branch - the branch that will be listened to for forks\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 */\n// Branches are invariant over TChange\nexport function onForkTransitive<T extends { events: Listenable<{ fork(t: T): void }> }>(\n\tbranch: T,\n\tonFork: (fork: T) => void,\n): () => void {\n\tconst offs: (() => void)[] = [];\n\toffs.push(\n\t\tbranch.events.on(\"fork\", (fork: T) => {\n\t\t\toffs.push(onForkTransitive(fork, onFork));\n\t\t\tonFork(fork);\n\t\t}),\n\t);\n\treturn () => {\n\t\tfor (const off of offs) {\n\t\t\toff();\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 { createEmitter } from \"@fluid-internal/client-utils\";\nimport type { Listenable } from \"@fluidframework/core-interfaces\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type {\n\tOpSpaceCompressedId,\n\tSessionSpaceCompressedId,\n} from \"@fluidframework/id-compressor\";\nimport { type TelemetryEventBatcher, measure } from \"@fluidframework/telemetry-utils/internal\";\n\nimport {\n\ttype BranchRebaseResult,\n\ttype ChangeFamily,\n\ttype ChangeFamilyEditor,\n\tCommitKind,\n\ttype CustomMetadataTree,\n\ttype GraphCommit,\n\ttype RevisionTag,\n\ttype TaggedChange,\n\tfindAncestor,\n\tmakeAnonChange,\n\tmintCommit,\n\trebaseBranch,\n\ttagRollbackInverse,\n\ttype RebaseStatsWithDuration,\n} from \"../core/index.js\";\nimport { hasSome, defineLazyCachedProperty } from \"../util/index.js\";\n\nexport type BranchId = SessionSpaceCompressedId | \"main\";\nexport type EncodedBranchId = OpSpaceCompressedId;\n\n/**\n * Describes a change to a `SharedTreeBranch`. Each of the following event types provides a `change` which contains the net change to the branch (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.\n * * Rebase - when a rebase operation adds commits from another branch and replaces existing commits with their rebased versions.\n */\nexport type SharedTreeBranchChange<TChange> =\n\t| {\n\t\t\ttype: \"append\";\n\t\t\tkind: CommitKind;\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\t/** The commits appended to the head of the branch by this operation */\n\t\t\tnewCommits: readonly [GraphCommit<TChange>, ...GraphCommit<TChange>[]];\n\t  }\n\t| {\n\t\t\ttype: \"remove\";\n\t\t\tchange: TaggedChange<TChange>;\n\t\t\t/** The commits removed from the head of the branch by this operation */\n\t\t\tremovedCommits: readonly [GraphCommit<TChange>, ...GraphCommit<TChange>[]];\n\t  }\n\t| {\n\t\t\ttype: \"rebase\";\n\t\t\tchange: TaggedChange<TChange> | undefined;\n\t\t\t/** The commits removed from the head of the branch by this operation */\n\t\t\tremovedCommits: readonly GraphCommit<TChange>[];\n\t\t\t/** The commits appended to the head of the branch by this operation */\n\t\t\tnewCommits: readonly GraphCommit<TChange>[];\n\t  };\n\n/**\n * The events emitted by a `SharedTreeBranch`\n */\nexport interface SharedTreeBranchEvents<\n\tTEditor extends ChangeFamilyEditor,\n\tTChange,\n\tTChangeProcessingContext,\n> extends BranchTrimmingEvents {\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 this branch forks\n\t * @param fork - the new branch that forked off of this branch\n\t */\n\tfork(fork: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>): void;\n\n\t/**\n\t * Fired when a commit is ordered by the sequencing service.\n\t * @param commit - The commit that was sequenced\n\t *\n\t * @remarks\n\t * Once a commit is sequenced, the following guarantees hold:\n\t * 1. The changes carried by the commit have been persisted and other peers are able to see them.\n\t * 2. There can be no more concurrent changes sequenced before this commit, which means this commit has reached its settled form.\n\t */\n\tcommitSequenced(commit: GraphCommit<TChange>): void;\n\n\t/**\n\t * Fired after this branch is disposed\n\t */\n\tdispose(): void;\n}\n\n/**\n * Events related to branch trimming.\n *\n * @remarks\n * Trimming is a very specific kind of mutation which is the only allowed mutations to branches.\n * References to commits from other commits are removed so that the commit objects can be GC'd by the JS engine.\n * This happens by changing a commit's parent property to undefined, which drops all commits that are in its \"ancestry\".\n * It is done as a performance optimization when it is determined that commits are no longer needed for future computation.\n */\nexport interface BranchTrimmingEvents {\n\t/**\n\t * Fired when some contiguous range of commits beginning with the \"global tail\" of this branch are trimmed from the branch.\n\t * This happens by deleting the parent pointer to the last commit in that range. This event can be fired at any time.\n\t */\n\tancestryTrimmed(trimmedRevisions: RevisionTag[]): void;\n}\n\n/**\n * A branch of changes that can be applied to a SharedTree.\n */\nexport class SharedTreeBranch<\n\tTEditor extends ChangeFamilyEditor,\n\tTChange,\n\tTChangeProcessingContext,\n> {\n\treadonly #events =\n\t\tcreateEmitter<SharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>>();\n\tpublic readonly events: Listenable<\n\t\tSharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>\n\t> = this.#events;\n\tpublic readonly editor: TEditor;\n\tprivate disposed = false;\n\tprivate readonly unsubscribeBranchTrimmer?: () => void;\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 * @param mintRevisionTag - used to generate a `RevisionTag` for each change.\n\t * @param branchTrimmer - an optional event emitter that informs the branch it has been trimmed. If this is not supplied, then the branch must\n\t * never be trimmed. See {@link BranchTrimmingEvents} for details on trimming.\n\t */\n\tpublic constructor(\n\t\tprivate head: GraphCommit<TChange>,\n\t\tpublic readonly changeFamily: ChangeFamily<TEditor, TChange, TChangeProcessingContext>,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t\tprivate readonly branchTrimmer?: Listenable<BranchTrimmingEvents>,\n\t\tprivate readonly telemetryEventBatcher?: TelemetryEventBatcher<\n\t\t\tkeyof RebaseStatsWithDuration\n\t\t>,\n\t) {\n\t\tthis.editor = this.changeFamily.buildEditor(mintRevisionTag, (change) =>\n\t\t\tthis.apply(change, CommitKind.Default, undefined),\n\t\t);\n\t\tthis.unsubscribeBranchTrimmer = branchTrimmer?.on(\"ancestryTrimmed\", (commit) => {\n\t\t\tthis.#events.emit(\"ancestryTrimmed\", commit);\n\t\t});\n\t}\n\n\t/**\n\t * Sets the head of this branch.\n\t * @remarks This is a \"manual override\" of sorts, for when the branch needs to be set to a certain state without going through the usual flow of edits.\n\t * This might be necessary as a performance optimization, or to prevent parts of the system updating incorrectly (this method emits no change events!).\n\t */\n\tpublic setHead(head: GraphCommit<TChange>): void {\n\t\tthis.assertNotDisposed();\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 kind - the kind of change to apply\n\t * @param customMetadata - {@link GraphCommit.customMetadata | metadata} to attach to the new commit.\n\t * Callers reconstructing an existing commit, rather than minting one, must pass that commit's metadata.\n\t * @returns the change that was applied and the new head commit of the branch\n\t */\n\tpublic apply(\n\t\tchange: TaggedChange<TChange>,\n\t\tkind: CommitKind,\n\t\tcustomMetadata: CustomMetadataTree | undefined,\n\t): void {\n\t\tthis.assertNotDisposed();\n\n\t\tconst revisionTag = change.revision;\n\t\tassert(revisionTag !== undefined, 0xa49 /* Revision tag must be provided */);\n\n\t\tconst newHead = mintCommit(this.head, {\n\t\t\trevision: revisionTag,\n\t\t\tchange: change.change,\n\t\t\tcustomMetadata,\n\t\t});\n\n\t\tconst changeEvent = {\n\t\t\ttype: \"append\",\n\t\t\tkind,\n\t\t\tchange,\n\t\t\tnewCommits: [newHead],\n\t\t} as const;\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t}\n\n\t/**\n\t * Notifies the branch that a commit has been sequenced by the sequencing service.\n\t * @param commit - The commit that was sequenced\n\t */\n\tpublic commitWasSequenced(commit: GraphCommit<TChange>): void {\n\t\tthis.#events.emit(\"commitSequenced\", commit);\n\t}\n\n\t/**\n\t * Gets 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 * Gets the number of commits in this branch.\n\t * This includes commits on ancestor branches but excludes the sentinel commit at the root of all branches.\n\t * @remarks\n\t * This method has linear complexity in the number of commits in the branch.\n\t * See {@link BranchCommitCounter} for a cached version.\n\t */\n\tpublic getCommitCount(): number {\n\t\tlet count = 0;\n\t\tfor (\n\t\t\tlet commit: GraphCommit<TChange> | undefined = this.head;\n\t\t\tcommit !== undefined;\n\t\t\tcommit = commit.parent\n\t\t) {\n\t\t\tcount++;\n\t\t}\n\t\t// Exclude the sentinel commit that serves as the base to all branches.\n\t\treturn count - 1;\n\t}\n\n\t/**\n\t * Spawn a new branch that is based off of the current state of this branch.\n\t * @param commit - The commit to base the new branch off of. Defaults to the head of this branch.\n\t * @param mintRevisionTag - used to generate a `RevisionTag` for each change.\n\t * @remarks Changes made to the new branch will not be applied to this branch until the new branch is {@link SharedTreeBranch.merge | merged} back in.\n\t * Forks created during a transaction will be disposed when the transaction ends.\n\t */\n\tpublic fork(\n\t\tcommit: GraphCommit<TChange> = this.head,\n\t\tmintRevisionTag: () => RevisionTag = this.mintRevisionTag,\n\t): SharedTreeBranch<TEditor, TChange, TChangeProcessingContext> {\n\t\tthis.assertNotDisposed();\n\t\tconst fork = new SharedTreeBranch(\n\t\t\tcommit,\n\t\t\tthis.changeFamily,\n\t\t\tmintRevisionTag,\n\t\t\tthis.branchTrimmer,\n\t\t);\n\t\tthis.#events.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, TChangeProcessingContext>,\n\t\tupTo = branch.getHead(),\n\t): void {\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;\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\t\tassert(hasSome(targetCommits), 0xa83 /* Expected commit(s) for a non no-op rebase */);\n\n\t\tconst newCommits = [...targetCommits, ...sourceCommits];\n\t\tconst changeEvent = {\n\t\t\ttype: \"rebase\",\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\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = newSourceHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t}\n\n\t/**\n\t * Remove a range of commits from this branch.\n\t * @param commit - All commits after (but not including) this commit will be removed.\n\t * @returns The net change to this branch and the commits that were removed from this branch.\n\t */\n\tpublic removeAfter(commit: GraphCommit<TChange>): void {\n\t\tif (commit === this.head) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst removedCommits: GraphCommit<TChange>[] = [];\n\t\tconst inverses: TaggedChange<TChange>[] = [];\n\t\tfindAncestor([this.head, removedCommits], (c) => {\n\t\t\t// TODO: Pull this side effect out if/when more diverse ancestry walking helpers are available\n\t\t\tif (c !== commit) {\n\t\t\t\tconst revision = this.mintRevisionTag();\n\t\t\t\tconst inverse = this.changeFamily.rebaser.invert(c, true, revision);\n\t\t\t\tinverses.push(tagRollbackInverse(inverse, revision, c.revision));\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\treturn true;\n\t\t});\n\t\tassert(hasSome(removedCommits), 0xa84 /* Commit must be in the branch's ancestry */);\n\n\t\tconst change = makeAnonChange(this.changeFamily.rebaser.compose(inverses));\n\t\tconst changeEvent = {\n\t\t\ttype: \"remove\",\n\t\t\tchange,\n\t\t\tremovedCommits,\n\t\t} as const;\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = commit;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\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 commits that were added to this branch by the merge, or undefined if nothing changed\n\t */\n\tpublic merge(\n\t\tbranch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,\n\t): { sourceCommits: GraphCommit<TChange>[] } | undefined {\n\t\tthis.assertNotDisposed();\n\t\tbranch.assertNotDisposed();\n\n\t\tif (branch === this) {\n\t\t\treturn undefined;\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\tassert(hasSome(sourceCommits), 0xa86 /* Expected source commits in non no-op merge */);\n\t\tconst { rebaser } = this.changeFamily;\n\t\tconst changeEvent = defineLazyCachedProperty(\n\t\t\t{\n\t\t\t\ttype: \"append\",\n\t\t\t\tkind: CommitKind.Default,\n\t\t\t\tnewCommits: sourceCommits,\n\t\t\t} as const,\n\t\t\t\"change\",\n\t\t\t() => makeAnonChange(rebaser.compose(sourceCommits)),\n\t\t);\n\n\t\tthis.#events.emit(\"beforeChange\", changeEvent);\n\t\tthis.head = rebaseResult.newSourceHead;\n\t\tthis.#events.emit(\"afterChange\", changeEvent);\n\t\treturn { 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, TChangeProcessingContext>,\n\t\tonto: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,\n\t\tupTo = onto.getHead(),\n\t): BranchRebaseResult<TChange> | undefined {\n\t\tconst { head } = branch;\n\t\tif (head === upTo) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst { duration, output } = measure(() =>\n\t\t\trebaseBranch(\n\t\t\t\tthis.mintRevisionTag,\n\t\t\t\tthis.changeFamily.rebaser,\n\t\t\t\thead,\n\t\t\t\tupTo,\n\t\t\t\tonto.getHead(),\n\t\t\t),\n\t\t);\n\n\t\tthis.telemetryEventBatcher?.accumulateAndLog({ duration, ...output.telemetryProperties });\n\n\t\tif (this.head === output.newSourceHead) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn output;\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\tthis.unsubscribeBranchTrimmer?.();\n\n\t\tthis.disposed = true;\n\t\tthis.#events.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 branch 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 branch - the branch that will be listened to for forks\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 */\n// Branches are invariant over TChange\nexport function onForkTransitive<T extends { events: Listenable<{ fork(t: T): void }> }>(\n\tbranch: T,\n\tonFork: (fork: T) => void,\n): () => void {\n\tconst offs: (() => void)[] = [];\n\toffs.push(\n\t\tbranch.events.on(\"fork\", (fork: T) => {\n\t\t\toffs.push(onForkTransitive(fork, onFork));\n\t\t\tonFork(fork);\n\t\t}),\n\t);\n\treturn () => {\n\t\tfor (const off of offs) {\n\t\t\toff();\n\t\t}\n\t};\n}\n"]}

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

@@ -0,0 +1,31 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import type { ChangeFamilyEditor } from "../core/index.js";
+import type { SharedTreeBranch } from "./branch.js";
+/**
+ * A utility class that counts the number of commits in a branch and keeps the count updated as the branch changes.
+ *
+ * @remarks
+ * This class has no inside knowledge of what the commits represent.
+ * It is therefore oblivious to any scheme where some root commit is considered "special" and should not be counted.
+ */
+export declare class BranchCommitCounter<TEditor extends ChangeFamilyEditor, TChange, TChangeProcessingContext> {
+    private readonly branch;
+    private unsubscribeAfterChange?;
+    private unsubscribeAncestryTrimmed?;
+    private commitCountInitialized;
+    private cachedCommitCount;
+    constructor(branch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>);
+    dispose(): void;
+    /**
+     * Gets the number of commits in the branch.
+     */
+    get count(): number;
+    private subscribeToBranch;
+    private unsubscribeFromBranch;
+    private readonly onAfterBranchChange;
+    private readonly onAncestryTrimmed;
+}
+//# sourceMappingURL=branchCommitCounter.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"branchCommitCounter.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/branchCommitCounter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAe,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAA0B,MAAM,aAAa,CAAC;AAE5E;;;;;;GAMG;AACH,qBAAa,mBAAmB,CAC/B,OAAO,SAAS,kBAAkB,EAClC,OAAO,EACP,wBAAwB;IAQvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANxB,OAAO,CAAC,sBAAsB,CAAC,CAAa;IAC5C,OAAO,CAAC,0BAA0B,CAAC,CAAa;IAChD,OAAO,CAAC,sBAAsB,CAAkB;IAChD,OAAO,CAAC,iBAAiB,CAAa;gBAGpB,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,wBAAwB,CAAC;IAG/E,OAAO,IAAI,IAAI;IAItB;;OAEG;IACH,IAAW,KAAK,IAAI,MAAM,CAOzB;IAED,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAuBlC;IAEF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAUhC;CACF"}

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

@@ -0,0 +1,79 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BranchCommitCounter = void 0;
+const internal_1 = require("@fluidframework/core-utils/internal");
+/**
+ * A utility class that counts the number of commits in a branch and keeps the count updated as the branch changes.
+ *
+ * @remarks
+ * This class has no inside knowledge of what the commits represent.
+ * It is therefore oblivious to any scheme where some root commit is considered "special" and should not be counted.
+ */
+class BranchCommitCounter {
+    constructor(branch) {
+        this.branch = branch;
+        this.commitCountInitialized = false;
+        this.cachedCommitCount = 0;
+        this.onAfterBranchChange = (event) => {
+            if (!this.commitCountInitialized) {
+                return;
+            }
+            switch (event.type) {
+                case "append": {
+                    this.cachedCommitCount += event.newCommits.length;
+                    return;
+                }
+                case "remove": {
+                    this.cachedCommitCount -= event.removedCommits.length;
+                    return;
+                }
+                case "rebase": {
+                    this.cachedCommitCount += event.newCommits.length;
+                    this.cachedCommitCount -= event.removedCommits.length;
+                    return;
+                }
+                default: {
+                    (0, internal_1.unreachableCase)(event);
+                }
+            }
+        };
+        this.onAncestryTrimmed = (trimmedRevisions) => {
+            if (!this.commitCountInitialized) {
+                return;
+            }
+            (0, internal_1.assert)(this.cachedCommitCount >= trimmedRevisions.length, 0xd35 /* Trimmed more commits than exist in the branch */);
+            this.cachedCommitCount = this.cachedCommitCount - trimmedRevisions.length;
+        };
+    }
+    dispose() {
+        this.unsubscribeFromBranch();
+    }
+    /**
+     * Gets the number of commits in the branch.
+     */
+    get count() {
+        if (!this.commitCountInitialized) {
+            this.cachedCommitCount = this.branch.getCommitCount();
+            this.subscribeToBranch();
+            this.commitCountInitialized = true;
+        }
+        return this.cachedCommitCount;
+    }
+    subscribeToBranch() {
+        this.unsubscribeFromBranch();
+        this.unsubscribeAfterChange = this.branch.events.on("afterChange", this.onAfterBranchChange);
+        this.unsubscribeAncestryTrimmed = this.branch.events.on("ancestryTrimmed", this.onAncestryTrimmed);
+    }
+    unsubscribeFromBranch() {
+        this.unsubscribeAfterChange?.();
+        this.unsubscribeAfterChange = undefined;
+        this.unsubscribeAncestryTrimmed?.();
+        this.unsubscribeAncestryTrimmed = undefined;
+    }
+}
+exports.BranchCommitCounter = BranchCommitCounter;
+//# sourceMappingURL=branchCommitCounter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"branchCommitCounter.js","sourceRoot":"","sources":["../../src/shared-tree-core/branchCommitCounter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,kEAA8E;AAK9E;;;;;;GAMG;AACH,MAAa,mBAAmB;IAU/B,YACkB,MAAoE;QAApE,WAAM,GAAN,MAAM,CAA8D;QAJ9E,2BAAsB,GAAY,KAAK,CAAC;QACxC,sBAAiB,GAAW,CAAC,CAAC;QAyCrB,wBAAmB,GAAG,CAAC,KAAsC,EAAQ,EAAE;YACvF,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAClC,OAAO;YACR,CAAC;YAED,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpB,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACf,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;oBAClD,OAAO;gBACR,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACf,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;oBACtD,OAAO;gBACR,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACf,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;oBAClD,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;oBACtD,OAAO;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACT,IAAA,0BAAe,EAAC,KAAK,CAAC,CAAC;gBACxB,CAAC;YACF,CAAC;QACF,CAAC,CAAC;QAEe,sBAAiB,GAAG,CAAC,gBAA+B,EAAQ,EAAE;YAC9E,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAClC,OAAO;YACR,CAAC;YAED,IAAA,iBAAM,EACL,IAAI,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,MAAM,EACjD,KAAK,CAAC,mDAAmD,CACzD,CAAC;YACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,MAAM,CAAC;QAC3E,CAAC,CAAC;IAxEC,CAAC;IAEG,OAAO;QACb,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAW,KAAK;QACf,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAClC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACtD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAC/B,CAAC;IAEO,iBAAiB;QACxB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAClD,aAAa,EACb,IAAI,CAAC,mBAAmB,CACxB,CAAC;QACF,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CACtD,iBAAiB,EACjB,IAAI,CAAC,iBAAiB,CACtB,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC5B,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;QAChC,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;QACxC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAC7C,CAAC;CAsCD;AArFD,kDAqFC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport type { ChangeFamilyEditor, RevisionTag } from \"../core/index.js\";\nimport type { SharedTreeBranch, SharedTreeBranchChange } from \"./branch.js\";\n\n/**\n * A utility class that counts the number of commits in a branch and keeps the count updated as the branch changes.\n *\n * @remarks\n * This class has no inside knowledge of what the commits represent.\n * It is therefore oblivious to any scheme where some root commit is considered \"special\" and should not be counted.\n */\nexport class BranchCommitCounter<\n\tTEditor extends ChangeFamilyEditor,\n\tTChange,\n\tTChangeProcessingContext,\n> {\n\tprivate unsubscribeAfterChange?: () => void;\n\tprivate unsubscribeAncestryTrimmed?: () => void;\n\tprivate commitCountInitialized: boolean = false;\n\tprivate cachedCommitCount: number = 0;\n\n\tpublic constructor(\n\t\tprivate readonly branch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,\n\t) {}\n\n\tpublic dispose(): void {\n\t\tthis.unsubscribeFromBranch();\n\t}\n\n\t/**\n\t * Gets the number of commits in the branch.\n\t */\n\tpublic get count(): number {\n\t\tif (!this.commitCountInitialized) {\n\t\t\tthis.cachedCommitCount = this.branch.getCommitCount();\n\t\t\tthis.subscribeToBranch();\n\t\t\tthis.commitCountInitialized = true;\n\t\t}\n\t\treturn this.cachedCommitCount;\n\t}\n\n\tprivate subscribeToBranch(): void {\n\t\tthis.unsubscribeFromBranch();\n\t\tthis.unsubscribeAfterChange = this.branch.events.on(\n\t\t\t\"afterChange\",\n\t\t\tthis.onAfterBranchChange,\n\t\t);\n\t\tthis.unsubscribeAncestryTrimmed = this.branch.events.on(\n\t\t\t\"ancestryTrimmed\",\n\t\t\tthis.onAncestryTrimmed,\n\t\t);\n\t}\n\n\tprivate unsubscribeFromBranch(): void {\n\t\tthis.unsubscribeAfterChange?.();\n\t\tthis.unsubscribeAfterChange = undefined;\n\t\tthis.unsubscribeAncestryTrimmed?.();\n\t\tthis.unsubscribeAncestryTrimmed = undefined;\n\t}\n\n\tprivate readonly onAfterBranchChange = (event: SharedTreeBranchChange<TChange>): void => {\n\t\tif (!this.commitCountInitialized) {\n\t\t\treturn;\n\t\t}\n\n\t\tswitch (event.type) {\n\t\t\tcase \"append\": {\n\t\t\t\tthis.cachedCommitCount += event.newCommits.length;\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase \"remove\": {\n\t\t\t\tthis.cachedCommitCount -= event.removedCommits.length;\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase \"rebase\": {\n\t\t\t\tthis.cachedCommitCount += event.newCommits.length;\n\t\t\t\tthis.cachedCommitCount -= event.removedCommits.length;\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tdefault: {\n\t\t\t\tunreachableCase(event);\n\t\t\t}\n\t\t}\n\t};\n\n\tprivate readonly onAncestryTrimmed = (trimmedRevisions: RevisionTag[]): void => {\n\t\tif (!this.commitCountInitialized) {\n\t\t\treturn;\n\t\t}\n\n\t\tassert(\n\t\t\tthis.cachedCommitCount >= trimmedRevisions.length,\n\t\t\t0xd35 /* Trimmed more commits than exist in the branch */,\n\t\t);\n\t\tthis.cachedCommitCount = this.cachedCommitCount - trimmedRevisions.length;\n\t};\n}\n"]}

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

@@ -0,0 +1,9 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import type { CustomMetadataTree } from "../core/index.js";
+import type { EncodedCustomMetadataTree } from "./customMetadataFormat.js";
+export declare function encodeCustomMetadataTree(tree: CustomMetadataTree): EncodedCustomMetadataTree;
+export declare function decodeCustomMetadataTree(encoded: EncodedCustomMetadataTree | undefined): CustomMetadataTree | undefined;
+//# sourceMappingURL=customMetadataCodec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customMetadataCodec.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/customMetadataCodec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,kBAAkB,GAAG,yBAAyB,CAS5F;AAED,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,yBAAyB,GAAG,SAAS,GAC5C,kBAAkB,GAAG,SAAS,CAOhC"}

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

@@ -0,0 +1,37 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeCustomMetadataTree = exports.encodeCustomMetadataTree = void 0;
+function encodeCustomMetadataTree(tree) {
+    const encoded = {};
+    if (tree.metadata !== undefined) {
+        encoded.m = tree.metadata;
+    }
+    if (tree.children.length > 0) {
+        encoded.c = tree.children.map(encodeCustomMetadataTree);
+    }
+    return encoded;
+}
+exports.encodeCustomMetadataTree = encodeCustomMetadataTree;
+function decodeCustomMetadataTree(encoded) {
+    if (encoded === undefined) {
+        return undefined;
+    }
+    const decoded = decodeNode(encoded);
+    // A tree in which no node supplied metadata carries no information.
+    return hasMetadata(decoded) ? decoded : undefined;
+}
+exports.decodeCustomMetadataTree = decodeCustomMetadataTree;
+function decodeNode(encoded) {
+    return {
+        metadata: encoded.m,
+        children: encoded.c?.map(decodeNode) ?? [],
+    };
+}
+function hasMetadata(node) {
+    return node.metadata !== undefined || node.children.some(hasMetadata);
+}
+//# sourceMappingURL=customMetadataCodec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customMetadataCodec.js","sourceRoot":"","sources":["../../src/shared-tree-core/customMetadataCodec.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAOH,SAAgB,wBAAwB,CAAC,IAAwB;IAChE,MAAM,OAAO,GAAuC,EAAE,CAAC;IACvD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC3B,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AATD,4DASC;AAED,SAAgB,wBAAwB,CACvC,OAA8C;IAE9C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,oEAAoE;IACpE,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AATD,4DASC;AAED,SAAS,UAAU,CAAC,OAAkC;IACrD,OAAO;QACN,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnB,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE;KAC1C,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAwB;IAC5C,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACvE,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { CustomMetadataTree } from \"../core/index.js\";\nimport type { Mutable } from \"../util/index.js\";\n\nimport type { EncodedCustomMetadataTree } from \"./customMetadataFormat.js\";\n\nexport function encodeCustomMetadataTree(tree: CustomMetadataTree): EncodedCustomMetadataTree {\n\tconst encoded: Mutable<EncodedCustomMetadataTree> = {};\n\tif (tree.metadata !== undefined) {\n\t\tencoded.m = tree.metadata;\n\t}\n\tif (tree.children.length > 0) {\n\t\tencoded.c = tree.children.map(encodeCustomMetadataTree);\n\t}\n\treturn encoded;\n}\n\nexport function decodeCustomMetadataTree(\n\tencoded: EncodedCustomMetadataTree | undefined,\n): CustomMetadataTree | undefined {\n\tif (encoded === undefined) {\n\t\treturn undefined;\n\t}\n\tconst decoded = decodeNode(encoded);\n\t// A tree in which no node supplied metadata carries no information.\n\treturn hasMetadata(decoded) ? decoded : undefined;\n}\n\nfunction decodeNode(encoded: EncodedCustomMetadataTree): CustomMetadataTree {\n\treturn {\n\t\tmetadata: encoded.m,\n\t\tchildren: encoded.c?.map(decodeNode) ?? [],\n\t};\n}\n\nfunction hasMetadata(node: CustomMetadataTree): boolean {\n\treturn node.metadata !== undefined || node.children.some(hasMetadata);\n}\n"]}

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

@@ -0,0 +1,18 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import * as Type from "@sinclair/typebox";
+import { type JsonCompatibleReadOnlyObject } from "../util/index.js";
+/**
+ * The persisted form of a {@link CustomMetadataTree}.
+ * @remarks
+ * The property names (`m` for metadata, `c` for children) are abbreviated and both are optional because
+ * this rides on every annotated op and occupies summary space for as long as its commit survives.
+ */
+export type EncodedCustomMetadataTree = {
+    readonly m?: JsonCompatibleReadOnlyObject;
+    readonly c?: readonly EncodedCustomMetadataTree[];
+};
+export declare const EncodedCustomMetadataTree: Type.TSchema;
+//# sourceMappingURL=customMetadataFormat.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customMetadataFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/customMetadataFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EACN,KAAK,4BAA4B,EAEjC,MAAM,kBAAkB,CAAC;AAE1B;;;;;GAKG;AAIH,MAAM,MAAM,yBAAyB,GAAG;IACvC,QAAQ,CAAC,CAAC,CAAC,EAAE,4BAA4B,CAAC;IAC1C,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,yBAAyB,EAAE,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAYV,CAAC"}

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

@@ -0,0 +1,15 @@
+"use strict";
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EncodedCustomMetadataTree = void 0;
+const tslib_1 = require("tslib");
+const Type = tslib_1.__importStar(require("@sinclair/typebox"));
+const index_js_1 = require("../util/index.js");
+exports.EncodedCustomMetadataTree = Type.Recursive((Self) => Type.Object({
+    m: Type.Optional(Type.Unsafe(Type.Record(Type.String(), index_js_1.JsonCompatibleReadOnlySchema))),
+    c: Type.Optional(Type.Array(Self)),
+}, { additionalProperties: false }));
+//# sourceMappingURL=customMetadataFormat.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customMetadataFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/customMetadataFormat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,gEAA0C;AAE1C,+CAG0B;AAgBb,QAAA,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,CAAC,MAAM,CACV;IACC,CAAC,EAAE,IAAI,CAAC,QAAQ,CACf,IAAI,CAAC,MAAM,CACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,uCAA4B,CAAC,CACxD,CACD;IACD,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;CAClC,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAC0B,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport * as Type from \"@sinclair/typebox\";\n\nimport {\n\ttype JsonCompatibleReadOnlyObject,\n\tJsonCompatibleReadOnlySchema,\n} from \"../util/index.js\";\n\n/**\n * The persisted form of a {@link CustomMetadataTree}.\n * @remarks\n * The property names (`m` for metadata, `c` for children) are abbreviated and both are optional because\n * this rides on every annotated op and occupies summary space for as long as its commit survives.\n */\n// Declared as a type alias rather than an interface so that it satisfies the index signature of\n// `JsonCompatibleReadOnlyObject`, which the encoded message and summary types are constrained to.\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport type EncodedCustomMetadataTree = {\n\treadonly m?: JsonCompatibleReadOnlyObject;\n\treadonly c?: readonly EncodedCustomMetadataTree[];\n};\n\nexport const EncodedCustomMetadataTree = Type.Recursive((Self) =>\n\tType.Object(\n\t\t{\n\t\t\tm: Type.Optional(\n\t\t\t\tType.Unsafe<JsonCompatibleReadOnlyObject>(\n\t\t\t\t\tType.Record(Type.String(), JsonCompatibleReadOnlySchema),\n\t\t\t\t),\n\t\t\t),\n\t\t\tc: Type.Optional(Type.Array(Self)),\n\t\t},\n\t\t{ additionalProperties: false },\n\t),\n) as unknown as Type.TSchema;\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"editManager.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAGN,KAAK,kBAAkB,EACvB,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAMhB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACN,gBAAgB,EAGhB,KAAK,QAAQ,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAEX,SAAS,EAET,eAAe,EACf,oBAAoB,EACpB,MAAM,+BAA+B,CAAC;AASvC,eAAO,MAAM,6BAA6B,EAAE,SAA0C,CAAC;AAkBvF;;;GAGG;AAEH,qBAAa,WAAW,CACvB,OAAO,SAAS,kBAAkB,EAClC,UAAU,EACV,wBAAwB,GAAG,KAAK;aAkDf,YAAY,EAAE,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,CAAC;aACzE,cAAc,EAAE,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IAEvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IArD/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IAEjE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAG3B;IAEJ;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAGK;IAEnC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB,CAAiC;IAE9D;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAA0B;IAE3C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAEzB;IAEb;;;;;;OAMG;gBAEc,YAAY,EAAE,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,CAAC,EACzE,cAAc,EAAE,SAAS,EACxB,eAAe,EAAE,MAAM,WAAW,EAClC,qBAAqB,CAAC,cAAa,QAAQ,KAAK,IAAI,aAAA,EACrE,MAAM,CAAC,EAAE,kBAAkB,EACV,aAAa,GAAE,OAAe;IA6BzC,cAAc,CACpB,QAAQ,EAAE,QAAQ,GAChB,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAwB,CAAC;IAI3D,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAIlE,OAAO,CAAC,eAAe;IAUvB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,aAAa;IAiBrB;;OAEG;IACI,uBAAuB,IAAI,SAAS,GAAG,SAAS;IAcvD;;;;;;OAMG;IACI,4BAA4B,CAClC,qBAAqB,EAAE,SAAS,EAChC,WAAW,UAAO,GAChB,IAAI;IAgBP;;;OAGG;IACH,OAAO,CAAC,WAAW;IAiFZ,OAAO,IAAI,OAAO;IAUlB,cAAc,IAAI,WAAW,CAAC,UAAU,CAAC;IA0BzC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI;IA2BpD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC;IAIzD,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU,EAAE;IAIjD,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,EAAE;IAI9D,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,WAAW,CAAC,UAAU,CAAC,EAAE;IAK9E;;;;;;;OAOG;IACI,sBAAsB,IAAI,MAAM;IAQhC,sBAAsB,CAC5B,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,SAAS,EAClC,QAAQ,EAAE,QAAQ,EAClB,UAAU,CAAC,EAAE,MAAM,GACjB,IAAI;IAWA,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAW3D,kBAAkB,IAAI,QAAQ,EAAE;IAIhC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAM7C,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,kBAAkB;IAwB1B;;;;;;;;OAQG;IAEI,mBAAmB,CACzB,UAAU,EAAE,SAAS,WAAW,CAAC,UAAU,CAAC,EAAE,EAC9C,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,SAAS,EAClC,QAAQ,EAAE,QAAQ,GAChB,IAAI;IAwDA,eAAe,CACrB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,WAAW,GACnB,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;CAS7E;AAED;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,UAAU;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/E;AAED,MAAM,WAAW,uBAAuB,CAAC,UAAU;IAClD,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;IACvD,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,SAAS,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;CACrF"}
+{"version":3,"file":"editManager.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.ts"],"names":[],"mappings":"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"}

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

@@ -68,6 +68,7 @@ class EditManager {
         this.trunkBase = {
             revision: rootRevision,
             change: changeFamily.rebaser.compose([]),
+            customMetadata: undefined,
         };
         if (logger !== undefined) {
             this.telemetryEventBatcher = new internal_2.TelemetryEventBatcher({
@@ -216,6 +217,10 @@ class EditManager {
         // The minimum sequence number informs us that all peer branches are at least caught up to the tail commit,
         // so rebase them accordingly. This is necessary to prevent peer branches from referencing any evicted commits.
         mainBranch.trimHistory(latestEvicted, sequenceId);
+        // Custom metadata shares the lifetime of its commit, so it must be dropped when the commit is
+        // trimmed. The new trunk base stays reachable as the sentinel for the remaining history, so its
+        // metadata is cleared rather than trapped; fully evicted commits get the throwing trap below.
+        newTrunkBase.customMetadata = undefined;
         // Only the last trimmed commit, which is the new trunk base, should remain accessible.
         for (const commit of trimmedCommits.slice(0, -1)) {
             Reflect.defineProperty(commit, "change", {
@@ -227,6 +232,9 @@ class EditManager {
             Reflect.defineProperty(commit, "parent", {
                 get: () => (0, internal_1.fail)(0xa60 /* Should not access 'parent' property of an evicted commit */),
             });
+            Reflect.defineProperty(commit, "customMetadata", {
+                get: () => (0, internal_1.fail)(0xd36 /* Should not access 'customMetadata' property of an evicted commit */),
+            });
         }
         // Dropping the parent field removes (transitively) all references to the evicted commits so they can be garbage collected.
         delete newTrunkBase.parent;
@@ -244,11 +252,13 @@ class EditManager {
     getSummaryData() {
         // Trimming the trunk before serializing ensures that the trunk data in the summary is as minimal as possible.
         this.trimHistory();
+        const mainBranch = this.getSharedBranch("main");
         const minSeqNumberToSummarize = {
             sequenceNumber: (0, index_js_2.brand)(this.minimumSequenceNumber + 1),
         };
-        let minBaseSeqId = minSeqNumberToSummarize;
-        const mainBranch = this.getSharedBranch("main");
+        let minBaseSeqId = this.retainHistory
+            ? (mainBranch.sequenceIdToCommit.minKey() ?? minimumPossibleSequenceId)
+            : minSeqNumberToSummarize;
         const branches = new Map();
         for (const [branchId, branch] of this.sharedBranches) {
             if (branchId !== "main") {
@@ -498,7 +508,7 @@ class SharedBranch {
         else {
             // Otherwise, push the changes to the peer local branch and merge the branch into the trunk.
             for (const newCommit of newCommits) {
-                peerLocalBranch.apply((0, index_js_1.tagChange)(newCommit.change, newCommit.revision));
+                peerLocalBranch.apply((0, index_js_1.tagChange)(newCommit.change, newCommit.revision), index_js_1.CommitKind.Default, newCommit.customMetadata);
             }
             const result = this.trunk.merge(peerLocalBranch);
             if (result !== undefined) {
@@ -675,6 +685,7 @@ class SharedBranch {
                 revision: c.revision,
                 sequenceNumber: metadata.sequenceId.sequenceNumber,
                 sessionId: metadata.sessionId,
+                customMetadata: c.customMetadata,
             };
             if (metadata.sequenceId.indexInBatch !== undefined) {
                 commit.indexInBatch = metadata.sequenceId.indexInBatch;
@@ -695,6 +706,7 @@ class SharedBranch {
                             change: c.change,
                             revision: c.revision,
                             sessionId,
+                            customMetadata: c.customMetadata,
                         };
                         return commit;
                     }),