@fluidframework/tree 2.61.0 → 2.62.0

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

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

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

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import type { SequenceId } from "./editManagerFormat.js";
+import type { SequenceId } from "./editManagerFormatCommons.js";
 /**
  * Compares two sequenceIds. Returns a negative number if a \< b, a positive number if a \> b, and 0 if a === b.
  * Note that this handles cases where indexInBatch is Number.POSITIVE_INFINITY.

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceIdUtils.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,MAAO,UAAU,KAAK,UAAU,KAAG,MAKlB,CAAC;AACnD,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,KAAG,OAC/B,CAAC;AAClC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU,KAAG,UACtB,CAAC;AACxC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU,KAAG,UACtB,CAAC;AACxC;;;;;;GAMG;AACH,eAAO,MAAM,iCAAiC,eAAgB,UAAU,KAAG,UAc1E,CAAC"}
+{"version":3,"file":"sequenceIdUtils.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,MAAO,UAAU,KAAK,UAAU,KAAG,MAKlB,CAAC;AACnD,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,KAAG,OAC/B,CAAC;AAClC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU,KAAG,UACtB,CAAC;AACxC,eAAO,MAAM,aAAa,MAAO,UAAU,KAAK,UAAU,KAAG,UACtB,CAAC;AACxC;;;;;;GAMG;AACH,eAAO,MAAM,iCAAiC,eAAgB,UAAU,KAAG,UAc1E,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceIdUtils.js","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,kEAA6D;AAE7D,+CAAyC;AAIzC;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,CAAa,EAAE,CAAa,EAAU,EAAE,CAC5E,CAAC,CAAC,cAAc,KAAK,CAAC,CAAC,cAAc;IACpC,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc;IACrC,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY;QAClC,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;AALtC,QAAA,oBAAoB,wBAKkB;AAC5C,MAAM,gBAAgB,GAAG,CAAC,CAAa,EAAE,CAAa,EAAW,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;AADrB,QAAA,gBAAgB,oBACK;AAC3B,MAAM,aAAa,GAAG,CAAC,CAAa,EAAE,CAAa,EAAc,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAD3B,QAAA,aAAa,iBACc;AACjC,MAAM,aAAa,GAAG,CAAC,CAAa,EAAE,CAAa,EAAc,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAD3B,QAAA,aAAa,iBACc;AACxC;;;;;;GAMG;AACI,MAAM,iCAAiC,GAAG,CAAC,UAAsB,EAAc,EAAE;IACvF,IAAA,iBAAM,EACL,UAAU,CAAC,YAAY,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EACjF,KAAK,CAAC,uCAAuC,CAC7C,CAAC;IACF,OAAO,UAAU,CAAC,YAAY,KAAK,SAAS,IAAI,UAAU,CAAC,YAAY,KAAK,CAAC;QAC5E,CAAC,CAAC;YACA,cAAc,EAAE,IAAA,gBAAK,EAAC,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;YACpD,YAAY,EAAE,MAAM,CAAC,iBAAiB;SACtC;QACF,CAAC,CAAC;YACA,cAAc,EAAE,IAAA,gBAAK,EAAC,UAAU,CAAC,cAAc,CAAC;YAChD,YAAY,EAAE,UAAU,CAAC,YAAY,GAAG,CAAC;SACzC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,iCAAiC,qCAc5C","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 { brand } from \"../util/index.js\";\n\nimport type { SequenceId } from \"./editManagerFormat.js\";\n\n/**\n * Compares two sequenceIds. Returns a negative number if a \\< b, a positive number if a \\> b, and 0 if a === b.\n * Note that this handles cases where indexInBatch is Number.POSITIVE_INFINITY.\n */\nexport const sequenceIdComparator = (a: SequenceId, b: SequenceId): number =>\n\ta.sequenceNumber !== b.sequenceNumber\n\t\t? a.sequenceNumber - b.sequenceNumber\n\t\t: a.indexInBatch === b.indexInBatch\n\t\t\t? 0\n\t\t\t: (a.indexInBatch ?? 0) - (b.indexInBatch ?? 0);\nexport const equalSequenceIds = (a: SequenceId, b: SequenceId): boolean =>\n\tsequenceIdComparator(a, b) === 0;\nexport const minSequenceId = (a: SequenceId, b: SequenceId): SequenceId =>\n\tsequenceIdComparator(a, b) < 0 ? a : b;\nexport const maxSequenceId = (a: SequenceId, b: SequenceId): SequenceId =>\n\tsequenceIdComparator(a, b) > 0 ? a : b;\n/**\n * Returns the upper bound (maximum possible) sequenceId that can occur just before the given sequenceId.\n * Some examples:\n * 1. sequenceId = \\{ sequenceNumber: 1, indexInBatch: 2 \\}. The upper bound is \\{ sequenceNumber: 1, indexInBatch: 1 \\}.\n * 2. sequenceId = \\{ sequenceNumber: 2 \\}. The upper bound is \\{ sequenceNumber: 1, indexInBatch: Number.POSITIVE_INFINITY \\}.\n * The indexInBatch value of the previous commit will depend on how many ops were in the previous batch of messages received.\n */\nexport const getUpperBoundOfPreviousSequenceId = (sequenceId: SequenceId): SequenceId => {\n\tassert(\n\t\tsequenceId.indexInBatch === undefined || Number.isFinite(sequenceId.indexInBatch),\n\t\t0xabc /* indexInBatch must not be infinity */,\n\t);\n\treturn sequenceId.indexInBatch === undefined || sequenceId.indexInBatch === 0\n\t\t? {\n\t\t\t\tsequenceNumber: brand(sequenceId.sequenceNumber - 1),\n\t\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t\t}\n\t\t: {\n\t\t\t\tsequenceNumber: brand(sequenceId.sequenceNumber),\n\t\t\t\tindexInBatch: sequenceId.indexInBatch - 1,\n\t\t\t};\n};\n"]}
+{"version":3,"file":"sequenceIdUtils.js","sourceRoot":"","sources":["../../src/shared-tree-core/sequenceIdUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,kEAA6D;AAE7D,+CAAyC;AAIzC;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,CAAa,EAAE,CAAa,EAAU,EAAE,CAC5E,CAAC,CAAC,cAAc,KAAK,CAAC,CAAC,cAAc;IACpC,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc;IACrC,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY;QAClC,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;AALtC,QAAA,oBAAoB,wBAKkB;AAC5C,MAAM,gBAAgB,GAAG,CAAC,CAAa,EAAE,CAAa,EAAW,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;AADrB,QAAA,gBAAgB,oBACK;AAC3B,MAAM,aAAa,GAAG,CAAC,CAAa,EAAE,CAAa,EAAc,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAD3B,QAAA,aAAa,iBACc;AACjC,MAAM,aAAa,GAAG,CAAC,CAAa,EAAE,CAAa,EAAc,EAAE,CACzE,IAAA,4BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAD3B,QAAA,aAAa,iBACc;AACxC;;;;;;GAMG;AACI,MAAM,iCAAiC,GAAG,CAAC,UAAsB,EAAc,EAAE;IACvF,IAAA,iBAAM,EACL,UAAU,CAAC,YAAY,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EACjF,KAAK,CAAC,uCAAuC,CAC7C,CAAC;IACF,OAAO,UAAU,CAAC,YAAY,KAAK,SAAS,IAAI,UAAU,CAAC,YAAY,KAAK,CAAC;QAC5E,CAAC,CAAC;YACA,cAAc,EAAE,IAAA,gBAAK,EAAC,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;YACpD,YAAY,EAAE,MAAM,CAAC,iBAAiB;SACtC;QACF,CAAC,CAAC;YACA,cAAc,EAAE,IAAA,gBAAK,EAAC,UAAU,CAAC,cAAc,CAAC;YAChD,YAAY,EAAE,UAAU,CAAC,YAAY,GAAG,CAAC;SACzC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,iCAAiC,qCAc5C","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 { brand } from \"../util/index.js\";\n\nimport type { SequenceId } from \"./editManagerFormatCommons.js\";\n\n/**\n * Compares two sequenceIds. Returns a negative number if a \\< b, a positive number if a \\> b, and 0 if a === b.\n * Note that this handles cases where indexInBatch is Number.POSITIVE_INFINITY.\n */\nexport const sequenceIdComparator = (a: SequenceId, b: SequenceId): number =>\n\ta.sequenceNumber !== b.sequenceNumber\n\t\t? a.sequenceNumber - b.sequenceNumber\n\t\t: a.indexInBatch === b.indexInBatch\n\t\t\t? 0\n\t\t\t: (a.indexInBatch ?? 0) - (b.indexInBatch ?? 0);\nexport const equalSequenceIds = (a: SequenceId, b: SequenceId): boolean =>\n\tsequenceIdComparator(a, b) === 0;\nexport const minSequenceId = (a: SequenceId, b: SequenceId): SequenceId =>\n\tsequenceIdComparator(a, b) < 0 ? a : b;\nexport const maxSequenceId = (a: SequenceId, b: SequenceId): SequenceId =>\n\tsequenceIdComparator(a, b) > 0 ? a : b;\n/**\n * Returns the upper bound (maximum possible) sequenceId that can occur just before the given sequenceId.\n * Some examples:\n * 1. sequenceId = \\{ sequenceNumber: 1, indexInBatch: 2 \\}. The upper bound is \\{ sequenceNumber: 1, indexInBatch: 1 \\}.\n * 2. sequenceId = \\{ sequenceNumber: 2 \\}. The upper bound is \\{ sequenceNumber: 1, indexInBatch: Number.POSITIVE_INFINITY \\}.\n * The indexInBatch value of the previous commit will depend on how many ops were in the previous batch of messages received.\n */\nexport const getUpperBoundOfPreviousSequenceId = (sequenceId: SequenceId): SequenceId => {\n\tassert(\n\t\tsequenceId.indexInBatch === undefined || Number.isFinite(sequenceId.indexInBatch),\n\t\t0xabc /* indexInBatch must not be infinity */,\n\t);\n\treturn sequenceId.indexInBatch === undefined || sequenceId.indexInBatch === 0\n\t\t? {\n\t\t\t\tsequenceNumber: brand(sequenceId.sequenceNumber - 1),\n\t\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t\t}\n\t\t: {\n\t\t\t\tsequenceNumber: brand(sequenceId.sequenceNumber),\n\t\t\t\tindexInBatch: sequenceId.indexInBatch - 1,\n\t\t\t};\n};\n"]}

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

