npm - @fluidframework/tree - Versions diffs - 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2507) hide show

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

@@ -2,12 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { assert } from "@fluidframework/core-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
-import { assert } from "@fluidframework/core-utils";
-import { brand, fail, getOrCreate, mapIterable, } from "../util/index.js";
 import { findAncestor, findCommonAncestor, mintCommit, rebaseChange, } from "../core/index.js";
-import { getChangeReplaceType, onForkTransitive, SharedTreeBranch } from "./branch.js";
-import { sequenceIdComparator, equalSequenceIds, minSequenceId, decrementSequenceId, maxSequenceId, } from "./sequenceIdUtils.js";
+import { brand, fail, getOrCreate, mapIterable, } from "../util/index.js";
+import { SharedTreeBranch, getChangeReplaceType, onForkTransitive } from "./branch.js";
+import { decrementSequenceId, equalSequenceIds, maxSequenceId, minSequenceId, sequenceIdComparator, } from "./sequenceIdUtils.js";
 export const minimumPossibleSequenceNumber = brand(Number.MIN_SAFE_INTEGER);
 const minimumPossibleSequenceId = {
     sequenceNumber: minimumPossibleSequenceNumber,
@@ -78,7 +78,6 @@ export class EditManager {
                 findCommonAncestor([this.localBranch.getHead(), this.localCommits], this.trunk.getHead());
             }
         });
-        this.localBranch.on("revertibleDisposed", this.onRevertibleDisposed.bind(this));
         // Track all forks of the local branch for purposes of trunk eviction. Unlike the local branch, they have
         // an unknown lifetime and rebase frequency, so we can not make any assumptions about which trunk commits
         // they require and therefore we monitor them explicitly.
@@ -155,41 +154,6 @@ export class EditManager {
             }
         }
     }