@@ -10,7 +10,7 @@ import type { IChannelView, IFluidSerializer } from "@fluidframework/shared-obje
 import type { ICodecOptions } from "../codec/index.js";
 import { type ChangeFamily, type ChangeFamilyEditor, type GraphCommit, type RevisionTag, type SchemaAndPolicy, type SchemaPolicy, type TreeStoredSchemaRepository } from "../core/index.js";
 import { type JsonCompatibleReadOnly, type Breakable, type WithBreakable } from "../util/index.js";
-import type { SharedTreeBranch } from "./branch.js";
+import type { BranchId, SharedTreeBranch } from "./branch.js";
 import { BranchCommitEnricher } from "./branchCommitEnricher.js";
 import { type ChangeEnricherReadonlyCheckout } from "./changeEnricher.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
@@ -29,7 +29,8 @@ export declare class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
     readonly sharedObject: IChannelView & IFluidLoadable;
     readonly serializer: IFluidSerializer;
     readonly submitLocalMessage: (content: unknown, localOpMetadata?: unknown) => void;
-    private readonly idCompressor;
+    protected readonly changeFamily: ChangeFamily<TEditor, TChange>;
+    protected readonly idCompressor: IIdCompressor;
     readonly getEditor: () => TEditor;
     private readonly editManager;
     private readonly summarizables;