-    /**
-     * Returns the sequence id of the oldest sequenced revertible commit on the local branch.
-     *
-     * TODO: may be more performant to maintain the oldest revertible on the branches themselves
-     * this should be tested and revisited once branches are supported
-     */
-    getOldestRevertibleSequenceId() {
-        if (this._oldestRevertibleSequenceId === undefined) {
-            let oldest;
-            for (const revision of this.localBranch.revertibleCommits()) {
-                if (oldest === undefined) {
-                    oldest = this.trunkMetadata.get(revision)?.sequenceId;
-                }
-                else {
-                    const current = this.trunkMetadata.get(revision)?.sequenceId;
-                    if (current !== undefined) {
-                        oldest = minSequenceId(oldest, current);
-                    }
-                }
-            }
-            this._oldestRevertibleSequenceId = oldest;
-        }
-        return this._oldestRevertibleSequenceId;
-    }
-    onRevertibleDisposed(revertible, revision) {
-        const metadata = this.trunkMetadata.get(revision);
-        // if this revision hasn't been sequenced, it won't be evicted
-        if (metadata !== undefined) {
-            const { sequenceId: id } = metadata;
-            // if this revision corresponds with the current oldest revertible sequence id, replace it with the new oldest
-            if (id === this._oldestRevertibleSequenceId) {
-                this._oldestRevertibleSequenceId = undefined;
-            }
-        }
-    }
     /**
      * Advances the minimum sequence number, and removes all commits from the trunk which lie outside the collaboration window,
      * if they are not retained by revertibles or local branches.
@@ -224,13 +188,6 @@ export class EditManager {
             const sequenceIdBeforeMinimumBranchBase = decrementSequenceId(minimumBranchBaseSequenceId);
             trunkTailSequenceId = minSequenceId(trunkTailSequenceId, sequenceIdBeforeMinimumBranchBase);
         }
-        // TODO get the oldest revertible sequence id from all registered branches, not just the local branch
-        const oldestRevertibleSequenceId = this.getOldestRevertibleSequenceId();
-        if (oldestRevertibleSequenceId !== undefined) {
-            // use a smaller sequence number so that the oldest revertible is not trimmed
-            const sequenceIdBeforeOldestRevertible = decrementSequenceId(oldestRevertibleSequenceId);
-            trunkTailSequenceId = minSequenceId(trunkTailSequenceId, sequenceIdBeforeOldestRevertible);
-        }
         const [sequenceId, latestEvicted] = this.getClosestTrunkCommit(maxSequenceId(trunkTailSequenceId, this.sequenceMap.minKey() ?? minimumPossibleSequenceId));
         // Don't do any work if the commit found by the search is already the tail of the trunk
         if (latestEvicted !== this.trunkBase) {
@@ -452,7 +409,6 @@ export class EditManager {
     }
     pushGraphCommitToTrunk(sequenceId, graphCommit, sessionId) {
         this.trunk.setHead(graphCommit);
-        this.localBranch.updateRevertibleCommit(graphCommit);
         const trunkHead = this.trunk.getHead();
         this.sequenceMap.set(sequenceId, trunkHead);
         this.trunkMetadata.set(trunkHead.revision, { sequenceId, sessionId });

package/lib/shared-tree-core/editManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManager.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.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 { BTree } from \"@tylerbu/sorted-btree-es6\";\nimport { assert } from \"@fluidframework/core-utils\";\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport {\n\tbrand,\n\tfail,\n\tgetOrCreate,\n\tmapIterable,\n\tMutable,\n\tRecursiveReadonly,\n} from \"../util/index.js\";\nimport {\n\tChangeFamily,\n\tChangeFamilyEditor,\n\tfindAncestor,\n\tfindCommonAncestor,\n\tGraphCommit,\n\tmintCommit,\n\trebaseChange,\n\tRevertible,\n\tRevisionTag,\n} from \"../core/index.js\";\nimport { getChangeReplaceType, onForkTransitive, SharedTreeBranch } from \"./branch.js\";\nimport {\n\tCommit,\n\tSequenceId,\n\tSummarySessionBranch,\n\tSeqNumber,\n\tSequencedCommit,\n} from \"./editManagerFormat.js\";\nimport {\n\tsequenceIdComparator,\n\tequalSequenceIds,\n\tminSequenceId,\n\tdecrementSequenceId,\n\tmaxSequenceId,\n} from \"./sequenceIdUtils.js\";\n\nexport const minimumPossibleSequenceNumber: SeqNumber = brand(Number.MIN_SAFE_INTEGER);\nconst minimumPossibleSequenceId: SequenceId = {\n\tsequenceNumber: minimumPossibleSequenceNumber,\n};\n\n/\n Represents a local branch of a document and interprets the effect on the document of adding sequenced changes,\n * which were based on a given session's branch, to the document history\n /\n// TODO: Try to reduce this to a single type parameter\nexport class EditManager<\n\tTEditor extends ChangeFamilyEditor,\n\tTChangeset,\n\tTChangeFamily extends ChangeFamily<TEditor, TChangeset>,\n> {\n\t/* The \"trunk\" branch. The trunk represents the list of received sequenced changes. /\n\tprivate readonly trunk: SharedTreeBranch<TEditor, TChangeset>;\n\n\t/\n\t Records extra data associated with commits in the {@link trunk}.\n\t * This does not include an entry for the {@link trunkBase}.\n\t /\n\tprivate readonly trunkMetadata = new Map<\n\t\tRevisionTag,\n\t\t{ sequenceId: SequenceId; sessionId: SessionId }\n\t>();\n\t/\n\t A map from a sequence id to the commit in the {@link trunk} which has that sequence id.\n\t * This also includes an entry for the {@link trunkBase} which always has the lowest key in the map.\n\t /\n\tprivate readonly sequenceMap = new BTree<SequenceId, GraphCommit<TChangeset>>(\n\t\tundefined,\n\t\tsequenceIdComparator,\n\t);\n\n\t/\n\t Branches are maintained to represent the local change list that the issuing client had\n\t * at the time of submitting the latest known edit on the branch.\n\t * This means the head commit of each branch is always in its original (non-rebased) form.\n\t /\n\t// TODO:#4593: Add test to ensure that peer branches are never initialized with a repairDataStoreProvider\n\tprivate readonly peerLocalBranches: Map<SessionId, SharedTreeBranch<TEditor, TChangeset>> =\n\t\tnew Map();\n\n\t/\n\t This branch holds the changes made by this client which have not yet been confirmed as sequenced changes.\n\t /\n\tpublic readonly localBranch: SharedTreeBranch<TEditor, TChangeset>;\n\n\t/\n\t Tracks where on the trunk all registered branches are based. Each key is the sequence id of a commit on\n\t * the trunk, and the value is the set of all branches who have that commit as their common ancestor with the trunk.\n\t /\n\tprivate readonly trunkBranches = new BTree<\n\t\tSequenceId,\n\t\tSet<SharedTreeBranch<TEditor, TChangeset>>\n\t>(undefined, sequenceIdComparator);\n\n\t/\n\t The sequence number of the newest commit on the trunk that has been received by all peers.\n\t * Defaults to {@link minimumPossibleSequenceNumber} if no commits have been received.\n\t \n\t @remarks If there are more than one commit with the same sequence number we assume this refers to the last commit in the batch.\n\t /\n\tprivate minimumSequenceNumber = minimumPossibleSequenceNumber;\n\n\t/\n\t The sequence ID corresponding to the oldest revertible commit owned by the local branch. This is used\n\t * to prevent the trunk from trimming this commit or commits after it as they're needed for undo.\n\t /\n\tprivate _oldestRevertibleSequenceId?: SequenceId;\n\n\t/\n\t A special commit that is a \"base\" (tail) of the trunk, though not part of the trunk itself.\n\t * This makes it possible to model the trunk in the same way as any other branch (it branches off of a base commit)\n\t * which allows it to use branching APIs to interact with the other branches.\n\t * Each time trunk eviction occurs, the most recent evicted commit becomes the new `trunkBase`.\n\t /\n\tprivate trunkBase: GraphCommit<TChangeset>;\n\n\t/\n\t The list of commits (from oldest to most recent) that are on the local branch but not on the trunk.\n\t * When a local commit is sequenced, the first commit in this list shifted onto the tip of the trunk.\n\t /\n\tprivate readonly localCommits: GraphCommit<TChangeset>[] = [];\n\n\t/\n\t @param changeFamily - the change family of changes on the trunk and local branch\n\t * @param localSessionId - the id of the local session that will be used for local commits\n\t /\n\tpublic constructor(\n\t\tpublic readonly changeFamily: TChangeFamily,\n\t\tpublic readonly localSessionId: SessionId,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t) {\n\t\tthis.trunkBase = {\n\t\t\trevision: \"root\",\n\t\t\tchange: changeFamily.rebaser.compose([]),\n\t\t};\n\t\tthis.sequenceMap.set(minimumPossibleSequenceId, this.trunkBase);\n\t\tthis.trunk = new SharedTreeBranch(this.trunkBase, changeFamily, mintRevisionTag);\n\t\tthis.localBranch = new SharedTreeBranch(\n\t\t\tthis.trunk.getHead(),\n\t\t\tchangeFamily,\n\t\t\tmintRevisionTag,\n\t\t);\n\n\t\tthis.localBranch.on(\"afterChange\", (event) => {\n\t\t\tif (event.type === \"append\") {\n\t\t\t\tfor (const commit of event.newCommits) {\n\t\t\t\t\tthis.localCommits.push(commit);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tthis.localCommits.length = 0;\n\t\t\t\tfindCommonAncestor(\n\t\t\t\t\t[this.localBranch.getHead(), this.localCommits],\n\t\t\t\t\tthis.trunk.getHead(),\n\t\t\t\t);\n\t\t\t}\n\t\t});\n\t\tthis.localBranch.on(\"revertibleDisposed\", this.onRevertibleDisposed.bind(this));\n\n\t\t// Track all forks of the local branch for purposes of trunk eviction. Unlike the local branch, they have\n\t\t// an unknown lifetime and rebase frequency, so we can not make any assumptions about which trunk commits\n\t\t// they require and therefore we monitor them explicitly.\n\t\tonForkTransitive(this.localBranch, (fork) => this.registerBranch(fork));\n\t}\n\n\t/\n\t Make the given branch known to the `EditManager`. The `EditManager` will ensure that all registered\n\t * branches remain usable even as the minimum sequence number advances.\n\t \n\t TODO#AB6926: Refactor local branch management into a separate class that encapsulates `trunkBranches` and everything\n\t * that touches it.\n\t * TODO#AB6925: Maintain the divergence point between each branch and the trunk so that we don't have to recompute\n\t * it so often.\n\t /\n\tprivate registerBranch(branch: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tthis.trackBranch(branch);\n\t\t// Whenever the branch is rebased, update our record of its base trunk commit\n\t\tconst offBeforeRebase = branch.on(\"beforeChange\", (args) => {\n\t\t\tif (args.type === \"replace\" && getChangeReplaceType(args) === \"rebase\") {\n\t\t\t\tthis.untrackBranch(branch);\n\t\t\t}\n\t\t});\n\t\tconst offAfterRebase = branch.on(\"afterChange\", (args) => {\n\t\t\tif (args.type === \"replace\" && getChangeReplaceType(args) === \"rebase\") {\n\t\t\t\tthis.trackBranch(branch);\n\t\t\t\tthis.trimTrunk();\n\t\t\t}\n\t\t});\n\t\t// When the branch is disposed, update our branch set and trim the trunk\n\t\tconst offDispose = branch.on(\"dispose\", () => {\n\t\t\tthis.untrackBranch(branch);\n\t\t\tthis.trimTrunk();\n\t\t\toffBeforeRebase();\n\t\t\toffAfterRebase();\n\t\t\toffDispose();\n\t\t});\n\t}\n\n\tprivate trackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tconst trunkCommit =\n\t\t\tfindCommonAncestor(this.trunk.getHead(), b.getHead()) ??\n\t\t\tfail(\"Expected branch to be related to trunk\");\n\t\tconst sequenceId = this.getCommitSequenceId(trunkCommit);\n\t\tconst branches = getOrCreate(this.trunkBranches, sequenceId, () => new Set());\n\n\t\tassert(!branches.has(b), 0x670 / Branch was registered more than once /);\n\t\tbranches.add(b);\n\t}\n\n\tprivate untrackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tconst trunkCommit =\n\t\t\tfindCommonAncestor(this.trunk.getHead(), b.getHead()) ??\n\t\t\tfail(\"Expected branch to be related to trunk\");\n\t\tconst sequenceId = this.getCommitSequenceId(trunkCommit);\n\t\tconst branches =\n\t\t\tthis.trunkBranches.get(sequenceId) ?? fail(\"Expected branch to be tracked\");\n\n\t\tassert(branches.delete(b), 0x671 / Expected branch to be tracked /);\n\t\tif (branches.size === 0) {\n\t\t\tthis.trunkBranches.delete(sequenceId);\n\t\t}\n\t}\n\n\t/\n\t Updates the `trunkBranches` map to reflect the fact that a new local commit was fast-forwarded to the trunk.\n\t * @param priorTrunkCommit - The trunk head prior to the fast-forward.\n\t * @param newId - The ID of the new trunk head.\n\t /\n\tprivate fastForwardBranches(\n\t\tpriorTrunkCommit: GraphCommit<TChangeset>,\n\t\tnewId: SequenceId,\n\t): void {\n\t\tconst currentId = this.getCommitSequenceId(priorTrunkCommit);\n\t\tconst currentBranches = this.trunkBranches.get(currentId);\n\t\tif (currentBranches !== undefined) {\n\t\t\tconst newBranches = getOrCreate(this.trunkBranches, newId, () => new Set());\n\t\t\tfor (const branch of currentBranches) {\n\t\t\t\tif (branch.getHead() !== priorTrunkCommit) {\n\t\t\t\t\tnewBranches.add(branch);\n\t\t\t\t\tcurrentBranches.delete(branch);\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (currentBranches.size === 0) {\n\t\t\t\tthis.trunkBranches.delete(currentId);\n\t\t\t}\n\t\t}\n\t}\n\n\t/\n\t Returns the sequence id of the oldest sequenced revertible commit on the local branch.\n\t \n\t TODO: may be more performant to maintain the oldest revertible on the branches themselves\n\t * this should be tested and revisited once branches are supported\n\t /\n\tprivate getOldestRevertibleSequenceId(): SequenceId \| undefined {\n\t\tif (this._oldestRevertibleSequenceId === undefined) {\n\t\t\tlet oldest: SequenceId \| undefined;\n\t\t\tfor (const revision of this.localBranch.revertibleCommits()) {\n\t\t\t\tif (oldest === undefined) {\n\t\t\t\t\toldest = this.trunkMetadata.get(revision)?.sequenceId;\n\t\t\t\t} else {\n\t\t\t\t\tconst current = this.trunkMetadata.get(revision)?.sequenceId;\n\t\t\t\t\tif (current !== undefined) {\n\t\t\t\t\t\toldest = minSequenceId(oldest, current);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t\tthis._oldestRevertibleSequenceId = oldest;\n\t\t}\n\n\t\treturn this._oldestRevertibleSequenceId;\n\t}\n\n\tprivate onRevertibleDisposed(revertible: Revertible, revision: RevisionTag): void {\n\t\tconst metadata = this.trunkMetadata.get(revision);\n\n\t\t// if this revision hasn't been sequenced, it won't be evicted\n\t\tif (metadata !== undefined) {\n\t\t\tconst { sequenceId: id } = metadata;\n\t\t\t// if this revision corresponds with the current oldest revertible sequence id, replace it with the new oldest\n\t\t\tif (id === this._oldestRevertibleSequenceId) {\n\t\t\t\tthis._oldestRevertibleSequenceId = undefined;\n\t\t\t}\n\t\t}\n\t}\n\n\t/\n\t Advances the minimum sequence number, and removes all commits from the trunk which lie outside the collaboration window,\n\t * if they are not retained by revertibles or local branches.\n\t * @param minimumSequenceNumber - the sequence number of the newest commit that all peers (including this one) have received and applied to their trunks.\n\t \n\t @remarks If there are more than one commit with the same sequence number we assume this refers to the last commit in the batch.\n\t /\n\tpublic advanceMinimumSequenceNumber(minimumSequenceNumber: SeqNumber): void {\n\t\tif (minimumSequenceNumber === this.minimumSequenceNumber) {\n\t\t\treturn;\n\t\t}\n\n\t\tassert(\n\t\t\tminimumSequenceNumber > this.minimumSequenceNumber,\n\t\t\t0x476 / number must be larger or equal to current minimumSequenceNumber. /,\n\t\t);\n\n\t\tthis.minimumSequenceNumber = minimumSequenceNumber;\n\t\tthis.trimTrunk();\n\t}\n\n\t/\n\t Examines the latest known minimum sequence number and the trunk bases of any registered branches to determine\n\t * if any commits on the trunk are unreferenced and unneeded for future computation; those found are evicted from the trunk.\n\t * @returns the number of commits that were removed from the trunk\n\t /\n\tprivate trimTrunk(): void {\n\t\t/* The sequence id of the oldest commit on the trunk that will be retained /\n\t\tlet trunkTailSequenceId: SequenceId = {\n\t\t\tsequenceNumber: this.minimumSequenceNumber,\n\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t};\n\t\t// If there are any outstanding registered branches, get the one that is the oldest (has the \"most behind\" trunk base)\n\t\tconst minimumBranchBaseSequenceId = this.trunkBranches.minKey();\n\t\tif (minimumBranchBaseSequenceId !== undefined) {\n\t\t\t// If that branch is behind the minimum sequence id, we only want to evict commits older than it,\n\t\t\t// even if those commits are behind the minimum sequence id\n\t\t\tconst sequenceIdBeforeMinimumBranchBase = decrementSequenceId(\n\t\t\t\tminimumBranchBaseSequenceId,\n\t\t\t);\n\t\t\ttrunkTailSequenceId = minSequenceId(\n\t\t\t\ttrunkTailSequenceId,\n\t\t\t\tsequenceIdBeforeMinimumBranchBase,\n\t\t\t);\n\t\t}\n\n\t\t// TODO get the oldest revertible sequence id from all registered branches, not just the local branch\n\t\tconst oldestRevertibleSequenceId = this.getOldestRevertibleSequenceId();\n\t\tif (oldestRevertibleSequenceId !== undefined) {\n\t\t\t// use a smaller sequence number so that the oldest revertible is not trimmed\n\t\t\tconst sequenceIdBeforeOldestRevertible = decrementSequenceId(\n\t\t\t\toldestRevertibleSequenceId,\n\t\t\t);\n\t\t\ttrunkTailSequenceId = minSequenceId(\n\t\t\t\ttrunkTailSequenceId,\n\t\t\t\tsequenceIdBeforeOldestRevertible,\n\t\t\t);\n\t\t}\n\n\t\tconst [sequenceId, latestEvicted] = this.getClosestTrunkCommit(\n\t\t\tmaxSequenceId(\n\t\t\t\ttrunkTailSequenceId,\n\t\t\t\tthis.sequenceMap.minKey() ?? minimumPossibleSequenceId,\n\t\t\t),\n\t\t);\n\n\t\t// Don't do any work if the commit found by the search is already the tail of the trunk\n\t\tif (latestEvicted !== this.trunkBase) {\n\t\t\t// The minimum sequence number informs us that all peer branches are at least caught up to the tail commit,\n\t\t\t// so rebase them accordingly. This is necessary to prevent peer branches from referencing any evicted commits.\n\t\t\tfor (const [, branch] of this.peerLocalBranches) {\n\t\t\t\tbranch.rebaseOnto(this.trunk, latestEvicted);\n\t\t\t}\n\n\t\t\t// This mutation is a performance hack. If commits are truly immutable, then changing the trunk's tail requires\n\t\t\t// regenerating the entire commit graph. Instead, we can simply chop off the tail like this if we're certain\n\t\t\t// that there are no outstanding references to any of the commits being removed (other than the references via\n\t\t\t// the trunk). The peer branches have been rebased to the head of the trunk, the local branch is already rebased\n\t\t\t// to the head of the trunk, and all other branches are tracked by `trunkBranches` and known to be ahead of or at\n\t\t\t// `newTrunkBase`. Therefore, no branches should have unique references to any of the commits being evicted here.\n\t\t\t// We mutate the most recent of the evicted commits to become the new trunk base. That way, any other commits that\n\t\t\t// have parent pointers to the latest evicted commit will stay linked, even though that it is no longer part of the trunk.\n\t\t\tconst newTrunkBase = latestEvicted as Mutable<typeof latestEvicted>;\n\t\t\t// The metadata for new trunk base revision needs to be deleted before modifying it.\n\t\t\tthis.trunkMetadata.delete(newTrunkBase.revision);\n\t\t\t// Copying the revision of the old trunk base into the new trunk base means we don't need to write out the original\n\t\t\t// revision to summaries. All clients agree that the trunk base always has the same hardcoded revision.\n\t\t\tnewTrunkBase.revision = this.trunkBase.revision;\n\t\t\t// Overwriting the change is not strictly necessary, but done here for consistency (so all trunk bases are deeply equal).\n\t\t\tnewTrunkBase.change = this.trunkBase.change;\n\t\t\t// Dropping the parent field removes (transitively) all references to the evicted commits so they can be garbage collected.\n\t\t\tdelete newTrunkBase.parent;\n\t\t\tthis.trunkBase = newTrunkBase;\n\n\t\t\t// Update any state that is derived from trunk commits\n\t\t\tthis.sequenceMap.editRange(\n\t\t\t\tminimumPossibleSequenceId,\n\t\t\t\tsequenceId,\n\t\t\t\ttrue,\n\t\t\t\t(s, { revision }) => {\n\t\t\t\t\t// Cleanup look-aside data for each evicted commit\n\t\t\t\t\tthis.trunkMetadata.delete(revision);\n\t\t\t\t\t// Delete all evicted commits from `sequenceMap` except for the latest one, which is the new `trunkBase`\n\t\t\t\t\tif (equalSequenceIds(s, sequenceId)) {\n\t\t\t\t\t\tassert(\n\t\t\t\t\t\t\trevision === newTrunkBase.revision,\n\t\t\t\t\t\t\t0x729 / Expected last evicted commit to be new trunk base /,\n\t\t\t\t\t\t);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn { delete: true };\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t);\n\n\t\t\tconst trunkSize = getPathFromBase(this.trunk.getHead(), this.trunkBase).length;\n\t\t\tassert(\n\t\t\t\tthis.sequenceMap.size === trunkSize + 1,\n\t\t\t\t0x744 / The size of the sequenceMap must have one element more than the trunk /,\n\t\t\t);\n\t\t\tassert(\n\t\t\t\tthis.trunkMetadata.size === trunkSize,\n\t\t\t\t0x745 / The size of the trunkMetadata must be the same as the trunk /,\n\t\t\t);\n\t\t}\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn (\n\t\t\tthis.trunk.getHead() === this.trunkBase &&\n\t\t\tthis.peerLocalBranches.size === 0 &&\n\t\t\tthis.localBranch.getHead() === this.trunk.getHead() &&\n\t\t\tthis.minimumSequenceNumber === minimumPossibleSequenceNumber\n\t\t);\n\t}\n\n\tpublic getSummaryData(): SummaryData<TChangeset> {\n\t\t// The assert below is acceptable at present because summarization only ever occurs on a client with no\n\t\t// local/in-flight changes.\n\t\t// In the future we may wish to relax this constraint. For that to work, the current implementation of\n\t\t// `EditManager` would have to be amended in one of two ways:\n\t\t// A) Changes made by the local session should be represented by a branch in `EditManager.branches`.\n\t\t// B) The contents of such a branch should be computed on demand based on the trunk.\n\t\t// Note that option (A) would be a simple change to `addSequencedChange` whereas (B) would likely require\n\t\t// rebasing trunk changes over the inverse of trunk changes.\n\t\tassert(\n\t\t\tthis.localBranch.getHead() === this.trunk.getHead(),\n\t\t\t0x428 / Clients with local changes cannot be used to generate summaries /,\n\t\t);\n\n\t\tlet oldestCommitInCollabWindow = this.getClosestTrunkCommit(this.minimumSequenceNumber)[1];\n\t\tassert(\n\t\t\toldestCommitInCollabWindow.parent !== undefined \|\|\n\t\t\t\toldestCommitInCollabWindow === this.trunkBase,\n\t\t\t0x8c7 / Expected oldest commit in collab window to have a parent or be the trunk base /,\n\t\t);\n\n\t\t// Path construction is exclusive, so we need to use the parent of the oldest commit in the window if it exists\n\t\toldestCommitInCollabWindow =\n\t\t\toldestCommitInCollabWindow.parent ?? oldestCommitInCollabWindow;\n\n\t\tconst trunk = getPathFromBase(this.trunk.getHead(), oldestCommitInCollabWindow).map((c) => {\n\t\t\tconst metadata =\n\t\t\t\tthis.trunkMetadata.get(c.revision) ?? fail(\"Expected metadata for trunk commit\");\n\t\t\tconst commit: SequencedCommit<TChangeset> = {\n\t\t\t\tchange: c.change,\n\t\t\t\trevision: c.revision,\n\t\t\t\tsequenceNumber: metadata.sequenceId.sequenceNumber,\n\t\t\t\tsessionId: metadata.sessionId,\n\t\t\t};\n\t\t\tif (metadata.sequenceId.indexInBatch !== undefined) {\n\t\t\t\tcommit.indexInBatch = metadata.sequenceId.indexInBatch;\n\t\t\t}\n\t\t\treturn commit;\n\t\t});\n\n\t\tconst peerLocalBranches = new Map<SessionId, SummarySessionBranch<TChangeset>>(\n\t\t\tmapIterable(this.peerLocalBranches.entries(), ([sessionId, branch]) => {\n\t\t\t\tconst branchPath: GraphCommit<TChangeset>[] = [];\n\t\t\t\tconst ancestor =\n\t\t\t\t\tfindCommonAncestor([branch.getHead(), branchPath], this.trunk.getHead()) ??\n\t\t\t\t\tfail(\"Expected branch to be based on trunk\");\n\n\t\t\t\treturn [\n\t\t\t\t\tsessionId,\n\t\t\t\t\t{\n\t\t\t\t\t\tbase: ancestor.revision,\n\t\t\t\t\t\tcommits: branchPath.map((c) => {\n\t\t\t\t\t\t\tconst commit: Commit<TChangeset> = {\n\t\t\t\t\t\t\t\tchange: c.change,\n\t\t\t\t\t\t\t\trevision: c.revision,\n\t\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t};\n\t\t\t\t\t\t\treturn commit;\n\t\t\t\t\t\t}),\n\t\t\t\t\t},\n\t\t\t\t];\n\t\t\t}),\n\t\t);\n\n\t\treturn { trunk, peerLocalBranches };\n\t}\n\n\tpublic loadSummaryData(data: SummaryData<TChangeset>): void {\n\t\tassert(\n\t\t\tthis.isEmpty(),\n\t\t\t0x68a / Attempted to load from summary after edit manager was already mutated /,\n\t\t);\n\t\t// Record the tags of each trunk commit as we generate the trunk so they can be looked up quickly\n\t\t// when hydrating the peer branches below\n\t\tconst trunkRevisionCache = new Map<RevisionTag, GraphCommit<TChangeset>>();\n\t\ttrunkRevisionCache.set(this.trunkBase.revision, this.trunkBase);\n\t\tthis.trunk.setHead(\n\t\t\tdata.trunk.reduce((base, c) => {\n\t\t\t\tconst sequenceId: SequenceId =\n\t\t\t\t\tc.indexInBatch === undefined\n\t\t\t\t\t\t? {\n\t\t\t\t\t\t\t\tsequenceNumber: c.sequenceNumber,\n\t\t\t\t\t\t }\n\t\t\t\t\t\t: {\n\t\t\t\t\t\t\t\tsequenceNumber: c.sequenceNumber,\n\t\t\t\t\t\t\t\tindexInBatch: c.indexInBatch,\n\t\t\t\t\t\t };\n\t\t\t\tconst commit = mintCommit(base, c);\n\t\t\t\tthis.sequenceMap.set(sequenceId, commit);\n\t\t\t\tthis.trunkMetadata.set(c.revision, {\n\t\t\t\t\tsequenceId,\n\t\t\t\t\tsessionId: c.sessionId,\n\t\t\t\t});\n\t\t\t\ttrunkRevisionCache.set(c.revision, commit);\n\t\t\t\treturn commit;\n\t\t\t}, this.trunkBase),\n\t\t);\n\n\t\tthis.localBranch.setHead(this.trunk.getHead());\n\n\t\tfor (const [sessionId, branch] of data.peerLocalBranches) {\n\t\t\tconst commit =\n\t\t\t\ttrunkRevisionCache.get(branch.base) ??\n\t\t\t\tfail(\"Expected summary branch to be based off of a revision in the trunk\");\n\n\t\t\tthis.peerLocalBranches.set(\n\t\t\t\tsessionId,\n\t\t\t\tnew SharedTreeBranch(\n\t\t\t\t\tbranch.commits.reduce(mintCommit, commit),\n\t\t\t\t\tthis.changeFamily,\n\t\t\t\t\tthis.mintRevisionTag,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t}\n\n\tprivate getCommitSequenceId(commit: GraphCommit<TChangeset>): SequenceId {\n\t\treturn this.trunkMetadata.get(commit.revision)?.sequenceId ?? minimumPossibleSequenceId;\n\t}\n\n\tpublic getTrunkChanges(): readonly RecursiveReadonly<TChangeset>[] {\n\t\treturn this.getTrunkCommits().map((c) => c.change);\n\t}\n\n\tpublic getTrunkCommits(): readonly RecursiveReadonly<GraphCommit<TChangeset>>[] {\n\t\treturn getPathFromBase(this.trunk.getHead(), this.trunkBase);\n\t}\n\n\tpublic getTrunkHead(): GraphCommit<TChangeset> {\n\t\treturn this.trunk.getHead();\n\t}\n\n\tpublic getLocalChanges(): readonly RecursiveReadonly<TChangeset>[] {\n\t\treturn this.getLocalCommits().map((c) => c.change);\n\t}\n\n\tpublic getLocalCommits(): readonly RecursiveReadonly<GraphCommit<TChangeset>>[] {\n\t\treturn this.localCommits;\n\t}\n\n\t/\n\t @returns The length of the longest branch maintained by this EditManager.\n\t * This may be the length of a peer branch or the local branch.\n\t * The length is counted from the lowest common ancestor with the trunk such that a fully sequenced branch would\n\t * have length zero.\n\t /\n\tpublic getLongestBranchLength(): number {\n\t\tlet max = 0;\n\t\tconst trunkHead = this.trunk.getHead();\n\t\tfor (const branch of this.peerLocalBranches.values()) {\n\t\t\tconst branchPath = getPathFromBase(branch.getHead(), trunkHead);\n\t\t\tif (branchPath.length > max) {\n\t\t\t\tmax = branchPath.length;\n\t\t\t}\n\t\t}\n\t\tconst localPath = getPathFromBase(this.localBranch.getHead(), trunkHead);\n\t\treturn Math.max(max, localPath.length);\n\t}\n\n\tpublic addSequencedChange(\n\t\tnewCommit: Commit<TChangeset>,\n\t\tsequenceNumber: SeqNumber,\n\t\treferenceSequenceNumber: SeqNumber,\n\t): void {\n\t\tassert(\n\t\t\tsequenceNumber > this.minimumSequenceNumber,\n\t\t\t0x713 / Expected change sequence number to exceed the last known minimum sequence number /,\n\t\t);\n\n\t\tconst commitsSequenceNumber = this.getBatch(sequenceNumber);\n\t\tconst sequenceId: SequenceId =\n\t\t\tcommitsSequenceNumber.length === 0\n\t\t\t\t? {\n\t\t\t\t\t\tsequenceNumber,\n\t\t\t\t }\n\t\t\t\t: {\n\t\t\t\t\t\tsequenceNumber,\n\t\t\t\t\t\tindexInBatch: commitsSequenceNumber.length,\n\t\t\t\t };\n\n\t\tif (newCommit.sessionId === this.localSessionId) {\n\t\t\tconst headTrunkCommit = this.trunk.getHead();\n\t\t\tconst firstLocalCommit = this.localCommits.shift();\n\t\t\tassert(\n\t\t\t\tfirstLocalCommit !== undefined,\n\t\t\t\t0x6b5 / Received a sequenced change from the local session despite having no local changes /,\n\t\t\t);\n\n\t\t\t// The first local branch commit is already rebased over the trunk, so we can push it directly to the trunk.\n\t\t\tthis.pushGraphCommitToTrunk(sequenceId, firstLocalCommit, this.localSessionId);\n\t\t\tthis.fastForwardBranches(headTrunkCommit, sequenceId);\n\t\t\treturn;\n\t\t}\n\n\t\t// Get the revision that the remote change is based on\n\t\tconst [, baseRevisionInTrunk] = this.getClosestTrunkCommit(referenceSequenceNumber);\n\t\t// Rebase that branch over the part of the trunk up to the base revision\n\t\t// This will be a no-op if the sending client has not advanced since the last time we received an edit from it\n\t\tconst peerLocalBranch = getOrCreate(\n\t\t\tthis.peerLocalBranches,\n\t\t\tnewCommit.sessionId,\n\t\t\t() =>\n\t\t\t\tnew SharedTreeBranch(baseRevisionInTrunk, this.changeFamily, this.mintRevisionTag),\n\t\t);\n\t\tpeerLocalBranch.rebaseOnto(this.trunk, baseRevisionInTrunk);\n\n\t\tif (peerLocalBranch.getHead() === this.trunk.getHead()) {\n\t\t\t// If the branch is fully caught up and empty after being rebased, then push to the trunk directly\n\t\t\tthis.pushCommitToTrunk(sequenceId, newCommit);\n\t\t\tpeerLocalBranch.setHead(this.trunk.getHead());\n\t\t} else {\n\t\t\t// Otherwise, rebase the change over the trunk and append it, and append the original change to the peer branch.\n\t\t\tconst newChangeFullyRebased = rebaseChange(\n\t\t\t\tthis.changeFamily.rebaser,\n\t\t\t\tnewCommit.change,\n\t\t\t\tpeerLocalBranch.getHead(),\n\t\t\t\tthis.trunk.getHead(),\n\t\t\t\tthis.mintRevisionTag,\n\t\t\t);\n\n\t\t\tpeerLocalBranch.apply(newCommit.change, newCommit.revision);\n\t\t\tthis.pushCommitToTrunk(sequenceId, {\n\t\t\t\t...newCommit,\n\t\t\t\tchange: newChangeFullyRebased,\n\t\t\t});\n\t\t}\n\n\t\tthis.localBranch.rebaseOnto(this.trunk);\n\t}\n\n\tpublic findLocalCommit(\n\t\trevision: RevisionTag,\n\t): [commit: GraphCommit<TChangeset>, commitsAfter: GraphCommit<TChangeset>[]] {\n\t\tconst commits: GraphCommit<TChangeset>[] = [];\n\t\tconst commit = findAncestor(\n\t\t\t[this.localBranch.getHead(), commits],\n\t\t\t(c) => c.revision === revision,\n\t\t);\n\t\tassert(commit !== undefined, 0x599 / Expected local branch to contain revision /);\n\t\treturn [commit, commits];\n\t}\n\n\tprivate pushCommitToTrunk(\n\t\tsequenceId: SequenceId,\n\t\tcommit: Commit<TChangeset>,\n\t\tlocal = false,\n\t): void {\n\t\tconst mintedCommit = mintCommit(this.trunk.getHead(), commit);\n\t\tthis.pushGraphCommitToTrunk(sequenceId, mintedCommit, commit.sessionId);\n\t}\n\n\tprivate pushGraphCommitToTrunk(\n\t\tsequenceId: SequenceId,\n\t\tgraphCommit: GraphCommit<TChangeset>,\n\t\tsessionId: SessionId,\n\t): void {\n\t\tthis.trunk.setHead(graphCommit);\n\t\tthis.localBranch.updateRevertibleCommit(graphCommit);\n\t\tconst trunkHead = this.trunk.getHead();\n\t\tthis.sequenceMap.set(sequenceId, trunkHead);\n\t\tthis.trunkMetadata.set(trunkHead.revision, { sequenceId, sessionId });\n\t}\n\n\t/\n\t Finds the most recent trunk commit that was sequenced at or before the given point.\n\t * @param searchBy - the sequence number or the sequence id to search for\n\t * @remarks Fails if there is no eligible commit.\n\t * @returns the closest commit and its sequence id\n\t /\n\tprivate getClosestTrunkCommit(searchBy: SeqNumber): [SequenceId, GraphCommit<TChangeset>];\n\tprivate getClosestTrunkCommit(searchBy: SequenceId): [SequenceId, GraphCommit<TChangeset>];\n\tprivate getClosestTrunkCommit(\n\t\tsearchBy: SeqNumber \| SequenceId,\n\t): [SequenceId, GraphCommit<TChangeset>] {\n\t\tconst sequenceId: SequenceId =\n\t\t\ttypeof searchBy === \"number\"\n\t\t\t\t? {\n\t\t\t\t\t\t// This is to make sure that the correct commit is selected in this 2 scenarios:\n\t\t\t\t\t\t// 1) The commit is unique for that sequence number\n\t\t\t\t\t\t// 2) There are more than one commit for the same sequence number, in this case we need to select the last one.\n\t\t\t\t\t\tsequenceNumber: searchBy,\n\t\t\t\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t\t\t }\n\t\t\t\t: searchBy;\n\n\t\tconst commit = this.sequenceMap.getPairOrNextLower(sequenceId);\n\t\tassert(commit !== undefined, 0x746 / sequence id has been evicted /);\n\t\treturn commit;\n\t}\n\n\tprivate getBatch(sequenceNumber: SeqNumber): [SequenceId, GraphCommit<TChangeset>][] {\n\t\tconst startSequenceId: SequenceId = {\n\t\t\tsequenceNumber,\n\t\t};\n\t\tconst endSequenceId: SequenceId = {\n\t\t\tsequenceNumber: brand((sequenceNumber as number) + 1),\n\t\t};\n\n\t\treturn this.sequenceMap.getRange(startSequenceId, endSequenceId, false);\n\t}\n}\n\n/\n The in-memory data that summaries contain\n /\nexport interface SummaryData<TChangeset> {\n\treadonly trunk: readonly SequencedCommit<TChangeset>[];\n\treadonly peerLocalBranches: ReadonlyMap<SessionId, SummarySessionBranch<TChangeset>>;\n}\n\n/\n @returns the path from the base of a branch to its head\n /\nfunction getPathFromBase<TCommit extends { parent?: TCommit }>(\n\tbranchHead: TCommit,\n\tbaseBranchHead: TCommit,\n): TCommit[] {\n\tconst path: TCommit[] = [];\n\tassert(\n\t\tfindCommonAncestor([branchHead, path], baseBranchHead) !== undefined,\n\t\t0x573 / Expected branches to be related */,\n\t);\n\treturn path;\n}\n"]}
1	+ {"version":3,"file":"editManager.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAKN,YAAY,EACZ,kBAAkB,EAClB,UAAU,EACV,YAAY,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGN,KAAK,EACL,IAAI,EACJ,WAAW,EACX,WAAW,GACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQvF,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,oBAAoB,GACpB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,CAAC,MAAM,6BAA6B,GAAc,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACvF,MAAM,yBAAyB,GAAe;IAC7C,cAAc,EAAE,6BAA6B;CAC7C,CAAC;AAEF;;;GAGG;AACH,sDAAsD;AACtD,MAAM,OAAO,WAAW;IAsEvB;;;OAGG;IACH,YACiB,YAA2B,EAC3B,cAAyB,EACxB,eAAkC;QAFnC,iBAAY,GAAZ,YAAY,CAAe;QAC3B,mBAAc,GAAd,cAAc,CAAW;QACxB,oBAAe,GAAf,eAAe,CAAmB;QArEpD;;;WAGG;QACc,kBAAa,GAAG,IAAI,GAAG,EAGrC,CAAC;QACJ;;;WAGG;QACc,gBAAW,GAAG,IAAI,KAAK,CACvC,SAAS,EACT,oBAAoB,CACpB,CAAC;QAEF;;;;WAIG;QACH,yGAAyG;QACxF,sBAAiB,GACjC,IAAI,GAAG,EAAE,CAAC;QAOX;;;WAGG;QACc,kBAAa,GAAG,IAAI,KAAK,CAGxC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QAEnC;;;;;WAKG;QACK,0BAAqB,GAAG,6BAA6B,CAAC;QAU9D;;;WAGG;QACc,iBAAY,GAA8B,EAAE,CAAC;QAW7D,IAAI,CAAC,SAAS,GAAG;YAChB,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;SACxC,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;QACjF,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAgB,CACtC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EACpB,YAAY,EACZ,eAAe,CACf,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC5B,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,UAAU,EAAE;oBACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC/B;aACD;iBAAM;gBACN,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC7B,kBAAkB,CACjB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,EAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CACpB,CAAC;aACF;QACF,CAAC,CAAC,CAAC;QAEH,yGAAyG;QACzG,yGAAyG;QACzG,yDAAyD;QACzD,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACzE,CAAC;IAED;;;;;;;;OAQG;IACK,cAAc,CAAC,MAA6C;QACnE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,6EAA6E;QAC7E,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1D,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;gBACvE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aAC3B;QACF,CAAC,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACxD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;gBACvE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACzB,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB;QACF,CAAC,CAAC,CAAC;QACH,wEAAwE;QACxE,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;YAClB,cAAc,EAAE,CAAC;YACjB,UAAU,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,CAAwC;QAC3D,MAAM,WAAW,GAChB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACrD,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QAE9E,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC3E,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,CAAwC;QAC7D,MAAM,WAAW,GAChB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACrD,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,QAAQ,GACb,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAE7E,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACtE,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SACtC;IACF,CAAC;IAED;;;;OAIG;IACK,mBAAmB,CAC1B,gBAAyC,EACzC,KAAiB;QAEjB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,eAAe,KAAK,SAAS,EAAE;YAClC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;YAC5E,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;gBACrC,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,gBAAgB,EAAE;oBAC1C,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBACxB,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBAC/B;aACD;YACD,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,EAAE;gBAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aACrC;SACD;IACF,CAAC;IAED;;;;;;OAMG;IACI,4BAA4B,CAAC,qBAAgC;QACnE,IAAI,qBAAqB,KAAK,IAAI,CAAC,qBAAqB,EAAE;YACzD,OAAO;SACP;QAED,MAAM,CACL,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,EAClD,KAAK,CAAC,sEAAsE,CAC5E,CAAC;QAEF,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,SAAS,EAAE,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACK,SAAS;QAChB,8EAA8E;QAC9E,IAAI,mBAAmB,GAAe;YACrC,cAAc,EAAE,IAAI,CAAC,qBAAqB;YAC1C,YAAY,EAAE,MAAM,CAAC,iBAAiB;SACtC,CAAC;QACF,sHAAsH;QACtH,MAAM,2BAA2B,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;QAChE,IAAI,2BAA2B,KAAK,SAAS,EAAE;YAC9C,iGAAiG;YACjG,2DAA2D;YAC3D,MAAM,iCAAiC,GAAG,mBAAmB,CAC5D,2BAA2B,CAC3B,CAAC;YACF,mBAAmB,GAAG,aAAa,CAClC,mBAAmB,EACnB,iCAAiC,CACjC,CAAC;SACF;QAED,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAC7D,aAAa,CACZ,mBAAmB,EACnB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,yBAAyB,CACtD,CACD,CAAC;QAEF,uFAAuF;QACvF,IAAI,aAAa,KAAK,IAAI,CAAC,SAAS,EAAE;YACrC,2GAA2G;YAC3G,+GAA+G;YAC/G,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBAChD,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;aAC7C;YAED,+GAA+G;YAC/G,4GAA4G;YAC5G,8GAA8G;YAC9G,gHAAgH;YAChH,iHAAiH;YACjH,iHAAiH;YACjH,kHAAkH;YAClH,0HAA0H;YAC1H,MAAM,YAAY,GAAG,aAA8C,CAAC;YACpE,oFAAoF;YACpF,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACjD,mHAAmH;YACnH,uGAAuG;YACvG,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAChD,yHAAyH;YACzH,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YAC5C,2HAA2H;YAC3H,OAAO,YAAY,CAAC,MAAM,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;YAE9B,sDAAsD;YACtD,IAAI,CAAC,WAAW,CAAC,SAAS,CACzB,yBAAyB,EACzB,UAAU,EACV,IAAI,EACJ,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACnB,kDAAkD;gBAClD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpC,wGAAwG;gBACxG,IAAI,gBAAgB,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE;oBACpC,MAAM,CACL,QAAQ,KAAK,YAAY,CAAC,QAAQ,EAClC,KAAK,CAAC,uDAAuD,CAC7D,CAAC;iBACF;qBAAM;oBACN,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;iBACxB;YACF,CAAC,CACD,CAAC;YAEF,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAC/E,MAAM,CACL,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,GAAG,CAAC,EACvC,KAAK,CAAC,2EAA2E,CACjF,CAAC;YACF,MAAM,CACL,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS,EACrC,KAAK,CAAC,iEAAiE,CACvE,CAAC;SACF;IACF,CAAC;IAEM,OAAO;QACb,OAAO,CACN,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,SAAS;YACvC,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YACnD,IAAI,CAAC,qBAAqB,KAAK,6BAA6B,CAC5D,CAAC;IACH,CAAC;IAEM,cAAc;QACpB,uGAAuG;QACvG,2BAA2B;QAC3B,sGAAsG;QACtG,6DAA6D;QAC7D,oGAAoG;QACpG,oFAAoF;QACpF,yGAAyG;QACzG,4DAA4D;QAC5D,MAAM,CACL,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EACnD,KAAK,CAAC,qEAAqE,CAC3E,CAAC;QAEF,IAAI,0BAA0B,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,MAAM,CACL,0BAA0B,CAAC,MAAM,KAAK,SAAS;YAC9C,0BAA0B,KAAK,IAAI,CAAC,SAAS,EAC9C,KAAK,CAAC,mFAAmF,CACzF,CAAC;QAEF,+GAA+G;QAC/G,0BAA0B;YACzB,0BAA0B,CAAC,MAAM,IAAI,0BAA0B,CAAC;QAEjE,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACzF,MAAM,QAAQ,GACb,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,oCAAoC,CAAC,CAAC;YAClF,MAAM,MAAM,GAAgC;gBAC3C,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc;gBAClD,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC7B,CAAC;YACF,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS,EAAE;gBACnD,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;aACvD;YACD,OAAO,MAAM,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAChC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE;YACrE,MAAM,UAAU,GAA8B,EAAE,CAAC;YACjD,MAAM,QAAQ,GACb,kBAAkB,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACxE,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAE9C,OAAO;gBACN,SAAS;gBACT;oBACC,IAAI,EAAE,QAAQ,CAAC,QAAQ;oBACvB,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC7B,MAAM,MAAM,GAAuB;4BAClC,MAAM,EAAE,CAAC,CAAC,MAAM;4BAChB,QAAQ,EAAE,CAAC,CAAC,QAAQ;4BACpB,SAAS;yBACT,CAAC;wBACF,OAAO,MAAM,CAAC;oBACf,CAAC,CAAC;iBACF;aACD,CAAC;QACH,CAAC,CAAC,CACF,CAAC;QAEF,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACrC,CAAC;IAEM,eAAe,CAAC,IAA6B;QACnD,MAAM,CACL,IAAI,CAAC,OAAO,EAAE,EACd,KAAK,CAAC,2EAA2E,CACjF,CAAC;QACF,iGAAiG;QACjG,yCAAyC;QACzC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAwC,CAAC;QAC3E,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,UAAU,GACf,CAAC,CAAC,YAAY,KAAK,SAAS;gBAC3B,CAAC,CAAC;oBACA,cAAc,EAAE,CAAC,CAAC,cAAc;iBAC/B;gBACH,CAAC,CAAC;oBACA,cAAc,EAAE,CAAC,CAAC,cAAc;oBAChC,YAAY,EAAE,CAAC,CAAC,YAAY;iBAC3B,CAAC;YACN,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;gBAClC,UAAU;gBACV,SAAS,EAAE,CAAC,CAAC,SAAS;aACtB,CAAC,CAAC;YACH,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,MAAM,CAAC;QACf,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAClB,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACzD,MAAM,MAAM,GACX,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;gBACnC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YAE5E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACzB,SAAS,EACT,IAAI,gBAAgB,CACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,EACzC,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,CACpB,CACD,CAAC;SACF;IACF,CAAC;IAEO,mBAAmB,CAAC,MAA+B;QAC1D,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,IAAI,yBAAyB,CAAC;IACzF,CAAC;IAEM,eAAe;QACrB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAEM,eAAe;QACrB,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9D,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEM,eAAe;QACrB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAEM,eAAe;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACI,sBAAsB;QAC5B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACrD,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;YAChE,IAAI,UAAU,CAAC,MAAM,GAAG,GAAG,EAAE;gBAC5B,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC;aACxB;SACD;QACD,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAEM,kBAAkB,CACxB,SAA6B,EAC7B,cAAyB,EACzB,uBAAkC;QAElC,MAAM,CACL,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAC3C,KAAK,CAAC,sFAAsF,CAC5F,CAAC;QAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAC5D,MAAM,UAAU,GACf,qBAAqB,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC;gBACA,cAAc;aACb;YACH,CAAC,CAAC;gBACA,cAAc;gBACd,YAAY,EAAE,qBAAqB,CAAC,MAAM;aACzC,CAAC;QAEN,IAAI,SAAS,CAAC,SAAS,KAAK,IAAI,CAAC,cAAc,EAAE;YAChD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YACnD,MAAM,CACL,gBAAgB,KAAK,SAAS,EAC9B,KAAK,CAAC,wFAAwF,CAC9F,CAAC;YAEF,4GAA4G;YAC5G,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/E,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YACtD,OAAO;SACP;QAED,sDAAsD;QACtD,MAAM,CAAC,EAAE,mBAAmB,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,CAAC;QACpF,wEAAwE;QACxE,8GAA8G;QAC9G,MAAM,eAAe,GAAG,WAAW,CAClC,IAAI,CAAC,iBAAiB,EACtB,SAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACJ,IAAI,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CACnF,CAAC;QACF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAE5D,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;YACvD,kGAAkG;YAClG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC9C,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9C;aAAM;YACN,gHAAgH;YAChH,MAAM,qBAAqB,GAAG,YAAY,CACzC,IAAI,CAAC,YAAY,CAAC,OAAO,EACzB,SAAS,CAAC,MAAM,EAChB,eAAe,CAAC,OAAO,EAAE,EACzB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EACpB,IAAI,CAAC,eAAe,CACpB,CAAC;YAEF,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;gBAClC,GAAG,SAAS;gBACZ,MAAM,EAAE,qBAAqB;aAC7B,CAAC,CAAC;SACH;QAED,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAEM,eAAe,CACrB,QAAqB;QAErB,MAAM,OAAO,GAA8B,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,YAAY,CAC1B,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,EACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAC9B,CAAC;QACF,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACpF,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC;IAEO,iBAAiB,CACxB,UAAsB,EACtB,MAA0B,EAC1B,KAAK,GAAG,KAAK;QAEb,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;IAEO,sBAAsB,CAC7B,UAAsB,EACtB,WAAoC,EACpC,SAAoB;QAEpB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;IACvE,CAAC;IAUO,qBAAqB,CAC5B,QAAgC;QAEhC,MAAM,UAAU,GACf,OAAO,QAAQ,KAAK,QAAQ;YAC3B,CAAC,CAAC;gBACA,gFAAgF;gBAChF,mDAAmD;gBACnD,+GAA+G;gBAC/G,cAAc,EAAE,QAAQ;gBACxB,YAAY,EAAE,MAAM,CAAC,iBAAiB;aACrC;YACH,CAAC,CAAC,QAAQ,CAAC;QAEb,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACvE,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,QAAQ,CAAC,cAAyB;QACzC,MAAM,eAAe,GAAe;YACnC,cAAc;SACd,CAAC;QACF,MAAM,aAAa,GAAe;YACjC,cAAc,EAAE,KAAK,CAAE,cAAyB,GAAG,CAAC,CAAC;SACrD,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;CACD;AAUD;;GAEG;AACH,SAAS,eAAe,CACvB,UAAmB,EACnB,cAAuB;IAEvB,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,MAAM,CACL,kBAAkB,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,cAAc,CAAC,KAAK,SAAS,EACpE,KAAK,CAAC,qCAAqC,CAC3C,CAAC;IACF,OAAO,IAAI,CAAC;AACb,CAAC","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\";\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { BTree } from \"@tylerbu/sorted-btree-es6\";\n\nimport {\n\tChangeFamily,\n\tChangeFamilyEditor,\n\tGraphCommit,\n\tRevisionTag,\n\tfindAncestor,\n\tfindCommonAncestor,\n\tmintCommit,\n\trebaseChange,\n} from \"../core/index.js\";\nimport {\n\tMutable,\n\tRecursiveReadonly,\n\tbrand,\n\tfail,\n\tgetOrCreate,\n\tmapIterable,\n} from \"../util/index.js\";\n\nimport { SharedTreeBranch, getChangeReplaceType, onForkTransitive } from \"./branch.js\";\nimport {\n\tCommit,\n\tSeqNumber,\n\tSequenceId,\n\tSequencedCommit,\n\tSummarySessionBranch,\n} from \"./editManagerFormat.js\";\nimport {\n\tdecrementSequenceId,\n\tequalSequenceIds,\n\tmaxSequenceId,\n\tminSequenceId,\n\tsequenceIdComparator,\n} from \"./sequenceIdUtils.js\";\n\nexport const minimumPossibleSequenceNumber: SeqNumber = brand(Number.MIN_SAFE_INTEGER);\nconst minimumPossibleSequenceId: SequenceId = {\n\tsequenceNumber: minimumPossibleSequenceNumber,\n};\n\n/\n Represents a local branch of a document and interprets the effect on the document of adding sequenced changes,\n * which were based on a given session's branch, to the document history\n /\n// TODO: Try to reduce this to a single type parameter\nexport class EditManager<\n\tTEditor extends ChangeFamilyEditor,\n\tTChangeset,\n\tTChangeFamily extends ChangeFamily<TEditor, TChangeset>,\n> {\n\t/* The \"trunk\" branch. The trunk represents the list of received sequenced changes. /\n\tprivate readonly trunk: SharedTreeBranch<TEditor, TChangeset>;\n\n\t/\n\t Records extra data associated with commits in the {@link trunk}.\n\t * This does not include an entry for the {@link trunkBase}.\n\t /\n\tprivate readonly trunkMetadata = new Map<\n\t\tRevisionTag,\n\t\t{ sequenceId: SequenceId; sessionId: SessionId }\n\t>();\n\t/\n\t A map from a sequence id to the commit in the {@link trunk} which has that sequence id.\n\t * This also includes an entry for the {@link trunkBase} which always has the lowest key in the map.\n\t /\n\tprivate readonly sequenceMap = new BTree<SequenceId, GraphCommit<TChangeset>>(\n\t\tundefined,\n\t\tsequenceIdComparator,\n\t);\n\n\t/\n\t Branches are maintained to represent the local change list that the issuing client had\n\t * at the time of submitting the latest known edit on the branch.\n\t * This means the head commit of each branch is always in its original (non-rebased) form.\n\t /\n\t// TODO:#4593: Add test to ensure that peer branches are never initialized with a repairDataStoreProvider\n\tprivate readonly peerLocalBranches: Map<SessionId, SharedTreeBranch<TEditor, TChangeset>> =\n\t\tnew Map();\n\n\t/\n\t This branch holds the changes made by this client which have not yet been confirmed as sequenced changes.\n\t /\n\tpublic readonly localBranch: SharedTreeBranch<TEditor, TChangeset>;\n\n\t/\n\t Tracks where on the trunk all registered branches are based. Each key is the sequence id of a commit on\n\t * the trunk, and the value is the set of all branches who have that commit as their common ancestor with the trunk.\n\t /\n\tprivate readonly trunkBranches = new BTree<\n\t\tSequenceId,\n\t\tSet<SharedTreeBranch<TEditor, TChangeset>>\n\t>(undefined, sequenceIdComparator);\n\n\t/\n\t The sequence number of the newest commit on the trunk that has been received by all peers.\n\t * Defaults to {@link minimumPossibleSequenceNumber} if no commits have been received.\n\t \n\t @remarks If there are more than one commit with the same sequence number we assume this refers to the last commit in the batch.\n\t /\n\tprivate minimumSequenceNumber = minimumPossibleSequenceNumber;\n\n\t/\n\t A special commit that is a \"base\" (tail) of the trunk, though not part of the trunk itself.\n\t * This makes it possible to model the trunk in the same way as any other branch (it branches off of a base commit)\n\t * which allows it to use branching APIs to interact with the other branches.\n\t * Each time trunk eviction occurs, the most recent evicted commit becomes the new `trunkBase`.\n\t /\n\tprivate trunkBase: GraphCommit<TChangeset>;\n\n\t/\n\t The list of commits (from oldest to most recent) that are on the local branch but not on the trunk.\n\t * When a local commit is sequenced, the first commit in this list shifted onto the tip of the trunk.\n\t /\n\tprivate readonly localCommits: GraphCommit<TChangeset>[] = [];\n\n\t/\n\t @param changeFamily - the change family of changes on the trunk and local branch\n\t * @param localSessionId - the id of the local session that will be used for local commits\n\t /\n\tpublic constructor(\n\t\tpublic readonly changeFamily: TChangeFamily,\n\t\tpublic readonly localSessionId: SessionId,\n\t\tprivate readonly mintRevisionTag: () => RevisionTag,\n\t) {\n\t\tthis.trunkBase = {\n\t\t\trevision: \"root\",\n\t\t\tchange: changeFamily.rebaser.compose([]),\n\t\t};\n\t\tthis.sequenceMap.set(minimumPossibleSequenceId, this.trunkBase);\n\t\tthis.trunk = new SharedTreeBranch(this.trunkBase, changeFamily, mintRevisionTag);\n\t\tthis.localBranch = new SharedTreeBranch(\n\t\t\tthis.trunk.getHead(),\n\t\t\tchangeFamily,\n\t\t\tmintRevisionTag,\n\t\t);\n\n\t\tthis.localBranch.on(\"afterChange\", (event) => {\n\t\t\tif (event.type === \"append\") {\n\t\t\t\tfor (const commit of event.newCommits) {\n\t\t\t\t\tthis.localCommits.push(commit);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tthis.localCommits.length = 0;\n\t\t\t\tfindCommonAncestor(\n\t\t\t\t\t[this.localBranch.getHead(), this.localCommits],\n\t\t\t\t\tthis.trunk.getHead(),\n\t\t\t\t);\n\t\t\t}\n\t\t});\n\n\t\t// Track all forks of the local branch for purposes of trunk eviction. Unlike the local branch, they have\n\t\t// an unknown lifetime and rebase frequency, so we can not make any assumptions about which trunk commits\n\t\t// they require and therefore we monitor them explicitly.\n\t\tonForkTransitive(this.localBranch, (fork) => this.registerBranch(fork));\n\t}\n\n\t/\n\t Make the given branch known to the `EditManager`. The `EditManager` will ensure that all registered\n\t * branches remain usable even as the minimum sequence number advances.\n\t \n\t TODO#AB6926: Refactor local branch management into a separate class that encapsulates `trunkBranches` and everything\n\t * that touches it.\n\t * TODO#AB6925: Maintain the divergence point between each branch and the trunk so that we don't have to recompute\n\t * it so often.\n\t /\n\tprivate registerBranch(branch: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tthis.trackBranch(branch);\n\t\t// Whenever the branch is rebased, update our record of its base trunk commit\n\t\tconst offBeforeRebase = branch.on(\"beforeChange\", (args) => {\n\t\t\tif (args.type === \"replace\" && getChangeReplaceType(args) === \"rebase\") {\n\t\t\t\tthis.untrackBranch(branch);\n\t\t\t}\n\t\t});\n\t\tconst offAfterRebase = branch.on(\"afterChange\", (args) => {\n\t\t\tif (args.type === \"replace\" && getChangeReplaceType(args) === \"rebase\") {\n\t\t\t\tthis.trackBranch(branch);\n\t\t\t\tthis.trimTrunk();\n\t\t\t}\n\t\t});\n\t\t// When the branch is disposed, update our branch set and trim the trunk\n\t\tconst offDispose = branch.on(\"dispose\", () => {\n\t\t\tthis.untrackBranch(branch);\n\t\t\tthis.trimTrunk();\n\t\t\toffBeforeRebase();\n\t\t\toffAfterRebase();\n\t\t\toffDispose();\n\t\t});\n\t}\n\n\tprivate trackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tconst trunkCommit =\n\t\t\tfindCommonAncestor(this.trunk.getHead(), b.getHead()) ??\n\t\t\tfail(\"Expected branch to be related to trunk\");\n\t\tconst sequenceId = this.getCommitSequenceId(trunkCommit);\n\t\tconst branches = getOrCreate(this.trunkBranches, sequenceId, () => new Set());\n\n\t\tassert(!branches.has(b), 0x670 / Branch was registered more than once /);\n\t\tbranches.add(b);\n\t}\n\n\tprivate untrackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {\n\t\tconst trunkCommit =\n\t\t\tfindCommonAncestor(this.trunk.getHead(), b.getHead()) ??\n\t\t\tfail(\"Expected branch to be related to trunk\");\n\t\tconst sequenceId = this.getCommitSequenceId(trunkCommit);\n\t\tconst branches =\n\t\t\tthis.trunkBranches.get(sequenceId) ?? fail(\"Expected branch to be tracked\");\n\n\t\tassert(branches.delete(b), 0x671 / Expected branch to be tracked /);\n\t\tif (branches.size === 0) {\n\t\t\tthis.trunkBranches.delete(sequenceId);\n\t\t}\n\t}\n\n\t/\n\t Updates the `trunkBranches` map to reflect the fact that a new local commit was fast-forwarded to the trunk.\n\t * @param priorTrunkCommit - The trunk head prior to the fast-forward.\n\t * @param newId - The ID of the new trunk head.\n\t /\n\tprivate fastForwardBranches(\n\t\tpriorTrunkCommit: GraphCommit<TChangeset>,\n\t\tnewId: SequenceId,\n\t): void {\n\t\tconst currentId = this.getCommitSequenceId(priorTrunkCommit);\n\t\tconst currentBranches = this.trunkBranches.get(currentId);\n\t\tif (currentBranches !== undefined) {\n\t\t\tconst newBranches = getOrCreate(this.trunkBranches, newId, () => new Set());\n\t\t\tfor (const branch of currentBranches) {\n\t\t\t\tif (branch.getHead() !== priorTrunkCommit) {\n\t\t\t\t\tnewBranches.add(branch);\n\t\t\t\t\tcurrentBranches.delete(branch);\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (currentBranches.size === 0) {\n\t\t\t\tthis.trunkBranches.delete(currentId);\n\t\t\t}\n\t\t}\n\t}\n\n\t/\n\t Advances the minimum sequence number, and removes all commits from the trunk which lie outside the collaboration window,\n\t * if they are not retained by revertibles or local branches.\n\t * @param minimumSequenceNumber - the sequence number of the newest commit that all peers (including this one) have received and applied to their trunks.\n\t \n\t @remarks If there are more than one commit with the same sequence number we assume this refers to the last commit in the batch.\n\t /\n\tpublic advanceMinimumSequenceNumber(minimumSequenceNumber: SeqNumber): void {\n\t\tif (minimumSequenceNumber === this.minimumSequenceNumber) {\n\t\t\treturn;\n\t\t}\n\n\t\tassert(\n\t\t\tminimumSequenceNumber > this.minimumSequenceNumber,\n\t\t\t0x476 / number must be larger or equal to current minimumSequenceNumber. /,\n\t\t);\n\n\t\tthis.minimumSequenceNumber = minimumSequenceNumber;\n\t\tthis.trimTrunk();\n\t}\n\n\t/\n\t Examines the latest known minimum sequence number and the trunk bases of any registered branches to determine\n\t * if any commits on the trunk are unreferenced and unneeded for future computation; those found are evicted from the trunk.\n\t * @returns the number of commits that were removed from the trunk\n\t /\n\tprivate trimTrunk(): void {\n\t\t/* The sequence id of the oldest commit on the trunk that will be retained /\n\t\tlet trunkTailSequenceId: SequenceId = {\n\t\t\tsequenceNumber: this.minimumSequenceNumber,\n\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t};\n\t\t// If there are any outstanding registered branches, get the one that is the oldest (has the \"most behind\" trunk base)\n\t\tconst minimumBranchBaseSequenceId = this.trunkBranches.minKey();\n\t\tif (minimumBranchBaseSequenceId !== undefined) {\n\t\t\t// If that branch is behind the minimum sequence id, we only want to evict commits older than it,\n\t\t\t// even if those commits are behind the minimum sequence id\n\t\t\tconst sequenceIdBeforeMinimumBranchBase = decrementSequenceId(\n\t\t\t\tminimumBranchBaseSequenceId,\n\t\t\t);\n\t\t\ttrunkTailSequenceId = minSequenceId(\n\t\t\t\ttrunkTailSequenceId,\n\t\t\t\tsequenceIdBeforeMinimumBranchBase,\n\t\t\t);\n\t\t}\n\n\t\tconst [sequenceId, latestEvicted] = this.getClosestTrunkCommit(\n\t\t\tmaxSequenceId(\n\t\t\t\ttrunkTailSequenceId,\n\t\t\t\tthis.sequenceMap.minKey() ?? minimumPossibleSequenceId,\n\t\t\t),\n\t\t);\n\n\t\t// Don't do any work if the commit found by the search is already the tail of the trunk\n\t\tif (latestEvicted !== this.trunkBase) {\n\t\t\t// The minimum sequence number informs us that all peer branches are at least caught up to the tail commit,\n\t\t\t// so rebase them accordingly. This is necessary to prevent peer branches from referencing any evicted commits.\n\t\t\tfor (const [, branch] of this.peerLocalBranches) {\n\t\t\t\tbranch.rebaseOnto(this.trunk, latestEvicted);\n\t\t\t}\n\n\t\t\t// This mutation is a performance hack. If commits are truly immutable, then changing the trunk's tail requires\n\t\t\t// regenerating the entire commit graph. Instead, we can simply chop off the tail like this if we're certain\n\t\t\t// that there are no outstanding references to any of the commits being removed (other than the references via\n\t\t\t// the trunk). The peer branches have been rebased to the head of the trunk, the local branch is already rebased\n\t\t\t// to the head of the trunk, and all other branches are tracked by `trunkBranches` and known to be ahead of or at\n\t\t\t// `newTrunkBase`. Therefore, no branches should have unique references to any of the commits being evicted here.\n\t\t\t// We mutate the most recent of the evicted commits to become the new trunk base. That way, any other commits that\n\t\t\t// have parent pointers to the latest evicted commit will stay linked, even though that it is no longer part of the trunk.\n\t\t\tconst newTrunkBase = latestEvicted as Mutable<typeof latestEvicted>;\n\t\t\t// The metadata for new trunk base revision needs to be deleted before modifying it.\n\t\t\tthis.trunkMetadata.delete(newTrunkBase.revision);\n\t\t\t// Copying the revision of the old trunk base into the new trunk base means we don't need to write out the original\n\t\t\t// revision to summaries. All clients agree that the trunk base always has the same hardcoded revision.\n\t\t\tnewTrunkBase.revision = this.trunkBase.revision;\n\t\t\t// Overwriting the change is not strictly necessary, but done here for consistency (so all trunk bases are deeply equal).\n\t\t\tnewTrunkBase.change = this.trunkBase.change;\n\t\t\t// Dropping the parent field removes (transitively) all references to the evicted commits so they can be garbage collected.\n\t\t\tdelete newTrunkBase.parent;\n\t\t\tthis.trunkBase = newTrunkBase;\n\n\t\t\t// Update any state that is derived from trunk commits\n\t\t\tthis.sequenceMap.editRange(\n\t\t\t\tminimumPossibleSequenceId,\n\t\t\t\tsequenceId,\n\t\t\t\ttrue,\n\t\t\t\t(s, { revision }) => {\n\t\t\t\t\t// Cleanup look-aside data for each evicted commit\n\t\t\t\t\tthis.trunkMetadata.delete(revision);\n\t\t\t\t\t// Delete all evicted commits from `sequenceMap` except for the latest one, which is the new `trunkBase`\n\t\t\t\t\tif (equalSequenceIds(s, sequenceId)) {\n\t\t\t\t\t\tassert(\n\t\t\t\t\t\t\trevision === newTrunkBase.revision,\n\t\t\t\t\t\t\t0x729 / Expected last evicted commit to be new trunk base /,\n\t\t\t\t\t\t);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn { delete: true };\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t);\n\n\t\t\tconst trunkSize = getPathFromBase(this.trunk.getHead(), this.trunkBase).length;\n\t\t\tassert(\n\t\t\t\tthis.sequenceMap.size === trunkSize + 1,\n\t\t\t\t0x744 / The size of the sequenceMap must have one element more than the trunk /,\n\t\t\t);\n\t\t\tassert(\n\t\t\t\tthis.trunkMetadata.size === trunkSize,\n\t\t\t\t0x745 / The size of the trunkMetadata must be the same as the trunk /,\n\t\t\t);\n\t\t}\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn (\n\t\t\tthis.trunk.getHead() === this.trunkBase &&\n\t\t\tthis.peerLocalBranches.size === 0 &&\n\t\t\tthis.localBranch.getHead() === this.trunk.getHead() &&\n\t\t\tthis.minimumSequenceNumber === minimumPossibleSequenceNumber\n\t\t);\n\t}\n\n\tpublic getSummaryData(): SummaryData<TChangeset> {\n\t\t// The assert below is acceptable at present because summarization only ever occurs on a client with no\n\t\t// local/in-flight changes.\n\t\t// In the future we may wish to relax this constraint. For that to work, the current implementation of\n\t\t// `EditManager` would have to be amended in one of two ways:\n\t\t// A) Changes made by the local session should be represented by a branch in `EditManager.branches`.\n\t\t// B) The contents of such a branch should be computed on demand based on the trunk.\n\t\t// Note that option (A) would be a simple change to `addSequencedChange` whereas (B) would likely require\n\t\t// rebasing trunk changes over the inverse of trunk changes.\n\t\tassert(\n\t\t\tthis.localBranch.getHead() === this.trunk.getHead(),\n\t\t\t0x428 / Clients with local changes cannot be used to generate summaries /,\n\t\t);\n\n\t\tlet oldestCommitInCollabWindow = this.getClosestTrunkCommit(this.minimumSequenceNumber)[1];\n\t\tassert(\n\t\t\toldestCommitInCollabWindow.parent !== undefined \|\|\n\t\t\t\toldestCommitInCollabWindow === this.trunkBase,\n\t\t\t0x8c7 / Expected oldest commit in collab window to have a parent or be the trunk base /,\n\t\t);\n\n\t\t// Path construction is exclusive, so we need to use the parent of the oldest commit in the window if it exists\n\t\toldestCommitInCollabWindow =\n\t\t\toldestCommitInCollabWindow.parent ?? oldestCommitInCollabWindow;\n\n\t\tconst trunk = getPathFromBase(this.trunk.getHead(), oldestCommitInCollabWindow).map((c) => {\n\t\t\tconst metadata =\n\t\t\t\tthis.trunkMetadata.get(c.revision) ?? fail(\"Expected metadata for trunk commit\");\n\t\t\tconst commit: SequencedCommit<TChangeset> = {\n\t\t\t\tchange: c.change,\n\t\t\t\trevision: c.revision,\n\t\t\t\tsequenceNumber: metadata.sequenceId.sequenceNumber,\n\t\t\t\tsessionId: metadata.sessionId,\n\t\t\t};\n\t\t\tif (metadata.sequenceId.indexInBatch !== undefined) {\n\t\t\t\tcommit.indexInBatch = metadata.sequenceId.indexInBatch;\n\t\t\t}\n\t\t\treturn commit;\n\t\t});\n\n\t\tconst peerLocalBranches = new Map<SessionId, SummarySessionBranch<TChangeset>>(\n\t\t\tmapIterable(this.peerLocalBranches.entries(), ([sessionId, branch]) => {\n\t\t\t\tconst branchPath: GraphCommit<TChangeset>[] = [];\n\t\t\t\tconst ancestor =\n\t\t\t\t\tfindCommonAncestor([branch.getHead(), branchPath], this.trunk.getHead()) ??\n\t\t\t\t\tfail(\"Expected branch to be based on trunk\");\n\n\t\t\t\treturn [\n\t\t\t\t\tsessionId,\n\t\t\t\t\t{\n\t\t\t\t\t\tbase: ancestor.revision,\n\t\t\t\t\t\tcommits: branchPath.map((c) => {\n\t\t\t\t\t\t\tconst commit: Commit<TChangeset> = {\n\t\t\t\t\t\t\t\tchange: c.change,\n\t\t\t\t\t\t\t\trevision: c.revision,\n\t\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t};\n\t\t\t\t\t\t\treturn commit;\n\t\t\t\t\t\t}),\n\t\t\t\t\t},\n\t\t\t\t];\n\t\t\t}),\n\t\t);\n\n\t\treturn { trunk, peerLocalBranches };\n\t}\n\n\tpublic loadSummaryData(data: SummaryData<TChangeset>): void {\n\t\tassert(\n\t\t\tthis.isEmpty(),\n\t\t\t0x68a / Attempted to load from summary after edit manager was already mutated /,\n\t\t);\n\t\t// Record the tags of each trunk commit as we generate the trunk so they can be looked up quickly\n\t\t// when hydrating the peer branches below\n\t\tconst trunkRevisionCache = new Map<RevisionTag, GraphCommit<TChangeset>>();\n\t\ttrunkRevisionCache.set(this.trunkBase.revision, this.trunkBase);\n\t\tthis.trunk.setHead(\n\t\t\tdata.trunk.reduce((base, c) => {\n\t\t\t\tconst sequenceId: SequenceId =\n\t\t\t\t\tc.indexInBatch === undefined\n\t\t\t\t\t\t? {\n\t\t\t\t\t\t\t\tsequenceNumber: c.sequenceNumber,\n\t\t\t\t\t\t }\n\t\t\t\t\t\t: {\n\t\t\t\t\t\t\t\tsequenceNumber: c.sequenceNumber,\n\t\t\t\t\t\t\t\tindexInBatch: c.indexInBatch,\n\t\t\t\t\t\t };\n\t\t\t\tconst commit = mintCommit(base, c);\n\t\t\t\tthis.sequenceMap.set(sequenceId, commit);\n\t\t\t\tthis.trunkMetadata.set(c.revision, {\n\t\t\t\t\tsequenceId,\n\t\t\t\t\tsessionId: c.sessionId,\n\t\t\t\t});\n\t\t\t\ttrunkRevisionCache.set(c.revision, commit);\n\t\t\t\treturn commit;\n\t\t\t}, this.trunkBase),\n\t\t);\n\n\t\tthis.localBranch.setHead(this.trunk.getHead());\n\n\t\tfor (const [sessionId, branch] of data.peerLocalBranches) {\n\t\t\tconst commit =\n\t\t\t\ttrunkRevisionCache.get(branch.base) ??\n\t\t\t\tfail(\"Expected summary branch to be based off of a revision in the trunk\");\n\n\t\t\tthis.peerLocalBranches.set(\n\t\t\t\tsessionId,\n\t\t\t\tnew SharedTreeBranch(\n\t\t\t\t\tbranch.commits.reduce(mintCommit, commit),\n\t\t\t\t\tthis.changeFamily,\n\t\t\t\t\tthis.mintRevisionTag,\n\t\t\t\t),\n\t\t\t);\n\t\t}\n\t}\n\n\tprivate getCommitSequenceId(commit: GraphCommit<TChangeset>): SequenceId {\n\t\treturn this.trunkMetadata.get(commit.revision)?.sequenceId ?? minimumPossibleSequenceId;\n\t}\n\n\tpublic getTrunkChanges(): readonly RecursiveReadonly<TChangeset>[] {\n\t\treturn this.getTrunkCommits().map((c) => c.change);\n\t}\n\n\tpublic getTrunkCommits(): readonly RecursiveReadonly<GraphCommit<TChangeset>>[] {\n\t\treturn getPathFromBase(this.trunk.getHead(), this.trunkBase);\n\t}\n\n\tpublic getTrunkHead(): GraphCommit<TChangeset> {\n\t\treturn this.trunk.getHead();\n\t}\n\n\tpublic getLocalChanges(): readonly RecursiveReadonly<TChangeset>[] {\n\t\treturn this.getLocalCommits().map((c) => c.change);\n\t}\n\n\tpublic getLocalCommits(): readonly RecursiveReadonly<GraphCommit<TChangeset>>[] {\n\t\treturn this.localCommits;\n\t}\n\n\t/\n\t @returns The length of the longest branch maintained by this EditManager.\n\t * This may be the length of a peer branch or the local branch.\n\t * The length is counted from the lowest common ancestor with the trunk such that a fully sequenced branch would\n\t * have length zero.\n\t /\n\tpublic getLongestBranchLength(): number {\n\t\tlet max = 0;\n\t\tconst trunkHead = this.trunk.getHead();\n\t\tfor (const branch of this.peerLocalBranches.values()) {\n\t\t\tconst branchPath = getPathFromBase(branch.getHead(), trunkHead);\n\t\t\tif (branchPath.length > max) {\n\t\t\t\tmax = branchPath.length;\n\t\t\t}\n\t\t}\n\t\tconst localPath = getPathFromBase(this.localBranch.getHead(), trunkHead);\n\t\treturn Math.max(max, localPath.length);\n\t}\n\n\tpublic addSequencedChange(\n\t\tnewCommit: Commit<TChangeset>,\n\t\tsequenceNumber: SeqNumber,\n\t\treferenceSequenceNumber: SeqNumber,\n\t): void {\n\t\tassert(\n\t\t\tsequenceNumber > this.minimumSequenceNumber,\n\t\t\t0x713 / Expected change sequence number to exceed the last known minimum sequence number /,\n\t\t);\n\n\t\tconst commitsSequenceNumber = this.getBatch(sequenceNumber);\n\t\tconst sequenceId: SequenceId =\n\t\t\tcommitsSequenceNumber.length === 0\n\t\t\t\t? {\n\t\t\t\t\t\tsequenceNumber,\n\t\t\t\t }\n\t\t\t\t: {\n\t\t\t\t\t\tsequenceNumber,\n\t\t\t\t\t\tindexInBatch: commitsSequenceNumber.length,\n\t\t\t\t };\n\n\t\tif (newCommit.sessionId === this.localSessionId) {\n\t\t\tconst headTrunkCommit = this.trunk.getHead();\n\t\t\tconst firstLocalCommit = this.localCommits.shift();\n\t\t\tassert(\n\t\t\t\tfirstLocalCommit !== undefined,\n\t\t\t\t0x6b5 / Received a sequenced change from the local session despite having no local changes /,\n\t\t\t);\n\n\t\t\t// The first local branch commit is already rebased over the trunk, so we can push it directly to the trunk.\n\t\t\tthis.pushGraphCommitToTrunk(sequenceId, firstLocalCommit, this.localSessionId);\n\t\t\tthis.fastForwardBranches(headTrunkCommit, sequenceId);\n\t\t\treturn;\n\t\t}\n\n\t\t// Get the revision that the remote change is based on\n\t\tconst [, baseRevisionInTrunk] = this.getClosestTrunkCommit(referenceSequenceNumber);\n\t\t// Rebase that branch over the part of the trunk up to the base revision\n\t\t// This will be a no-op if the sending client has not advanced since the last time we received an edit from it\n\t\tconst peerLocalBranch = getOrCreate(\n\t\t\tthis.peerLocalBranches,\n\t\t\tnewCommit.sessionId,\n\t\t\t() =>\n\t\t\t\tnew SharedTreeBranch(baseRevisionInTrunk, this.changeFamily, this.mintRevisionTag),\n\t\t);\n\t\tpeerLocalBranch.rebaseOnto(this.trunk, baseRevisionInTrunk);\n\n\t\tif (peerLocalBranch.getHead() === this.trunk.getHead()) {\n\t\t\t// If the branch is fully caught up and empty after being rebased, then push to the trunk directly\n\t\t\tthis.pushCommitToTrunk(sequenceId, newCommit);\n\t\t\tpeerLocalBranch.setHead(this.trunk.getHead());\n\t\t} else {\n\t\t\t// Otherwise, rebase the change over the trunk and append it, and append the original change to the peer branch.\n\t\t\tconst newChangeFullyRebased = rebaseChange(\n\t\t\t\tthis.changeFamily.rebaser,\n\t\t\t\tnewCommit.change,\n\t\t\t\tpeerLocalBranch.getHead(),\n\t\t\t\tthis.trunk.getHead(),\n\t\t\t\tthis.mintRevisionTag,\n\t\t\t);\n\n\t\t\tpeerLocalBranch.apply(newCommit.change, newCommit.revision);\n\t\t\tthis.pushCommitToTrunk(sequenceId, {\n\t\t\t\t...newCommit,\n\t\t\t\tchange: newChangeFullyRebased,\n\t\t\t});\n\t\t}\n\n\t\tthis.localBranch.rebaseOnto(this.trunk);\n\t}\n\n\tpublic findLocalCommit(\n\t\trevision: RevisionTag,\n\t): [commit: GraphCommit<TChangeset>, commitsAfter: GraphCommit<TChangeset>[]] {\n\t\tconst commits: GraphCommit<TChangeset>[] = [];\n\t\tconst commit = findAncestor(\n\t\t\t[this.localBranch.getHead(), commits],\n\t\t\t(c) => c.revision === revision,\n\t\t);\n\t\tassert(commit !== undefined, 0x599 / Expected local branch to contain revision /);\n\t\treturn [commit, commits];\n\t}\n\n\tprivate pushCommitToTrunk(\n\t\tsequenceId: SequenceId,\n\t\tcommit: Commit<TChangeset>,\n\t\tlocal = false,\n\t): void {\n\t\tconst mintedCommit = mintCommit(this.trunk.getHead(), commit);\n\t\tthis.pushGraphCommitToTrunk(sequenceId, mintedCommit, commit.sessionId);\n\t}\n\n\tprivate pushGraphCommitToTrunk(\n\t\tsequenceId: SequenceId,\n\t\tgraphCommit: GraphCommit<TChangeset>,\n\t\tsessionId: SessionId,\n\t): void {\n\t\tthis.trunk.setHead(graphCommit);\n\t\tconst trunkHead = this.trunk.getHead();\n\t\tthis.sequenceMap.set(sequenceId, trunkHead);\n\t\tthis.trunkMetadata.set(trunkHead.revision, { sequenceId, sessionId });\n\t}\n\n\t/\n\t Finds the most recent trunk commit that was sequenced at or before the given point.\n\t * @param searchBy - the sequence number or the sequence id to search for\n\t * @remarks Fails if there is no eligible commit.\n\t * @returns the closest commit and its sequence id\n\t /\n\tprivate getClosestTrunkCommit(searchBy: SeqNumber): [SequenceId, GraphCommit<TChangeset>];\n\tprivate getClosestTrunkCommit(searchBy: SequenceId): [SequenceId, GraphCommit<TChangeset>];\n\tprivate getClosestTrunkCommit(\n\t\tsearchBy: SeqNumber \| SequenceId,\n\t): [SequenceId, GraphCommit<TChangeset>] {\n\t\tconst sequenceId: SequenceId =\n\t\t\ttypeof searchBy === \"number\"\n\t\t\t\t? {\n\t\t\t\t\t\t// This is to make sure that the correct commit is selected in this 2 scenarios:\n\t\t\t\t\t\t// 1) The commit is unique for that sequence number\n\t\t\t\t\t\t// 2) There are more than one commit for the same sequence number, in this case we need to select the last one.\n\t\t\t\t\t\tsequenceNumber: searchBy,\n\t\t\t\t\t\tindexInBatch: Number.POSITIVE_INFINITY,\n\t\t\t\t }\n\t\t\t\t: searchBy;\n\n\t\tconst commit = this.sequenceMap.getPairOrNextLower(sequenceId);\n\t\tassert(commit !== undefined, 0x746 / sequence id has been evicted /);\n\t\treturn commit;\n\t}\n\n\tprivate getBatch(sequenceNumber: SeqNumber): [SequenceId, GraphCommit<TChangeset>][] {\n\t\tconst startSequenceId: SequenceId = {\n\t\t\tsequenceNumber,\n\t\t};\n\t\tconst endSequenceId: SequenceId = {\n\t\t\tsequenceNumber: brand((sequenceNumber as number) + 1),\n\t\t};\n\n\t\treturn this.sequenceMap.getRange(startSequenceId, endSequenceId, false);\n\t}\n}\n\n/\n The in-memory data that summaries contain\n /\nexport interface SummaryData<TChangeset> {\n\treadonly trunk: readonly SequencedCommit<TChangeset>[];\n\treadonly peerLocalBranches: ReadonlyMap<SessionId, SummarySessionBranch<TChangeset>>;\n}\n\n/\n @returns the path from the base of a branch to its head\n /\nfunction getPathFromBase<TCommit extends { parent?: TCommit }>(\n\tbranchHead: TCommit,\n\tbaseBranchHead: TCommit,\n): TCommit[] {\n\tconst path: TCommit[] = [];\n\tassert(\n\t\tfindCommonAncestor([branchHead, path], baseBranchHead) !== undefined,\n\t\t0x573 / Expected branches to be related */,\n\t);\n\treturn path;\n}\n"]}