@@ -49,8 +50,7 @@ export declare class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
      * and an op needs to be interpreted which isn't written with the current configuration).
      */
     private readonly messageCodec;
-    private readonly resubmitMachine;
-    readonly commitEnricher: BranchCommitEnricher<TChange>;
+    private readonly enrichers;
     readonly mintRevisionTag: () => RevisionTag;
     private readonly schemaAndPolicy;
     /**
@@ -64,6 +64,7 @@ export declare class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
     constructor(breaker: Breakable, sharedObject: IChannelView & IFluidLoadable, serializer: IFluidSerializer, submitLocalMessage: (content: unknown, localOpMetadata?: unknown) => void, logger: ITelemetryBaseLogger | undefined, summarizables: readonly Summarizable[], changeFamily: ChangeFamily<TEditor, TChange>, options: ICodecOptions, formatOptions: ExplicitCoreCodecVersions, idCompressor: IIdCompressor, schema: TreeStoredSchemaRepository, schemaPolicy: SchemaPolicy, resubmitMachine?: ResubmitMachine<TChange>, enricher?: ChangeEnricherReadonlyCheckout<TChange>, getEditor?: () => TEditor);
     summarizeCore(serializer: IFluidSerializer, telemetryContext?: ITelemetryContext, incrementalSummaryContext?: IExperimentalIncrementalSummaryContext, fullTree?: boolean): ISummaryTreeWithStats;
     loadCore(services: IChannelStorageService): Promise<void>;
+    private registerSharedBranch;
     private loadSummarizable;
     /**
      * Submits an op to the Fluid runtime containing the given commit
@@ -71,16 +72,29 @@ export declare class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
      * @returns the submitted commit. This is undefined if the underlying `SharedObject` is not attached,
      * and may differ from `commit` due to enrichments like detached tree refreshers.
      */
-    protected submitCommit(commit: GraphCommit<TChange>, schemaAndPolicy: ClonableSchemaAndPolicy, isResubmit: boolean): void;
+    protected submitCommit(branchId: BranchId, commit: GraphCommit<TChange>, schemaAndPolicy: ClonableSchemaAndPolicy, isResubmit: boolean): void;
+    protected submitBranchCreation(branchId: BranchId): void;
+    private submitMessage;
     /**
      * Process a bunch of messages from the runtime. SharedObject will call this method with a bunch of messages.
      */
     processMessagesCore(messagesCollection: IRuntimeMessageCollection): void;
+    private processCommits;
     getLocalBranch(): SharedTreeBranch<TEditor, TChange>;
+    getSharedBranchIds(): string[];
+    createSharedBranch(): string;
+    protected addBranch(branchId: BranchId): void;
+    getSharedBranch(branchId: BranchId): SharedTreeBranch<TEditor, TChange>;
     didAttach(): void;
     reSubmitCore(content: JsonCompatibleReadOnly, localOpMetadata: unknown): void;
     rollback(content: JsonCompatibleReadOnly, localOpMetadata: unknown): void;
     applyStashedOp(content: JsonCompatibleReadOnly): void;
+    protected registerSharedBranchForEditing(branchId: BranchId, enricher: ChangeEnricherReadonlyCheckout<TChange>, resubmitMachine?: ResubmitMachine<TChange>): void;
+    private getResubmitMachine;
+    private tryGetResubmitMachine;
+    getCommitEnricher(branchId: BranchId): BranchCommitEnricher<TChange>;
+    private getEnricherState;
+    private tryGetEnricherState;
 }
 /**
  * Specifies the behavior of a component that puts data in a summary.

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

@@ -1 +1 @@
-{"version":3,"file":"sharedTreeCore.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sharedTreeCore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAE7F,OAAO,KAAK,EAAE,aAAa,EAAa,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EACX,sCAAsC,EACtC,yBAAyB,EACzB,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,8CAA8C,CAAC;AAEtD,OAAO,KAAK,EACX,YAAY,EACZ,gBAAgB,EAChB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAEhB,KAAK,eAAe,EACpB,KAAK,YAAY,EAEjB,KAAK,0BAA0B,EAC/B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACN,KAAK,sBAAsB,EAE3B,KAAK,SAAS,EACd,KAAK,aAAa,EAGlB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,KAAK,8BAA8B,EAAsB,MAAM,qBAAqB,CAAC;AAQ9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,MAAM,WAAW,yBAAyB;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC/D,MAAM,EAAE,0BAA0B,CAAC;CACnC;AAED;;GAEG;AACH,qBACa,cAAc,CAAC,OAAO,SAAS,kBAAkB,EAAE,OAAO,CACtE,YAAW,aAAa;aA2CP,OAAO,EAAE,SAAS;aAClB,YAAY,EAAE,YAAY,GAAG,cAAc;aAC3C,UAAU,EAAE,gBAAgB;aAC5B,kBAAkB,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,OAAO,KAAK,IAAI;IAMzF,OAAO,CAAC,QAAQ,CAAC,YAAY;aAKb,SAAS,EAAE,MAAM,OAAO;IAvDzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgE;IAC5F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+D;IAC7F;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAAwD;IAEhF;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAK3B;IAEF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAC3D,SAAgB,cAAc,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9D,SAAgB,eAAe,EAAE,MAAM,WAAW,CAAC;IAEnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAE1D;;;;;;;OAOG;gBAEc,OAAO,EAAE,SAAS,EAClB,YAAY,EAAE,YAAY,GAAG,cAAc,EAC3C,UAAU,EAAE,gBAAgB,EAC5B,kBAAkB,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,OAAO,KAAK,IAAI,EACzF,MAAM,EAAE,oBAAoB,GAAG,SAAS,EACxC,aAAa,EAAE,SAAS,YAAY,EAAE,EACtC,YAAY,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,EAC5C,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,yBAAyB,EACvB,YAAY,EAAE,aAAa,EAC5C,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,YAAY,EAC1B,eAAe,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,EAC1C,QAAQ,CAAC,EAAE,8BAA8B,CAAC,OAAO,CAAC,EAClC,SAAS,GAAE,MAAM,OAA4C;IAgFvE,aAAa,CACnB,UAAU,EAAE,gBAAgB,EAC5B,gBAAgB,CAAC,EAAE,iBAAiB,EACpC,yBAAyB,CAAC,EAAE,sCAAsC,EAClE,QAAQ,CAAC,EAAE,OAAO,GAChB,qBAAqB;IA8BX,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;YA8BxD,gBAAgB;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CACrB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAC5B,eAAe,EAAE,uBAAuB,EACxC,UAAU,EAAE,OAAO,GACjB,IAAI;IA4CP;;OAEG;IACI,mBAAmB,CAAC,kBAAkB,EAAE,yBAAyB,GAAG,IAAI;IAuCxE,cAAc,IAAI,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC;IAIpD,SAAS,IAAI,IAAI;IAIjB,YAAY,CAAC,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IA0B7E,QAAQ,CAAC,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IAezE,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;CAO5D;AASD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;;;;;;;;OAaG;IACH,SAAS,CAAC,KAAK,EAAE;QAChB,SAAS,EAAE,yBAAyB,CAAC;QACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;QACrC,yBAAyB,CAAC,EAAE,sCAAsC,CAAC;KACnE,GAAG,qBAAqB,CAAC;IAE1B;;;;;OAKG;IACH,IAAI,CAAC,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClF;AAED;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,QAAQ,EAAE,OAAO,KAAK,MAAM,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC"}
+{"version":3,"file":"sharedTreeCore.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/sharedTreeCore.ts"],"names":[],"mappings":"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"}

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

@@ -81,6 +81,7 @@ let SharedTreeCore = (() => {
             this.sharedObject = sharedObject;
             this.serializer = serializer;
             this.submitLocalMessage = submitLocalMessage;
+            this.changeFamily = changeFamily;
             this.idCompressor = idCompressor;
             this.getEditor = getEditor;
             /**
@@ -89,6 +90,7 @@ let SharedTreeCore = (() => {
              * Is `undefined` after (and only after) this instance is attached.
              */
             this.detachedRevision = editManager_js_1.minimumPossibleSequenceNumber;