package/lib/shared-tree-core/editManagerCodecs.d.ts CHANGED Viewed

@@ -2,13 +2,13 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ICodecOptions, IJsonCodec, IMultiFormatCodec } from "../codec/index.js";
-import { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
+import { type ICodecFamily, ICodecOptions, IJsonCodec } from "../codec/index.js";
+import { ChangeEncodingContext, EncodedRevisionTag, RevisionTag, SchemaAndPolicy } from "../core/index.js";
 import { JsonCompatibleReadOnly } from "../util/index.js";
 import { SummaryData } from "./editManager.js";
 export interface EditManagerEncodingContext {
     readonly schema?: SchemaAndPolicy;
 }
-export declare function makeEditManagerCodec<TChangeset>(changeCodec: IMultiFormatCodec<TChangeset, JsonCompatibleReadOnly, JsonCompatibleReadOnly, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions): IJsonCodec<SummaryData<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, ChangeEncodingContext>;
+export declare function makeEditManagerCodec<TChangeset>(changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions, writeVersion: number): IJsonCodec<SummaryData<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, EditManagerEncodingContext>;
+export declare function makeEditManagerCodecs<TChangeset>(changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions): ICodecFamily<SummaryData<TChangeset>, EditManagerEncodingContext>;
 //# sourceMappingURL=editManagerCodecs.d.ts.map

package/lib/shared-tree-core/editManagerCodecs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManagerCodecs.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,aAAa,EACb,UAAU,~~EACV~~,~~iBAAiB,EAEjB,~~MAAM,mBAAmB,CAAC;~~AAC3B~~,OAAO,~~EAAE~~,qBAAqB,~~EAAE~~,kBAAkB,~~EAAE~~,WAAW,~~EAAE~~,~~MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,~~eAAe,~~EAAE~~,MAAM~~,+BAA+B~~,CAAC;~~AAChE~~,OAAO,EACN,sBAAsB,EAGtB,MAAM,kBAAkB,CAAC;~~AAC1B~~,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;~~AAS~~/C,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAC9C,~~WAAW~~,EAAE,~~iBAAiB~~,~~CAC7B~~,UAAU,~~EACV~~,~~sBAAsB,EACtB,sBAAsB,EACtB,~~qBAAqB,~~CACrB~~,~~EACD~~,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,~~GACpB~~,UAAU,CACZ,WAAW,CAAC,UAAU,CAAC,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,CACrB,~~CA6FA~~"}
1	+ {"version":3,"file":"editManagerCodecs.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,KAAK,YAAY,EACjB,aAAa,EACb,UAAU,EAIV,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACN,qBAAqB,EACrB,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACN,sBAAsB,EAGtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAC9C,YAAY,EAAE,YAAY,CAAC,UAAU,EAAE,qBAAqB,CAAC,EAC7D,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,GAClB,UAAU,CACZ,WAAW,CAAC,UAAU,CAAC,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,CAGA;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAC/C,YAAY,EAAE,YAAY,CAAC,UAAU,EAAE,qBAAqB,CAAC,EAC7D,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,EACD,OAAO,EAAE,aAAa,GACpB,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,0BAA0B,CAAC,CAKnE"}

package/lib/shared-tree-core/editManagerCodecs.js CHANGED Viewed

@@ -2,10 +2,21 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { makeVersionedValidatedCodec, } from "../codec/index.js";
+import { makeCodecFamily, withSchemaValidation, } from "../codec/index.js";
+import { makeVersionDispatchingCodec } from "../codec/index.js";
 import { JsonCompatibleReadOnlySchema, mapIterable, } from "../util/index.js";
-import { EncodedEditManager, version, } from "./editManagerFormat.js";
-export function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
+import { EncodedEditManager } from "./editManagerFormat.js";
+export function makeEditManagerCodec(changeCodecs, revisionTagCodec, options, writeVersion) {
+    const family = makeEditManagerCodecs(changeCodecs, revisionTagCodec, options);
+    return makeVersionDispatchingCodec(family, { ...options, writeVersion });
+}
+export function makeEditManagerCodecs(changeCodecs, revisionTagCodec, options) {
+    return makeCodecFamily([
+        [1, makeV1CodecWithVersion(changeCodecs.resolve(1), revisionTagCodec, options, 1)],
+        [2, makeV1CodecWithVersion(changeCodecs.resolve(2), revisionTagCodec, options, 2)],
+    ]);
+}
+function makeV1CodecWithVersion(changeCodec, revisionTagCodec, options, version) {
     const format = EncodedEditManager(changeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema);
     const encodeCommit = (commit, context) => ({
         ...commit,
@@ -17,7 +28,7 @@ export function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
         revision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),
         change: changeCodec.json.decode(commit.change, context),
     });
-    const codec = makeVersionedValidatedCodec(options, new Set([version]), format, {
+    const codec = withSchemaValidation(format, {
         encode: (data, context) => {
             const json = {
                 trunk: data.trunk.map((commit) => encodeCommit(commit, {
@@ -53,7 +64,9 @@ export function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
                 peerLocalBranches: new Map(mapIterable(json.branches, ([sessionId, branch]) => [
                     sessionId,
                     {
-                        base: revisionTagCodec.decode(branch.base, { originatorId: sessionId }),
+                        base: revisionTagCodec.decode(branch.base, {
+                            originatorId: sessionId,
+                        }),
                         commits: branch.commits.map((commit) =>
                         // TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
                         decodeCommit(commit, {
@@ -63,7 +76,7 @@ export function makeEditManagerCodec(changeCodec, revisionTagCodec, options) {
                 ])),
             };
         },
-    });
+    }, options.jsonValidator);
     // TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,
     // and not leak the internal encoded format in the API surface.
     // Fixing that would remove the need for this cast.

package/lib/shared-tree-core/editManagerCodecs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManagerCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,~~EAIN~~,2BAA2B,~~GAC3B~~,MAAM,mBAAmB,CAAC;~~AAG3B~~,OAAO,EAEN,4BAA4B,EAC5B,WAAW,GACX,MAAM,kBAAkB,CAAC;~~AAE1B~~,OAAO,~~EAGN~~,kBAAkB,~~EAElB~~,~~OAAO,GACP,~~MAAM,wBAAwB,CAAC;~~AAMhC~~,MAAM,UAAU,oBAAoB,CACnC,WAKC,EACD,gBAKC,EACD,OAAsB;~~IAOtB~~,MAAM,MAAM,GAAG,kBAAkB,CAChC,WAAW,CAAC,IAAI,CAAC,aAAa,IAAI,4BAA4B,CAC9D,CAAC;IAEF,MAAM,YAAY,GAAG,CACpB,MAAS,EACT,OAA8B,EAC7B,EAAE,CAAC,CAAC;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QACtF,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CACpB,MAAS,EACT,OAA8B,EAC7B,EAAE,CAAC,CAAC;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QACtF,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,KAAK,GAKP,~~2BAA2B~~,~~CAAC~~,~~OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,~~MAAM,~~EAAE~~;~~QACpE~~,MAAM,EAAE,CAAC,IAAI,EAAE,OAAmC,EAAE,EAAE;YACrD,MAAM,IAAI,GAAmC;gBAC5C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,YAAY,CAAC,MAAM,EAAE;oBACpB,YAAY,EAAE,MAAM,CAAC,SAAS;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;iBACtB,CAAC,CACF;gBACD,QAAQ,EAAE,KAAK,CAAC,IAAI,~~CAAC~~,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,~~EAAE~~,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;~~oBAC/E~~,SAAS;oBACT;wBACC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;4BAC1C,YAAY,EAAE,SAAS;yBACvB,CAAC;wBACF,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACtC,YAAY,CAAC,MAAM,EAAE;4BACpB,YAAY,EAAE,MAAM,CAAC,SAAS;4BAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;yBACtB,CAAC,CACF;qBACD;iBACD,~~CAAC~~;~~gBACF~~,OAAO;aACP,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,EAAE,CAAC,IAAoC,EAA2B,EAAE;YACzE,kFAAkF;YAClF,MAAM,KAAK,GAAmB,IAAI,CAAC,KAAK,CAAC;YACzC,OAAO;gBACN,KAAK,EAAE,KAAK,CAAC,GAAG,CACf,CAAC,MAAM,EAA+B,EAAE;gBACvC,iFAAiF;gBACjF,+DAA+D;gBAC/D,YAAY,CAAC,MAAM,EAAE;oBACpB,YAAY,EAAE,MAAM,CAAC,SAAS;iBAC9B,CAAC,CACH;gBACD,iBAAiB,EAAE,IAAI,GAAG,CACzB,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;oBACnD,SAAS;oBACT;wBACC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,~~EAAE,~~YAAY,EAAE,SAAS,~~EAAE,~~CAAC;~~wBACvE~~,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;wBACtC,iFAAiF;wBACjF,YAAY,CAAC,MAA+C,EAAE;4BAC7D,YAAY,EAAE,MAAM,CAAC,SAAS;yBAC9B,CAAC,CACF;qBACD;iBACD,CAAC,CACF;aACD,CAAC;QACH,CAAC;KACD,CAAC,CAAC;~~IACH~~,2JAA2J;IAC3J,+DAA+D;IAC/D,mDAAmD;IACnD,OAAO,KAKN,CAAC;AACH,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n\tICodecOptions,\n\tIJsonCodec,\n\tIMultiFormatCodec,\n\~~tmakeVersionedValidatedCodec~~,\n} from \"../codec/index.js\";\nimport { ~~ChangeEncodingContext,~~ ~~EncodedRevisionTag, RevisionTag~~ } from \"../~~core~~/index.js\";\nimport { ~~SchemaAndPolicy~~ } from \"../~~feature-libraries~~/index.js\";\nimport {\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tmapIterable,\n} from \"../util/index.js\";\nimport { SummaryData } from \"./editManager.js\";\nimport {~~\n\tCommit,\n\tEncodedCommit,\n\tEncodedEditManager,\n\tSequencedCommit,\n\tversion,\n~~} from \"./editManagerFormat.js\";\n\nexport interface EditManagerEncodingContext {\n\treadonly schema?: SchemaAndPolicy;\n}\n\nexport function makeEditManagerCodec<TChangeset>(\n\tchangeCodec: IMultiFormatCodec<\n\t\tTChangeset,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tChangeEncodingContext\n\t>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\~~tChangeEncodingContext~~\n> {\n\tconst format = EncodedEditManager(\n\t\tchangeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema,\n\t);\n\n\tconst encodeCommit = <T extends Commit<TChangeset>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.encode(commit.change, context),\n\t});\n\n\tconst decodeCommit = <T extends EncodedCommit<JsonCompatibleReadOnly>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.decode(commit.change, context),\n\t});\n\n\tconst codec: IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEditManagerEncodingContext\n\t> = ~~makeVersionedValidatedCodec~~(~~options, new Set([version]), format,~~ {\n\t\tencode: (data, context: EditManagerEncodingContext) => {\n\t\t\tconst json: EncodedEditManager<TChangeset> = {\n\t\t\t\ttrunk: data.trunk.map((commit) =>\n\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t\tbranches: Array.from(~~data~~.peerLocalBranches.entries(), ([sessionId, branch]) => [\n\t\t\t\t\tsessionId,\n\t\t\t\t\t{\n\t\t\t\t\t\tbase: revisionTagCodec.encode(branch.base, {\n\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t),\n\t\t\t\t\t},\n\t\t\t\t]),\n\t\t\t\tversion,\n\t\t\t};\n\t\t\treturn json;\n\t\t},\n\t\tdecode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {\n\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.\n\t\t\tconst trunk: readonly any[] = json.trunk;\n\t\t\treturn {\n\t\t\t\ttrunk: trunk.map(\n\t\t\t\t\t(commit): SequencedCommit<TChangeset> =>\n\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-unsafe-return\n\t\t\t\t\t\tdecodeCommit(commit, {\n\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t\tpeerLocalBranches: new Map(\n\t\t\t\t\tmapIterable(json.branches, ([sessionId, branch]) => [\n\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tbase: revisionTagCodec.decode(branch.base, { ~~originatorId~~: sessionId }),\n\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t\tdecodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {\n\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t},\n\t\t\t\t\t]),\n\t\t\t\t),\n\t\t\t};\n\t\t},\n\t});\n\t// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,\n\t// and not leak the internal encoded format in the API surface.\n\t// Fixing that would remove the need for this cast.\n\treturn codec as unknown as IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\~~tChangeEncodingContext~~\n\t>;\n}\n"]}
1	+ {"version":3,"file":"editManagerCodecs.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerCodecs.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 {\n\ttype ICodecFamily,\n\tICodecOptions,\n\tIJsonCodec,\n\tIMultiFormatCodec,\n\tmakeCodecFamily,\n\twithSchemaValidation,\n} from \"../codec/index.js\";\nimport { makeVersionDispatchingCodec } from \"../codec/index.js\";\nimport {\n\tChangeEncodingContext,\n\tEncodedRevisionTag,\n\tRevisionTag,\n\tSchemaAndPolicy,\n} from \"../core/index.js\";\nimport {\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnlySchema,\n\tmapIterable,\n} from \"../util/index.js\";\n\nimport { SummaryData } from \"./editManager.js\";\nimport { Commit, EncodedCommit, EncodedEditManager, SequencedCommit } from \"./editManagerFormat.js\";\n\nexport interface EditManagerEncodingContext {\n\treadonly schema?: SchemaAndPolicy;\n}\n\nexport function makeEditManagerCodec<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\twriteVersion: number,\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tEditManagerEncodingContext\n> {\n\tconst family = makeEditManagerCodecs(changeCodecs, revisionTagCodec, options);\n\treturn makeVersionDispatchingCodec(family, { ...options, writeVersion });\n}\n\nexport function makeEditManagerCodecs<TChangeset>(\n\tchangeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n): ICodecFamily<SummaryData<TChangeset>, EditManagerEncodingContext> {\n\treturn makeCodecFamily([\n\t\t[1, makeV1CodecWithVersion(changeCodecs.resolve(1), revisionTagCodec, options, 1)],\n\t\t[2, makeV1CodecWithVersion(changeCodecs.resolve(2), revisionTagCodec, options, 2)],\n\t]);\n}\n\nfunction makeV1CodecWithVersion<TChangeset>(\n\tchangeCodec: IMultiFormatCodec<\n\t\tTChangeset,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tChangeEncodingContext\n\t>,\n\trevisionTagCodec: IJsonCodec<\n\t\tRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tEncodedRevisionTag,\n\t\tChangeEncodingContext\n\t>,\n\toptions: ICodecOptions,\n\tversion: EncodedEditManager<TChangeset>[\"version\"],\n): IJsonCodec<\n\tSummaryData<TChangeset>,\n\tJsonCompatibleReadOnly,\n\tJsonCompatibleReadOnly,\n\tEditManagerEncodingContext\n> {\n\tconst format = EncodedEditManager(\n\t\tchangeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema,\n\t);\n\n\tconst encodeCommit = <T extends Commit<TChangeset>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.encode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.encode(commit.change, context),\n\t});\n\n\tconst decodeCommit = <T extends EncodedCommit<JsonCompatibleReadOnly>>(\n\t\tcommit: T,\n\t\tcontext: ChangeEncodingContext,\n\t) => ({\n\t\t...commit,\n\t\trevision: revisionTagCodec.decode(commit.revision, { originatorId: commit.sessionId }),\n\t\tchange: changeCodec.json.decode(commit.change, context),\n\t});\n\n\tconst codec: IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEncodedEditManager<TChangeset>,\n\t\tEditManagerEncodingContext\n\t> = withSchemaValidation(\n\t\tformat,\n\t\t{\n\t\t\tencode: (data, context: EditManagerEncodingContext) => {\n\t\t\t\tconst json: EncodedEditManager<TChangeset> = {\n\t\t\t\t\ttrunk: data.trunk.map((commit) =>\n\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t\tbranches: Array.from(\n\t\t\t\t\t\tdata.peerLocalBranches.entries(),\n\t\t\t\t\t\t([sessionId, branch]) => [\n\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tbase: revisionTagCodec.encode(branch.base, {\n\t\t\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t\tencodeCommit(commit, {\n\t\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t\t\tschema: context.schema,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t],\n\t\t\t\t\t),\n\t\t\t\t\tversion,\n\t\t\t\t};\n\t\t\t\treturn json;\n\t\t\t},\n\t\t\tdecode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {\n\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.\n\t\t\t\tconst trunk: readonly any[] = json.trunk;\n\t\t\t\treturn {\n\t\t\t\t\ttrunk: trunk.map(\n\t\t\t\t\t\t(commit): SequencedCommit<TChangeset> =>\n\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-unsafe-return\n\t\t\t\t\t\t\tdecodeCommit(commit, {\n\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t\tpeerLocalBranches: new Map(\n\t\t\t\t\t\tmapIterable(json.branches, ([sessionId, branch]) => [\n\t\t\t\t\t\t\tsessionId,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tbase: revisionTagCodec.decode(branch.base, {\n\t\t\t\t\t\t\t\t\toriginatorId: sessionId,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\tcommits: branch.commits.map((commit) =>\n\t\t\t\t\t\t\t\t\t// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.\n\t\t\t\t\t\t\t\t\tdecodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {\n\t\t\t\t\t\t\t\t\t\toriginatorId: commit.sessionId,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t]),\n\t\t\t\t\t),\n\t\t\t\t};\n\t\t\t},\n\t\t},\n\t\toptions.jsonValidator,\n\t);\n\t// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,\n\t// and not leak the internal encoded format in the API surface.\n\t// Fixing that would remove the need for this cast.\n\treturn codec as unknown as IJsonCodec<\n\t\tSummaryData<TChangeset>,\n\t\tJsonCompatibleReadOnly,\n\t\tJsonCompatibleReadOnly,\n\t\tEditManagerEncodingContext\n\t>;\n}\n"]}

package/lib/shared-tree-core/editManagerFormat.d.ts CHANGED Viewed

@@ -2,10 +2,10 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { TSchema, Static } from "@sinclair/typebox";
 import { SessionId } from "@fluidframework/id-compressor";
+import { Static, TSchema } from "@sinclair/typebox";
+import { EncodedRevisionTag, RevisionTag } from "../core/index.js";
 import { Brand } from "../util/index.js";
-import { RevisionTag, EncodedRevisionTag } from "../core/index.js";
 /**
  * Contains a single change to the `SharedTree` and associated metadata.
  *
@@ -51,11 +51,10 @@ export interface EncodedSummarySessionBranch<TChangeset> {
 export interface EncodedEditManager<TChangeset> {
     readonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];
     readonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];
-    readonly version: typeof version;
+    readonly version: 1 | 2;
 }
-export declare const version = 1;
 export declare const EncodedEditManager: <ChangeSchema extends TSchema>(tChange: ChangeSchema) => import("@sinclair/typebox").TObject<{
-    version: import("@sinclair/typebox").TLiteral<1>;
+    version: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<1>, import("@sinclair/typebox").TLiteral<2>]>;
     trunk: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<import("@sinclair/typebox").TCompositeReduce<[import("@sinclair/typebox").TObject<{
         revision: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"root">, import("@sinclair/typebox").TUnsafe<Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>;
         change: ChangeSchema;

package/lib/shared-tree-core/editManagerFormat.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManagerFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,~~OAAO~~,~~EAAuB,MAAM,~~EAAE,MAAM,~~mBAAmB,~~CAAC;~~AACzE~~,OAAO,~~EAAE~~,~~SAAS~~,EAAE,MAAM~~,+BAA+B~~,CAAC;~~AAC1D~~,OAAO,~~EAAE~~,~~KAAK~~,~~EAAqB~~,MAAM,kBAAkB,CAAC;~~AAC5D~~,OAAO,~~EAEN~~,~~WAAW~~,~~EAEX~~,~~kBAAkB,EAClB,~~MAAM,kBAAkB,CAAC;~~AAE1B~~;;;;;GAKG;AACH,MAAM,WAAW,MAAM,CAAC,UAAU;IACjC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B;AAGD,MAAM,MAAM,aAAa,CAAC,UAAU,IAAI;IACvC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B,CAAC;AAiBF,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAGhE,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,UAAU,CAAE,SAAQ,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU;CAAG;AAKtF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB,CAAC,UAAU;IAC/C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,2BAA2B,CAAC,UAAU;IACtD,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAUD,MAAM,WAAW,kBAAkB,CAAC,UAAU;IAC7C,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,OAAO,EAAE,~~OAAO~~,~~OAAO~~,CAAC;~~CACjC~~;AAED,eAAO,MAAM,~~OAAO,IAAM,CAAC;AAE3B,eAAO,MAAM,~~kBAAkB;;;;;;;;;;;;;;;;;;EAQ7B,CAAC"}
1	+ {"version":3,"file":"editManagerFormat.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAiB,MAAM,EAAE,OAAO,EAAQ,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EACN,kBAAkB,EAClB,WAAW,EAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAqB,MAAM,kBAAkB,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,WAAW,MAAM,CAAC,UAAU;IACjC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B;AAGD,MAAM,MAAM,aAAa,CAAC,UAAU,IAAI;IACvC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC9B,CAAC;AAiBF,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAGhE,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,UAAU,CAAE,SAAQ,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU;CAAG;AAKtF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB,CAAC,UAAU;IAC/C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,2BAA2B,CAAC,UAAU;IACtD,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;CACvC;AAUD,MAAM,WAAW,kBAAkB,CAAC,UAAU;IAC7C,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAQ7B,CAAC"}

package/lib/shared-tree-core/editManagerFormat.js CHANGED Viewed

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 import { Type } from "@sinclair/typebox";
+import { RevisionTagSchema, SessionIdSchema, } from "../core/index.js";
 import { brandedNumberType } from "../util/index.js";
-import { SessionIdSchema, RevisionTagSchema, } from "../core/index.js";
 const noAdditionalProps = { additionalProperties: false };
 const CommitBase = (tChange) => Type.Object({
     revision: RevisionTagSchema,
@@ -26,9 +26,8 @@ const SummarySessionBranch = (tChange) => Type.Object({
     base: RevisionTagSchema,
     commits: Type.Array(Commit(tChange)),
 }, noAdditionalProps);
-export const version = 1.0;
 export const EncodedEditManager = (tChange) => Type.Object({
-    version: Type.Literal(version),
+    version: Type.Union([Type.Literal(1), Type.Literal(2)]),
     trunk: Type.Array(SequencedCommit(tChange)),
     branches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),
 }, noAdditionalProps);

package/lib/shared-tree-core/editManagerFormat.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManagerFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAEH~~,OAAO,~~EAAW~~,IAAI,~~EAAyB~~,MAAM,mBAAmB,CAAC;AAEzE,OAAO,~~EAAS~~,iBAAiB,~~EAAE~~,MAAM,kBAAkB,CAAC;~~AAC5D~~,OAAO,~~EACN~~,~~eAAe,EAEf,~~iBAAiB,~~GAEjB~~,MAAM,kBAAkB,CAAC;~~AAsB1B~~,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC1E,IAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,iBAAiB;IAC3B,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,eAAe;CAC1B,CAAC,CAAC;AACJ;;;GAGG;AACH,MAAM,MAAM,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACtE,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAG1D,MAAM,SAAS,GAAG,iBAAiB,CAAY,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;AAElE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAC9B,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CACvE,CAAC,CAAC;AASH,MAAM,eAAe,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC/E,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAiBtE,MAAM,oBAAoB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACpF,IAAI,CAAC,MAAM,CACV;IACC,IAAI,EAAE,iBAAiB;IACvB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACpC,EACD,iBAAiB,CACjB,CAAC;AAQH,MAAM,CAAC,MAAM,~~OAAO,GAAG,GAAG,CAAC;AAE3B,MAAM,CAAC,MAAM,~~kBAAkB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACzF,IAAI,CAAC,MAAM,CACV;IACC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;~~IAC9B~~,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAClF,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { ~~TSchema, Type, ObjectOptions, Static } from \"@sinclair/typebox\";\nimport {~~ SessionId } from \"@fluidframework/id-compressor\";\nimport { ~~Brand~~, ~~brandedNumberType~~ } from \"~~../util~~/~~index.js~~\";\nimport {\n\~~tSessionIdSchema~~,\n\tRevisionTag,\n\tRevisionTagSchema,\n\~~tEncodedRevisionTag~~,\n} from \"../core/index.js\";\n\n/\n Contains a single change to the `SharedTree` and associated metadata.\n \n TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, clarify the difference between it and EncodedCommit.\n /\nexport interface Commit<TChangeset> {\n\treadonly revision: RevisionTag;\n\treadonly change: TChangeset;\n\t/* An identifier representing the session/user/client that made this commit /\n\treadonly sessionId: SessionId;\n}\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport type EncodedCommit<TChangeset> = {\n\treadonly revision: EncodedRevisionTag;\n\treadonly change: TChangeset;\n\treadonly sessionId: SessionId;\n};\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst CommitBase = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\tchange: tChange,\n\t\tsessionId: SessionIdSchema,\n\t});\n/\n @privateRemarks Commits are generally encoded from `GraphCommit`s, which often contain extra data.\n * This `noAdditionalProps` is especially important in that light.\n /\nconst Commit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange)], noAdditionalProps);\n\nexport type SeqNumber = Brand<number, \"edit-manager.SeqNumber\">;\nconst SeqNumber = brandedNumberType<SeqNumber>({ multipleOf: 1 });\n\nconst SequenceId = Type.Object({\n\tsequenceNumber: SeqNumber,\n\tindexInBatch: Type.Optional(Type.Number({ multipleOf: 1, minimum: 0 })),\n});\n\nexport type SequenceId = Static<typeof SequenceId>;\n\n/\n A commit with a sequence number but no parentage; used for serializing the `EditManager` into a summary\n /\nexport interface SequencedCommit<TChangeset> extends Commit<TChangeset>, SequenceId {}\n\nconst SequencedCommit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange), SequenceId], noAdditionalProps);\n\n/\n A branch off of the trunk for use in summaries.\n \n TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, use EncodedCommit instead of Commit or clarify that Commit is also an encoded format.\n */\nexport interface SummarySessionBranch<TChangeset> {\n\treadonly base: RevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\n\nexport interface EncodedSummarySessionBranch<TChangeset> {\n\treadonly base: EncodedRevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\nconst SummarySessionBranch = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tbase: RevisionTagSchema,\n\t\t\tcommits: Type.Array(Commit(tChange)),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n\nexport interface EncodedEditManager<TChangeset> {\n\treadonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];\n\treadonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];\n\treadonly version: ~~typeof~~ ~~version~~;\n}\n\nexport const ~~version = 1.0;\n\nexport const~~ EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tversion: Type.Literal(~~version~~),\n\t\t\ttrunk: Type.Array(SequencedCommit(tChange)),\n\t\t\tbranches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n"]}
1	+ {"version":3,"file":"editManagerFormat.js","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerFormat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAkC,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAGN,iBAAiB,EACjB,eAAe,GACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAS,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAsB5D,MAAM,iBAAiB,GAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC1E,IAAI,CAAC,MAAM,CAAC;IACX,QAAQ,EAAE,iBAAiB;IAC3B,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,eAAe;CAC1B,CAAC,CAAC;AACJ;;;GAGG;AACH,MAAM,MAAM,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACtE,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAG1D,MAAM,SAAS,GAAG,iBAAiB,CAAY,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;AAElE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAC9B,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CACvE,CAAC,CAAC;AASH,MAAM,eAAe,GAAG,CAA+B,OAAqB,EAAE,EAAE,CAC/E,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAiBtE,MAAM,oBAAoB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACpF,IAAI,CAAC,MAAM,CACV;IACC,IAAI,EAAE,iBAAiB;IACvB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACpC,EACD,iBAAiB,CACjB,CAAC;AAQH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAA+B,OAAqB,EAAE,EAAE,CACzF,IAAI,CAAC,MAAM,CACV;IACC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAClF,EACD,iBAAiB,CACjB,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { SessionId } from \"@fluidframework/id-compressor\";\nimport { ObjectOptions, Static, TSchema, Type } from \"@sinclair/typebox\";\n\nimport {\n\tEncodedRevisionTag,\n\tRevisionTag,\n\tRevisionTagSchema,\n\tSessionIdSchema,\n} from \"../core/index.js\";\nimport { Brand, brandedNumberType } from \"../util/index.js\";\n\n/\n Contains a single change to the `SharedTree` and associated metadata.\n \n TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, clarify the difference between it and EncodedCommit.\n /\nexport interface Commit<TChangeset> {\n\treadonly revision: RevisionTag;\n\treadonly change: TChangeset;\n\t/* An identifier representing the session/user/client that made this commit /\n\treadonly sessionId: SessionId;\n}\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport type EncodedCommit<TChangeset> = {\n\treadonly revision: EncodedRevisionTag;\n\treadonly change: TChangeset;\n\treadonly sessionId: SessionId;\n};\n\nconst noAdditionalProps: ObjectOptions = { additionalProperties: false };\n\nconst CommitBase = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object({\n\t\trevision: RevisionTagSchema,\n\t\tchange: tChange,\n\t\tsessionId: SessionIdSchema,\n\t});\n/\n @privateRemarks Commits are generally encoded from `GraphCommit`s, which often contain extra data.\n * This `noAdditionalProps` is especially important in that light.\n /\nconst Commit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange)], noAdditionalProps);\n\nexport type SeqNumber = Brand<number, \"edit-manager.SeqNumber\">;\nconst SeqNumber = brandedNumberType<SeqNumber>({ multipleOf: 1 });\n\nconst SequenceId = Type.Object({\n\tsequenceNumber: SeqNumber,\n\tindexInBatch: Type.Optional(Type.Number({ multipleOf: 1, minimum: 0 })),\n});\n\nexport type SequenceId = Static<typeof SequenceId>;\n\n/\n A commit with a sequence number but no parentage; used for serializing the `EditManager` into a summary\n /\nexport interface SequencedCommit<TChangeset> extends Commit<TChangeset>, SequenceId {}\n\nconst SequencedCommit = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Composite([CommitBase(tChange), SequenceId], noAdditionalProps);\n\n/\n A branch off of the trunk for use in summaries.\n \n TODO: if this type is not used in the encoded format, move it out of this file, and stop using it in EncodedEditManager.\n * If this is an encoded format, use EncodedCommit instead of Commit or clarify that Commit is also an encoded format.\n */\nexport interface SummarySessionBranch<TChangeset> {\n\treadonly base: RevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\n\nexport interface EncodedSummarySessionBranch<TChangeset> {\n\treadonly base: EncodedRevisionTag;\n\treadonly commits: Commit<TChangeset>[];\n}\nconst SummarySessionBranch = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tbase: RevisionTagSchema,\n\t\t\tcommits: Type.Array(Commit(tChange)),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n\nexport interface EncodedEditManager<TChangeset> {\n\treadonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];\n\treadonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];\n\treadonly version: 1 \| 2;\n}\n\nexport const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>\n\tType.Object(\n\t\t{\n\t\t\tversion: Type.Union([Type.Literal(1), Type.Literal(2)]),\n\t\t\ttrunk: Type.Array(SequencedCommit(tChange)),\n\t\t\tbranches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),\n\t\t},\n\t\tnoAdditionalProps,\n\t);\n"]}

package/lib/shared-tree-core/editManagerSummarizer.d.ts CHANGED Viewed

@@ -4,20 +4,21 @@
  */
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import { IGarbageCollectionData, ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions";
-import { ICodecOptions, IJsonCodec } from "../codec/index.js";
-import { ChangeEncodingContext, ChangeFamily, ChangeFamilyEditor, EncodedRevisionTag, RevisionTag } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
+import { IJsonCodec } from "../codec/index.js";
+import { ChangeFamily, ChangeFamilyEditor, SchemaAndPolicy } from "../core/index.js";
+import { JsonCompatibleReadOnly } from "../util/index.js";
+import { EditManager, SummaryData } from "./editManager.js";
+import { EditManagerEncodingContext } from "./editManagerCodecs.js";
 import { Summarizable, SummaryElementParser, SummaryElementStringifier } from "./sharedTreeCore.js";
-import { EditManager } from "./editManager.js";
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
 export declare class EditManagerSummarizer<TChangeset> implements Summarizable {
     private readonly editManager;
+    private readonly codec;
     private readonly schemaAndPolicy?;
     readonly key = "EditManager";
-    private readonly codec;
-    constructor(editManager: EditManager<ChangeFamilyEditor, TChangeset, ChangeFamily<ChangeFamilyEditor, TChangeset>>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>, options: ICodecOptions, schemaAndPolicy?: SchemaAndPolicy | undefined);
+    constructor(editManager: EditManager<ChangeFamilyEditor, TChangeset, ChangeFamily<ChangeFamilyEditor, TChangeset>>, codec: IJsonCodec<SummaryData<TChangeset>, JsonCompatibleReadOnly, JsonCompatibleReadOnly, EditManagerEncodingContext>, schemaAndPolicy?: SchemaAndPolicy | undefined);
     getAttachSummary(stringify: SummaryElementStringifier, fullTree?: boolean, trackState?: boolean, telemetryContext?: ITelemetryContext): ISummaryTreeWithStats;
     summarize(stringify: SummaryElementStringifier, fullTree?: boolean, trackState?: boolean, telemetryContext?: ITelemetryContext): Promise<ISummaryTreeWithStats>;
     private summarizeCore;

package/lib/shared-tree-core/editManagerSummarizer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"editManagerSummarizer.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EACN,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,qCAAqC,CAAC;~~AAE7C~~,OAAO,EAAE,~~aAAa,EAAE,~~UAAU,EAAE,MAAM,mBAAmB,CAAC;~~AAC9D~~,OAAO,~~EACN~~,~~qBAAqB,EACrB,~~YAAY,~~EACZ~~,kBAAkB,~~EAClB~~,~~kBAAkB~~,~~EAClB~~,~~WAAW,EACX,~~MAAM,kBAAkB,CAAC;~~AAE1B~~,OAAO,EAAE,~~eAAe~~,EAAE,MAAM~~,+BAA+B~~,CAAC;~~AAChE~~,OAAO,EAAE,~~YAAY~~,EAAE,~~oBAAoB~~,EAAE,~~yBAAyB~~,EAAE,MAAM,~~qBAAqB~~,CAAC;~~AACpG~~,OAAO,EAAE,~~WAAW~~,~~EAAe~~,MAAM,~~kBAAkB~~,CAAC;~~AAO5D~~;;GAEG;AACH,qBAAa,qBAAqB,CAAC,UAAU,CAAE,YAAW,YAAY;~~IAepE~~,OAAO,CAAC,QAAQ,CAAC,WAAW;~~IAY5B~~,OAAO,CAAC,QAAQ,CAAC,~~eAAe,CAAC~~;~~IA1BlC~~,~~SAAgB,GAAG,iBAAiB;IAOpC,~~OAAO,CAAC,QAAQ,CAAC,~~KAAK~~,~~CAKpB~~;~~gBAEgB~~,WAAW,EAAE,WAAW,CACxC,kBAAkB,EAClB,UAAU,EACV,YAAY,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAC5C,~~EACD~~,~~gBAAgB~~,EAAE,UAAU,~~CAC3B~~,WAAW,~~EACX~~,~~kBAAkB~~,~~EAClB~~,~~kBAAkB~~,~~EAClB~~,~~qBAAqB~~,~~CACrB~~,~~EACD~~,~~OAAO~~,~~EAAE~~,~~aAAa~~,~~EACL,~~eAAe,CAAC,6BAAiB;~~IAM5C~~,gBAAgB,CACtB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,qBAAqB;IAIX,SAAS,CACrB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,qBAAqB,CAAC;IAIjC,OAAO,CAAC,aAAa;IAQd,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,sBAAsB;IAU7C,IAAI,CAChB,QAAQ,EAAE,sBAAsB,EAChC,KAAK,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;CAehB"}
1	+ {"version":3,"file":"editManagerSummarizer.d.ts","sourceRoot":"","sources":["../../src/shared-tree-core/editManagerSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EACN,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAIpG;;GAEG;AACH,qBAAa,qBAAqB,CAAC,UAAU,CAAE,YAAW,YAAY;IAIpE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAK5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAMtB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAdlC,SAAgB,GAAG,iBAAiB;gBAGlB,WAAW,EAAE,WAAW,CACxC,kBAAkB,EAClB,UAAU,EACV,YAAY,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAC5C,EACgB,KAAK,EAAE,UAAU,CACjC,WAAW,CAAC,UAAU,CAAC,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,EACgB,eAAe,CAAC,6BAAiB;IAG5C,gBAAgB,CACtB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,qBAAqB;IAIX,SAAS,CACrB,SAAS,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,OAAO,EAClB,UAAU,CAAC,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,qBAAqB,CAAC;IAIjC,OAAO,CAAC,aAAa;IAQd,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,sBAAsB;IAU7C,IAAI,CAChB,QAAQ,EAAE,sBAAsB,EAChC,KAAK,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;CAehB"}

package/lib/shared-tree-core/editManagerSummarizer.js CHANGED Viewed

@@ -3,21 +3,18 @@
  * Licensed under the MIT License.
  */
 import { bufferToString } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
-import { createSingleBlobSummary } from "@fluidframework/shared-object-base";
-import { makeEditManagerCodec } from "./editManagerCodecs.js";
+import { assert } from "@fluidframework/core-utils/internal";
+import { createSingleBlobSummary } from "@fluidframework/shared-object-base/internal";
 const stringKey = "String";
-const formatVersion = 0;
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
 export class EditManagerSummarizer {
-    constructor(editManager, revisionTagCodec, options, schemaAndPolicy) {
+    constructor(editManager, codec, schemaAndPolicy) {
         this.editManager = editManager;
+        this.codec = codec;
         this.schemaAndPolicy = schemaAndPolicy;
         this.key = "EditManager";
-        const changesetCodec = this.editManager.changeFamily.codecs.resolve(formatVersion);
-        this.codec = makeEditManagerCodec(changesetCodec, revisionTagCodec, options);
     }
     getAttachSummary(stringify, fullTree, trackState, telemetryContext) {
         return this.summarizeCore(stringify);