+            this.enrichers = new Map();
             this.schemaAndPolicy = {
                 schema,
                 policy: schemaPolicy,
@@ -104,18 +106,8 @@ let SharedTreeCore = (() => {
              * This is used rather than the Fluid client ID because the Fluid client ID is not stable across reconnections.
              */
             const localSessionId = idCompressor.localSessionId;
-            this.editManager = new editManager_js_1.EditManager(changeFamily, localSessionId, this.mintRevisionTag, rebaseLogger);
-            this.editManager.localBranch.events.on("beforeChange", (change) => {
-                if (this.detachedRevision === undefined) {
-                    // Commit enrichment is only necessary for changes that will be submitted as ops, and changes issued while detached are not submitted.
-                    this.commitEnricher.processChange(change);
-                }
-                if (change.type === "append") {
-                    for (const commit of change.newCommits) {
-                        this.submitCommit(commit, this.schemaAndPolicy, false);
-                    }
-                }
-            });
+            this.editManager = new editManager_js_1.EditManager(changeFamily, localSessionId, this.mintRevisionTag, (branchId) => this.registerSharedBranch(branchId), rebaseLogger);
+            this.registerSharedBranch("main");
             const revisionTagCodec = new index_js_1.RevisionTagCodec(idCompressor);
             const editManagerCodec = (0, editManagerCodecs_js_1.makeEditManagerCodec)(this.editManager.changeFamily.codecs, revisionTagCodec, options, formatOptions.editManager);
             this.summarizables = [
@@ -124,11 +116,7 @@ let SharedTreeCore = (() => {
             ];
             (0, internal_1.assert)(new Set(this.summarizables.map((e) => e.key)).size === this.summarizables.length, 0x350 /* Index summary element keys must be unique */);
             this.messageCodec = (0, messageCodecs_js_1.makeMessageCodec)(changeFamily.codecs, new index_js_1.RevisionTagCodec(idCompressor), options, formatOptions.message);
-            const changeEnricher = enricher ?? new changeEnricher_js_1.NoOpChangeEnricher();
-            this.resubmitMachine =
-                resubmitMachine ??
-                    new defaultResubmitMachine_js_1.DefaultResubmitMachine((change) => changeFamily.rebaser.invert(change, true, this.mintRevisionTag()), changeEnricher);
-            this.commitEnricher = new branchCommitEnricher_js_1.BranchCommitEnricher(changeFamily.rebaser, changeEnricher);
+            this.registerSharedBranchForEditing("main", enricher ?? new changeEnricher_js_1.NoOpChangeEnricher(), resubmitMachine);
         }
         // TODO: SharedObject's merging of the two summary methods into summarizeCore is not what we want here:
         // We might want to not subclass it, or override/reimplement most of its functionality.
@@ -156,7 +144,7 @@ let SharedTreeCore = (() => {
             return builder.getSummaryTree();
         }
         async loadCore(services) {
-            (0, internal_1.assert)(this.editManager.localBranch.getHead() === this.editManager.getTrunkHead(), 0xaaa /* All local changes should be applied to the trunk before loading from summary */);
+            (0, internal_1.assert)(this.getLocalBranch().getHead() === this.editManager.getTrunkHead("main"), 0xaaa /* All local changes should be applied to the trunk before loading from summary */);
             const [editManagerSummarizer, ...summarizables] = this.summarizables;
             const loadEditManager = this.loadSummarizable(editManagerSummarizer, services);
             const loadSummarizables = summarizables.map(async (s) => this.loadSummarizable(s, services));
@@ -164,8 +152,7 @@ let SharedTreeCore = (() => {
                 // If we are detached but loading from a summary, then we need to update our detached revision to ensure that it is ahead of all detached revisions in the summary.
                 // First, finish loading the edit manager so that we can inspect the sequence numbers of the commits on the trunk.
                 await loadEditManager;
-                const head = this.editManager.getTrunkHead();
-                const latestDetachedSequenceNumber = this.editManager.getSequenceNumber(head);
+                const latestDetachedSequenceNumber = this.editManager.getLatestSequenceNumber();
                 // When we load a summary for a tree that was never attached,
                 // latestDetachedSequenceNumber is either undefined (no commits in summary) or negative (all commits in summary were made while detached).
                 // We only need to update `this.detachedRevision` in the latter case.
@@ -178,6 +165,19 @@ let SharedTreeCore = (() => {
                 await Promise.all([loadEditManager, ...loadSummarizables]);
             }
         }
+        registerSharedBranch(branchId) {
+            this.editManager.getLocalBranch(branchId).events.on("beforeChange", (change) => {
+                if (change.type === "append") {
+                    if (this.detachedRevision === undefined) {
+                        // Commit enrichment is only necessary for changes that will be submitted as ops, and changes issued while detached are not submitted.
+                        this.getCommitEnricher(branchId).processChange(change);
+                    }
+                    for (const commit of change.newCommits) {
+                        this.submitCommit(branchId, commit, this.schemaAndPolicy, false);
+                    }
+                }
+            });
+        }
         async loadSummarizable(summarizable, services) {
             return summarizable.load(scopeStorageService(services, summarizablesTreeKey, summarizable.key), (contents) => this.serializer.parse(contents));
         }
@@ -187,10 +187,10 @@ let SharedTreeCore = (() => {
          * @returns the submitted commit. This is undefined if the underlying `SharedObject` is not attached,
          * and may differ from `commit` due to enrichments like detached tree refreshers.
          */
-        submitCommit(commit, schemaAndPolicy, isResubmit) {
+        submitCommit(branchId, commit, schemaAndPolicy, isResubmit) {
             (0, internal_1.assert)(this.sharedObject.isAttached() === (this.detachedRevision === undefined), 0x95a /* Detached revision should only be set when not attached */);
             const enrichedCommit = this.detachedRevision === undefined && !isResubmit
-                ? this.commitEnricher.enrich(commit)
+                ? this.getCommitEnricher(branchId).enrich(commit)
                 : commit;
             // Edits submitted before the first attach are treated as sequenced because they will be included
             // in the attach summary that is uploaded to the service.
@@ -198,23 +198,31 @@ let SharedTreeCore = (() => {
             if (this.detachedRevision !== undefined) {
                 const newRevision = (0, index_js_2.brand)(this.detachedRevision + 1);
                 this.detachedRevision = newRevision;
-                this.editManager.addSequencedChanges([enrichedCommit], this.editManager.localSessionId, newRevision, this.detachedRevision);
+                this.editManager.addSequencedChanges([enrichedCommit], this.editManager.localSessionId, newRevision, this.detachedRevision, branchId);
                 this.editManager.advanceMinimumSequenceNumber(newRevision, false);
                 return undefined;
             }
-            const message = this.messageCodec.encode({
+            this.submitMessage({
+                type: "commit",
                 commit: enrichedCommit,
                 sessionId: this.editManager.localSessionId,
-            }, {
+                branchId,
+            }, schemaAndPolicy);
+            this.getResubmitMachine(branchId).onCommitSubmitted(enrichedCommit);
+        }
+        submitBranchCreation(branchId) {
+            this.submitMessage({ type: "branch", sessionId: this.editManager.localSessionId, branchId }, this.schemaAndPolicy);
+        }
+        submitMessage(message, schemaAndPolicy) {
+            const encodedMessage = this.messageCodec.encode(message, {
                 idCompressor: this.idCompressor,
                 schema: schemaAndPolicy,
             });
-            this.submitLocalMessage(message, {
+            this.submitLocalMessage(encodedMessage, {
                 // Clone the schema to ensure that during resubmit the schema has not been mutated by later changes
                 schema: schemaAndPolicy.schema.clone(),
                 policy: schemaAndPolicy.policy,
             });
-            this.resubmitMachine.onCommitSubmitted(enrichedCommit);
         }
         /**
          * Process a bunch of messages from the runtime. SharedObject will call this method with a bunch of messages.
@@ -223,66 +231,182 @@ let SharedTreeCore = (() => {
             const { envelope, local, messagesContent } = messagesCollection;
             const commits = [];
             let messagesSessionId;
+            let branchId;
+            const processBunch = (branch) => {
+                (0, internal_1.assert)(messagesSessionId !== undefined, 0xada /* Messages must have a session ID */);
+                this.processCommits(messagesSessionId, (0, index_js_2.brand)(envelope.sequenceNumber), (0, index_js_2.brand)(envelope.referenceSequenceNumber), local, branch, commits);
+                commits.length = 0;
+                branchId = undefined;
+            };
             // Get a list of all the commits from the messages.
             for (const messageContent of messagesContent) {
                 // Empty context object is passed in, as our decode function is schema-agnostic.
-                const { commit, sessionId } = this.messageCodec.decode(messageContent.contents, {
+                const message = this.messageCodec.decode(messageContent.contents, {
                     idCompressor: this.idCompressor,
                 });
-                commits.push(commit);
                 if (messagesSessionId !== undefined) {
-                    (0, internal_1.assert)(messagesSessionId === sessionId, 0xad9 /* All messages in a bunch must have the same session ID */);
+                    (0, internal_1.assert)(messagesSessionId === message.sessionId, 0xad9 /* All messages in a bunch must have the same session ID */);
+                }
+                messagesSessionId = message.sessionId;
+                const type = message.type;
+                switch (type) {
+                    case "commit": {
+                        if (branchId !== undefined && message.branchId !== branchId) {
+                            processBunch(branchId);
+                        }
+                        branchId = message.branchId;
+                        commits.push(message.commit);
+                        break;
+                    }
+                    case "branch": {
+                        if (branchId !== undefined) {
+                            processBunch(branchId);
+                        }
+                        this.editManager.sequenceBranchCreation(messagesSessionId, (0, index_js_2.brand)(envelope.referenceSequenceNumber), message.branchId);
+                        break;
+                    }
+                    default:
+                        (0, internal_1.unreachableCase)(type);
                 }
-                messagesSessionId = sessionId;
             }
-            (0, internal_1.assert)(messagesSessionId !== undefined, 0xada /* Messages must have a session ID */);
-            this.editManager.addSequencedChanges(commits, messagesSessionId, (0, index_js_2.brand)(envelope.sequenceNumber), (0, index_js_2.brand)(envelope.referenceSequenceNumber));
-            // Update the resubmit machine for each commit applied.
-            for (const _ of messagesContent) {
-                this.resubmitMachine.onSequencedCommitApplied(local);
+            if (branchId !== undefined) {
+                processBunch(branchId);
             }
             this.editManager.advanceMinimumSequenceNumber((0, index_js_2.brand)(envelope.minimumSequenceNumber));
         }
+        processCommits(sessionId, sequenceNumber, referenceSequenceNumber, isLocal, branchId, commits) {
+            this.editManager.addSequencedChanges(commits, sessionId, sequenceNumber, referenceSequenceNumber, branchId);
+            // Update the resubmit machine for each commit applied.
+            for (const _ of commits) {
+                this.tryGetResubmitMachine(branchId)?.onSequencedCommitApplied(isLocal);
+            }
+        }
         getLocalBranch() {
-            return this.editManager.localBranch;
+            return this.editManager.getLocalBranch("main");
+        }
+        getSharedBranchIds() {
+            return this.editManager
+                .getSharedBranchIds()
+                .filter((id) => id !== "main")
+                .map((id) => this.idCompressor.decompress(id));
+        }
+        createSharedBranch() {
+            const branchId = this.idCompressor.generateCompressedId();
+            this.addBranch(branchId);
+            this.submitBranchCreation(branchId);
+            return this.idCompressor.decompress(branchId);
+        }
+        addBranch(branchId) {
+            this.editManager.addNewBranch(branchId);
+        }
+        getSharedBranch(branchId) {
+            return this.editManager.getLocalBranch(branchId);
         }
         didAttach() {
             this.detachedRevision = undefined;
         }
         reSubmitCore(content, localOpMetadata) {
             // Empty context object is passed in, as our decode function is schema-agnostic.
-            const { commit: { revision }, } = this.messageCodec.decode(this.serializer.decode(content), {
+            const message = this.messageCodec.decode(this.serializer.decode(content), {
                 idCompressor: this.idCompressor,
             });
-            // If a resubmit phase is not already in progress, then this must be the first commit of a new resubmit phase.
-            if (this.resubmitMachine.isInResubmitPhase === false) {
-                const localCommits = this.editManager.getLocalCommits();
-                const revisionIndex = localCommits.findIndex((c) => c.revision === revision);
-                (0, internal_1.assert)(revisionIndex >= 0, 0xbdb /* revision must exist in local commits */);
-                const toResubmit = localCommits.slice(revisionIndex);
-                this.resubmitMachine.prepareForResubmit(toResubmit);
+            const type = message.type;
+            switch (type) {
+                case "commit": {
+                    const { commit: { revision }, branchId, } = message;
+                    const resubmitMachine = this.getResubmitMachine(branchId);
+                    // If a resubmit phase is not already in progress, then this must be the first commit of a new resubmit phase.
+                    if (resubmitMachine.isInResubmitPhase === false) {
+                        const localCommits = this.editManager.getLocalCommits(branchId);
+                        const revisionIndex = localCommits.findIndex((c) => c.revision === revision);
+                        (0, internal_1.assert)(revisionIndex >= 0, 0xbdb /* revision must exist in local commits */);
+                        const toResubmit = localCommits.slice(revisionIndex);
+                        resubmitMachine.prepareForResubmit(toResubmit);
+                    }
+                    (0, internal_1.assert)(isClonableSchemaPolicy(localOpMetadata), 0x95e /* Local metadata must contain schema and policy. */);
+                    (0, internal_1.assert)(resubmitMachine.isInResubmitPhase !== false, 0x984 /* Invalid resubmit outside of resubmit phase */);
+                    const enrichedCommit = resubmitMachine.peekNextCommit();
+                    this.submitCommit(branchId, enrichedCommit, localOpMetadata, true);
+                    break;
+                }
+                case "branch": {
+                    this.submitBranchCreation(message.branchId);
+                    break;
+                }
+                default:
+                    (0, internal_1.unreachableCase)(type);
             }
-            (0, internal_1.assert)(isClonableSchemaPolicy(localOpMetadata), 0x95e /* Local metadata must contain schema and policy. */);
-            (0, internal_1.assert)(this.resubmitMachine.isInResubmitPhase !== false, 0x984 /* Invalid resubmit outside of resubmit phase */);
-            const enrichedCommit = this.resubmitMachine.peekNextCommit();
-            this.submitCommit(enrichedCommit, localOpMetadata, true);
         }
         rollback(content, localOpMetadata) {
             // Empty context object is passed in, as our decode function is schema-agnostic.
-            const { commit: { revision }, } = this.messageCodec.decode(this.serializer.decode(content), {
+            const message = this.messageCodec.decode(this.serializer.decode(content), {
                 idCompressor: this.idCompressor,
             });
-            const [commit] = this.editManager.findLocalCommit(revision);
-            const { parent } = commit;
-            (0, internal_1.assert)(parent !== undefined, 0xbdc /* must have parent */);
-            const [precedingCommit] = this.editManager.findLocalCommit(parent.revision);
-            this.editManager.localBranch.removeAfter(precedingCommit);
-            this.resubmitMachine.onCommitRollback(commit);
+            const type = message.type;
+            switch (type) {
+                case "commit": {
+                    const { commit: { revision }, branchId, } = message;
+                    const branch = this.editManager.getLocalBranch(branchId);
+                    const head = branch.getHead();
+                    (0, internal_1.assert)(head.revision === revision, 0xc6b /* Can only rollback latest commit */);
+                    const newHead = head.parent ?? (0, internal_1.fail)(0xc6c /* must have parent */);
+                    branch.removeAfter(newHead);
+                    this.getResubmitMachine(branchId).onCommitRollback(head);
+                    break;
+                }
+                case "branch": {
+                    this.editManager.removeBranch(message.branchId);
+                    break;
+                }
+                default:
+                    (0, internal_1.unreachableCase)(type);
+            }
         }
         applyStashedOp(content) {
             // Empty context object is passed in, as our decode function is schema-agnostic.
-            const { commit: { revision, change }, } = this.messageCodec.decode(content, { idCompressor: this.idCompressor });
-            this.editManager.localBranch.apply({ change, revision });
+            const message = this.messageCodec.decode(this.serializer.decode(content), {
+                idCompressor: this.idCompressor,
+            });
+            const type = message.type;
+            switch (type) {
+                case "commit": {
+                    const { commit: { revision, change }, branchId, } = message;
+                    this.editManager.getLocalBranch(branchId).apply({ change, revision });
+                    break;
+                }
+                case "branch": {
+                    this.editManager.addNewBranch(message.branchId);
+                    break;
+                }
+                default:
+                    (0, internal_1.unreachableCase)(type);
+            }
+        }
+        registerSharedBranchForEditing(branchId, enricher, resubmitMachine) {
+            const changeEnricher = enricher ?? new changeEnricher_js_1.NoOpChangeEnricher();
+            const commitEnricher = new branchCommitEnricher_js_1.BranchCommitEnricher(this.changeFamily.rebaser, changeEnricher);
+            (0, internal_1.assert)(!this.enrichers.has(branchId), 0xc6d /* Branch already registered */);
+            this.enrichers.set(branchId, {
+                enricher: commitEnricher,
+                resubmitMachine: resubmitMachine ??
+                    new defaultResubmitMachine_js_1.DefaultResubmitMachine((change) => this.changeFamily.rebaser.invert(change, true, this.mintRevisionTag()), changeEnricher),
+            });
+        }
+        getResubmitMachine(branchId) {
+            return this.getEnricherState(branchId).resubmitMachine;
+        }
+        tryGetResubmitMachine(branchId) {
+            return this.tryGetEnricherState(branchId)?.resubmitMachine;
+        }
+        getCommitEnricher(branchId) {
+            return this.getEnricherState(branchId).enricher;
+        }
+        getEnricherState(branchId) {
+            return (this.tryGetEnricherState(branchId) ??
+                (0, internal_1.fail)(0xc6e /* Expected to have a resubmit machine for this branch */));
+        }
+        tryGetEnricherState(branchId) {
+            return this.enrichers.get(branchId);
         }
     };
     __setFunctionName(_classThis, "SharedTreeCore");