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/feature-libraries/sequence-field/rebase.js CHANGED Viewed

@@ -2,16 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert, unreachableCase } from "@fluidframework/core-utils";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { brand, fail, getOrAddEmptyToMap } from "../../util/index.js";
 import { CrossFieldTarget, NodeExistenceState, getIntention, } from "../modular-schema/index.js";
-import { isDetach, cloneMark, areInputCellsEmpty, markEmptiesCells, markFillsCells, getOffsetInCellRange, compareLineages, withNodeChange, cloneCellId, areOutputCellsEmpty, isNewAttach, getInputCellId, isAttachAndDetachEffect, getEndpoint, isAttach, compareCellsFromSameRevision, cellSourcesFromMarks, isTombstone, compareCellPositionsUsingTombstones, isImpactfulCellRename, CellOrder, getDetachIdForLineage, getDetachOutputId, splitMarkEffect, extractMarkEffect, } from "./utils.js";
-import { NoopMarkType, } from "./types.js";
-import { MarkListFactory } from "./markListFactory.js";
-import { getMoveEffect, setMoveEffect, isMoveMark, isMoveOut, isMoveIn, } from "./moveEffectTable.js";
-import { MarkQueue } from "./markQueue.js";
 import { CellOrderingMethod, sequenceConfig } from "./config.js";
 import { DetachIdOverrideType } from "./format.js";
+import { MarkListFactory } from "./markListFactory.js";
+import { MarkQueue } from "./markQueue.js";
+import { getMoveEffect, isMoveIn, isMoveMark, isMoveOut, setMoveEffect, } from "./moveEffectTable.js";
+import { NoopMarkType, } from "./types.js";
+import { CellOrder, areInputCellsEmpty, areOutputCellsEmpty, cellSourcesFromMarks, cloneCellId, cloneMark, compareCellPositionsUsingTombstones, compareCellsFromSameRevision, compareLineages, extractMarkEffect, getDetachIdForLineage, getDetachOutputCellId, getEndpoint, getInputCellId, getOffsetInCellRange, isAttach, isAttachAndDetachEffect, isDetach, isImpactfulCellRename, isNewAttach, isTombstone, markEmptiesCells, markFillsCells, splitMarkEffect, withNodeChange, } from "./utils.js";
 /**
  * Rebases `change` over `base` assuming they both apply to the same initial state.
  * @param change - The changeset to rebase.
@@ -217,16 +217,10 @@ class RebaseQueue {
  */
 function addMovedMarkEffect(mark, effect) {
     if (isMoveIn(mark) && isMoveOut(effect)) {
-        const result = {
-            ...mark,
-            type: "Insert",
-            count: mark.count,
-            id: mark.id,
-        };
-        if (effect.revision !== undefined) {
-            result.revision = effect.revision;
-        }
-        return result;
+        return { ...mark, type: "Insert" };
+    }
+    else if (isAttachAndDetachEffect(mark) && isMoveIn(mark.attach) && isMoveOut(effect)) {
+        return { ...mark.detach, count: mark.count };
     }
     else if (isTombstone(mark)) {
         return { ...mark, ...effect };
@@ -250,7 +244,7 @@ function rebaseMarkIgnoreChild(currMark, baseMark, baseRevision, metadata, moveE
             delete currMark.cellId;
         }
         assert(!isNewAttach(currMark), 0x69d /* A new attach should not be rebased over its cell being emptied */);
-        const baseCellId = getDetachOutputId(baseMark, baseRevision, metadata);
+        const baseCellId = getDetachOutputCellId(baseMark, baseRevision, metadata);
         if (isMoveOut(baseMark)) {
             assert(isMoveMark(baseMark), 0x6f0 /* Only move marks have move IDs */);
             assert(!isNewAttach(currMark), 0x819 /* New attaches should not be rebased over moves */);

package/lib/feature-libraries/sequence-field/rebase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/rebase.ts"],"names":[],"mappings":"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","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { assert, unreachableCase } from \"@fluidframework/core-utils\";\nimport { IdAllocator, brand, fail, getOrAddEmptyToMap } from \"../../util/index.js\";\nimport {\n\tChangeAtomId,\n\tChangesetLocalId,\n\tRevisionMetadataSource,\n\tRevisionTag,\n\tTaggedChange,\n} from \"../../core/index.js\";\nimport {\n\tCrossFieldManager,\n\tCrossFieldTarget,\n\tNodeExistenceState,\n\tRebaseRevisionMetadata,\n\tgetIntention,\n} from \"../modular-schema/index.js\";\nimport {\n\tisDetach,\n\tcloneMark,\n\tareInputCellsEmpty,\n\tmarkEmptiesCells,\n\tmarkFillsCells,\n\tgetOffsetInCellRange,\n\tcompareLineages,\n\twithNodeChange,\n\tcloneCellId,\n\tareOutputCellsEmpty,\n\tisNewAttach,\n\tgetInputCellId,\n\tisAttachAndDetachEffect,\n\tgetEndpoint,\n\tisAttach,\n\tcompareCellsFromSameRevision,\n\tcellSourcesFromMarks,\n\tisTombstone,\n\tcompareCellPositionsUsingTombstones,\n\tisImpactfulCellRename,\n\tCellOrder,\n\tgetDetachIdForLineage,\n\tgetDetachOutputId,\n\tsplitMarkEffect,\n\textractMarkEffect,\n} from \"./utils.js\";\nimport {\n\tChangeset,\n\tMark,\n\tMarkList,\n\tNoopMark,\n\tMoveId,\n\tNoopMarkType,\n\tHasLineage,\n\tIdRange,\n\tCellMark,\n\tCellId,\n\tMarkEffect,\n\tMoveOut,\n\tMoveIn,\n\tLineageEvent,\n} from \"./types.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport {\n\tgetMoveEffect,\n\tsetMoveEffect,\n\tisMoveMark,\n\tMoveEffect,\n\tMoveEffectTable,\n\tisMoveOut,\n\tisMoveIn,\n} from \"./moveEffectTable.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport { EmptyInputCellMark } from \"./helperTypes.js\";\nimport { CellOrderingMethod, sequenceConfig } from \"./config.js\";\nimport { DetachIdOverrideType } from \"./format.js\";\n\n/\n Rebases `change` over `base` assuming they both apply to the same initial state.\n * @param change - The changeset to rebase.\n * @param base - The changeset to rebase over.\n * @returns A changeset that performs the changes in `change` but does so assuming `base` has been applied first.\n /\nexport function rebase<TNodeChange>(\n\tchange: Changeset<TNodeChange>,\n\tbase: TaggedChange<Changeset<TNodeChange>>,\n\trebaseChild: NodeChangeRebaser<TNodeChange>,\n\tgenId: IdAllocator,\n\tmanager: CrossFieldManager,\n\trevisionMetadata: RebaseRevisionMetadata,\n\tnodeExistenceState: NodeExistenceState = NodeExistenceState.Alive,\n): Changeset<TNodeChange> {\n\treturn rebaseMarkList(\n\t\tchange,\n\t\tbase.change,\n\t\tbase.revision,\n\t\trevisionMetadata,\n\t\trebaseChild,\n\t\tgenId,\n\t\tmanager as MoveEffectTable<TNodeChange>,\n\t\tnodeExistenceState,\n\t);\n}\n\nexport type NodeChangeRebaser<TNodeChange> = (\n\tchange: TNodeChange \| undefined,\n\tbaseChange: TNodeChange \| undefined,\n\tstateChange?: NodeExistenceState,\n) => TNodeChange \| undefined;\n\nfunction rebaseMarkList<TNodeChange>(\n\tcurrMarkList: MarkList<TNodeChange>,\n\tbaseMarkList: MarkList<TNodeChange>,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RebaseRevisionMetadata,\n\trebaseChild: NodeChangeRebaser<TNodeChange>,\n\tgenId: IdAllocator,\n\tmoveEffects: CrossFieldManager<MoveEffect<TNodeChange>>,\n\tnodeExistenceState: NodeExistenceState,\n): MarkList<TNodeChange> {\n\tconst rebasedMarks: Mark<TNodeChange>[] = [];\n\tconst queue = new RebaseQueue(baseRevision, baseMarkList, currMarkList, metadata, moveEffects);\n\n\t// Each mark with empty input cells in `currMarkList` should have a lineage event added for all adjacent detaches in the base changeset.\n\t// At the time we process an attach we don't know about detaches of later nodes,\n\t// so we record marks which should have their lineage updated if we encounter a detach.\n\tconst rebasedCellBlocks: CellBlockList = [];\n\n\t// For each revision, stores a list of IDs of detaches encountered in the base changeset which are adjacent to the current position.\n\tconst detachBlocks = new Map<RevisionTag, IdRange[]>();\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark: currMark } = queue.pop();\n\t\tconst rebasedMark = rebaseMark(\n\t\t\tcurrMark,\n\t\t\tbaseMark,\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\trebaseChild,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\n\t\tif (sequenceConfig.cellOrdering === CellOrderingMethod.Lineage) {\n\t\t\tif (\n\t\t\t\tmarkEmptiesCells(baseMark) \|\|\n\t\t\t\tisImpactfulCellRename(baseMark, baseRevision, metadata)\n\t\t\t) {\n\t\t\t\t// Note that we want the revision in the detach ID to be the actual revision, not the intention.\n\t\t\t\t// TODO: re-examine why this case needs the two kinds of overrides to be treated differently.\n\t\t\t\tconst detachId = getDetachIdForLineage(baseMark, baseRevision);\n\t\t\t\tassert(\n\t\t\t\t\tdetachId !== undefined,\n\t\t\t\t\t0x816 / Mark which empties cells should have a detach ID /,\n\t\t\t\t);\n\t\t\t\tassert(\n\t\t\t\t\tdetachId.revision !== undefined,\n\t\t\t\t\t0x74a / Detach ID should have a revision /,\n\t\t\t\t);\n\t\t\t\tconst detachBlock = getOrAddEmptyToMap(detachBlocks, detachId.revision);\n\t\t\t\taddIdRange(detachBlock, {\n\t\t\t\t\tid: detachId.localId,\n\t\t\t\t\tcount: baseMark.count,\n\t\t\t\t});\n\n\t\t\t\taddLineageToRecipients(\n\t\t\t\t\trebasedCellBlocks,\n\t\t\t\t\tdetachId.revision,\n\t\t\t\t\tdetachId.localId,\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t\tmetadata,\n\t\t\t\t);\n\n\t\t\t\tassert(\n\t\t\t\t\tareInputCellsEmpty(rebasedMark) && rebasedMark.cellId.revision !== undefined,\n\t\t\t\t\t0x817 / Mark should have empty input cells after rebasing over a cell-emptying mark /,\n\t\t\t\t);\n\n\t\t\t\t// A re-detach sports a cell ID with the adjacent cells from the original detach.\n\t\t\t\t// Marks that are rebased over such a re-detach will adopt this cell ID as-is and do not need to have the\n\t\t\t\t// adjacent cells be updated. Moreover, the base changeset may not have all the detaches from the original\n\t\t\t\t// detach revision, so using such re-detach marks to compile the list of adjacent cells would run the risk\n\t\t\t\t// of ending up with incomplete adjacent cell information in the rebased mark.\n\t\t\t\tif (!isRedetach(baseMark)) {\n\t\t\t\t\t// BUG#6604:\n\t\t\t\t\t// We track blocks of adjacent cells for rollbacks separately from that of the original revision\n\t\t\t\t\t// that they are a rollback of, but all rebased marks use the original revision in their `CellId`.\n\t\t\t\t\t// This means we assign adjacent cells information for the rollback to a `CellId` that advertises\n\t\t\t\t\t// itself as being about the original revision.\n\t\t\t\t\t// This could lead to a situation where we try to compare two cells and fail to order them correctly\n\t\t\t\t\t// because one sports adjacent cells information for the original revision and the other sports\n\t\t\t\t\t// adjacent cells information for the rollback.\n\t\t\t\t\tsetMarkAdjacentCells(rebasedMark, detachBlock);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif (areInputCellsEmpty(rebasedMark)) {\n\t\t\t\thandleLineage(rebasedMark.cellId, detachBlocks, metadata);\n\t\t\t}\n\t\t\tupdateLineageState(\n\t\t\t\trebasedCellBlocks,\n\t\t\t\tdetachBlocks,\n\t\t\t\tbaseMark,\n\t\t\t\tbaseRevision,\n\t\t\t\trebasedMark,\n\t\t\t\tmetadata,\n\t\t\t);\n\t\t}\n\t\trebasedMarks.push(rebasedMark);\n\t}\n\n\treturn mergeMarkList(rebasedMarks);\n}\n\nfunction mergeMarkList<T>(marks: Mark<T>[]): Mark<T>[] {\n\tconst factory = new MarkListFactory<T>();\n\tfor (const mark of marks) {\n\t\tfactory.push(mark);\n\t}\n\n\treturn factory.list;\n}\n\nexport function isRedetach(effect: MarkEffect): boolean {\n\tswitch (effect.type) {\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\":\n\t\t\treturn effect.idOverride?.type === DetachIdOverrideType.Redetach;\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn isRedetach(effect.detach);\n\t\tdefault:\n\t\t\treturn false;\n\t}\n}\n\n/\n Generates a NoOp mark that targets the same cells as the input mark.\n * @param mark - The mark the NoOp should target.\n * @param revision - The revision, if available.\n * @returns A NoOp mark that targets the same cells as the input mark.\n /\nfunction generateNoOpWithCellId<T>(\n\tmark: Mark<T>,\n\trevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n): CellMark<NoopMark, T> {\n\tconst length = mark.count;\n\tconst cellId = getInputCellId(mark, revision, metadata);\n\treturn cellId === undefined ? { count: length } : { count: length, cellId };\n}\n\nclass RebaseQueue<T> {\n\tprivate readonly baseMarks: MarkQueue<T>;\n\tprivate readonly newMarks: MarkQueue<T>;\n\tprivate readonly baseMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\tprivate readonly newMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\n\tpublic constructor(\n\t\tbaseRevision: RevisionTag \| undefined,\n\t\tbaseMarks: Changeset<T>,\n\t\tnewMarks: Changeset<T>,\n\t\tprivate readonly metadata: RevisionMetadataSource,\n\t\tprivate readonly moveEffects: MoveEffectTable<T>,\n\t) {\n\t\tthis.baseMarks = new MarkQueue(baseMarks, baseRevision, moveEffects);\n\t\tthis.newMarks = new MarkQueue(newMarks, undefined, moveEffects);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(\n\t\t\tbaseMarks,\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tgetInputCellId,\n\t\t);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(\n\t\t\tnewMarks,\n\t\t\tundefined,\n\t\t\tmetadata,\n\t\t\tgetInputCellId,\n\t\t);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): RebaseMarks<T> {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\t!(baseMark === undefined && newMark === undefined),\n\t\t\t0x722 / Cannot pop from empty queue /,\n\t\t);\n\n\t\tif (baseMark === undefined) {\n\t\t\tconst dequeuedNewMark = this.newMarks.dequeue();\n\t\t\treturn {\n\t\t\t\tbaseMark: generateNoOpWithCellId(dequeuedNewMark, undefined, this.metadata),\n\t\t\t\tnewMark: dequeuedNewMark,\n\t\t\t};\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tswitch (sequenceConfig.cellOrdering) {\n\t\t\t\tcase CellOrderingMethod.Tombstone: {\n\t\t\t\t\tconst baseId = getInputCellId(baseMark, this.baseMarks.revision, this.metadata);\n\t\t\t\t\tconst newId = getInputCellId(newMark, undefined, this.metadata);\n\t\t\t\t\tassert(\n\t\t\t\t\t\tbaseId !== undefined && newId !== undefined,\n\t\t\t\t\t\t0x89f / Both marks should have cell IDs /,\n\t\t\t\t\t);\n\t\t\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\t\t\tbaseId,\n\t\t\t\t\t\tnewId,\n\t\t\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\t\t\tthis.newMarksCellSources,\n\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t);\n\t\t\t\t\tswitch (comparison) {\n\t\t\t\t\t\tcase CellOrder.SameCell:\n\t\t\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t\t\tcase CellOrder.OldThenNew:\n\t\t\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\t\t\tcase CellOrder.NewThenOld:\n\t\t\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\tunreachableCase(comparison);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tcase CellOrderingMethod.Lineage: {\n\t\t\t\t\tconst cmp = compareCellPositions(\n\t\t\t\t\t\tthis.baseMarks.revision,\n\t\t\t\t\t\tbaseMark,\n\t\t\t\t\t\tnewMark,\n\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t);\n\t\t\t\t\tif (cmp < 0) {\n\t\t\t\t\t\treturn this.dequeueBase(-cmp);\n\t\t\t\t\t} else if (cmp > 0) {\n\t\t\t\t\t\tconst dequeuedNewMark = this.newMarks.dequeueUpTo(cmp);\n\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\tnewMark: dequeuedNewMark,\n\t\t\t\t\t\t\tbaseMark: generateNoOpWithCellId(\n\t\t\t\t\t\t\t\tdequeuedNewMark,\n\t\t\t\t\t\t\t\tundefined,\n\t\t\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t};\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tdefault:\n\t\t\t\t\tunreachableCase(sequenceConfig.cellOrdering);\n\t\t\t}\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (areInputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length?: number): RebaseMarks<T> {\n\t\tconst baseMark =\n\t\t\tlength !== undefined ? this.baseMarks.dequeueUpTo(length) : this.baseMarks.dequeue();\n\n\t\tlet newMark: Mark<T> = generateNoOpWithCellId(\n\t\t\tbaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t\tthis.metadata,\n\t\t);\n\n\t\tconst movedEffect = getMovedEffectFromBaseMark(\n\t\t\tthis.moveEffects,\n\t\t\tbaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t);\n\n\t\tif (movedEffect !== undefined) {\n\t\t\tnewMark = addMovedMarkEffect(newMark, movedEffect);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueNew(): RebaseMarks<T> {\n\t\tconst newMark = this.newMarks.dequeue();\n\t\treturn { newMark, baseMark: generateNoOpWithCellId(newMark, undefined, this.metadata) };\n\t}\n\n\tprivate dequeueBoth(): RebaseMarks<T> {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\tbaseMark !== undefined && newMark !== undefined,\n\t\t\t0x69c / Cannot dequeue both unless both mark queues are non-empty /,\n\t\t);\n\t\tconst length = Math.min(newMark.count, baseMark.count);\n\t\tconst sizedBaseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst sizedNewMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedMark = getMovedEffectFromBaseMark(\n\t\t\tthis.moveEffects,\n\t\t\tsizedBaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t);\n\t\treturn {\n\t\t\tbaseMark: sizedBaseMark,\n\t\t\tnewMark:\n\t\t\t\tmovedMark === undefined\n\t\t\t\t\t? sizedNewMark\n\t\t\t\t\t: addMovedMarkEffect(sizedNewMark, movedMark),\n\t\t};\n\t}\n}\n\n/\n Combines `mark` and `effect` into a single mark.\n * This function is only intended to handle cases where `mark` is part of a changeset being rebased\n * and `effect` is an effect from the same changeset whose target has been moved by the base changeset.\n * @returns a mark which has the composite effect of `mark` and `effect`.\n /\nfunction addMovedMarkEffect<T>(mark: Mark<T>, effect: MarkEffect): Mark<T> {\n\tif (isMoveIn(mark) && isMoveOut(effect)) {\n\t\tconst result: Mark<T> = {\n\t\t\t...mark,\n\t\t\ttype: \"Insert\",\n\t\t\tcount: mark.count,\n\t\t\tid: mark.id,\n\t\t};\n\t\tif (effect.revision !== undefined) {\n\t\t\tresult.revision = effect.revision;\n\t\t}\n\t\treturn result;\n\t} else if (isTombstone(mark)) {\n\t\treturn { ...mark, ...effect };\n\t}\n\tassert(false, 0x818 / Unexpected combination of mark effects at source and destination /);\n}\n\n/\n Represents the marks rebasing should process next.\n * If `baseMark` and `newMark` are both defined, then they are `SizedMark`s covering the same range of nodes.\n /\ninterface RebaseMarks<T> {\n\tbaseMark: Mark<T>;\n\tnewMark: Mark<T>;\n}\n\nfunction rebaseMark<TNodeChange>(\n\tcurrMark: Mark<TNodeChange>,\n\tbaseMark: Mark<TNodeChange>,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n\trebaseChild: NodeChangeRebaser<TNodeChange>,\n\tmoveEffects: MoveEffectTable<TNodeChange>,\n\tnodeExistenceState: NodeExistenceState,\n): Mark<TNodeChange> {\n\tconst rebasedMark = rebaseNodeChange(cloneMark(currMark), baseMark, rebaseChild);\n\tconst movedNodeChanges = getMovedChangesFromBaseMark(moveEffects, baseMark, baseRevision);\n\tif (movedNodeChanges !== undefined) {\n\t\tassert(\n\t\t\trebasedMark.changes === undefined,\n\t\t\t0x8dc / Unexpected collision of new node changes /,\n\t\t);\n\t\trebasedMark.changes = movedNodeChanges;\n\t}\n\n\treturn rebaseMarkIgnoreChild(\n\t\trebasedMark,\n\t\tbaseMark,\n\t\tbaseRevision,\n\t\tmetadata,\n\t\tmoveEffects,\n\t\tnodeExistenceState,\n\t);\n}\n\nfunction rebaseMarkIgnoreChild<TNodeChange>(\n\tcurrMark: Mark<TNodeChange>,\n\tbaseMark: Mark<TNodeChange>,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n\tmoveEffects: MoveEffectTable<TNodeChange>,\n\tnodeExistenceState: NodeExistenceState,\n): Mark<TNodeChange> {\n\tlet rebasedMark: Mark<TNodeChange>;\n\tif (isDetach(baseMark)) {\n\t\tif (baseMark.cellId !== undefined) {\n\t\t\t// Detaches on empty cells have an implicit revive effect.\n\t\t\tdelete currMark.cellId;\n\t\t}\n\t\tassert(\n\t\t\t!isNewAttach(currMark),\n\t\t\t0x69d / A new attach should not be rebased over its cell being emptied /,\n\t\t);\n\t\tconst baseCellId = getDetachOutputId(baseMark, baseRevision, metadata);\n\n\t\tif (isMoveOut(baseMark)) {\n\t\t\tassert(isMoveMark(baseMark), 0x6f0 / Only move marks have move IDs /);\n\t\t\tassert(\n\t\t\t\t!isNewAttach(currMark),\n\t\t\t\t0x819 / New attaches should not be rebased over moves /,\n\t\t\t);\n\t\t\tconst { remains, follows } = separateEffectsForMove(extractMarkEffect(currMark));\n\t\t\tif (follows !== undefined) {\n\t\t\t\tsendEffectToDest(\n\t\t\t\t\tfollows,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tgetEndpoint(baseMark, baseRevision),\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tif (currMark.changes !== undefined) {\n\t\t\t\tmoveRebasedChanges(\n\t\t\t\t\tcurrMark.changes,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tgetEndpoint(baseMark, baseRevision),\n\t\t\t\t);\n\t\t\t}\n\t\t\trebasedMark = { ...(remains ?? {}), count: baseMark.count };\n\t\t} else {\n\t\t\trebasedMark = currMark;\n\t\t}\n\t\trebasedMark = makeDetachedMark(rebasedMark, cloneCellId(baseCellId));\n\t} else if (markFillsCells(baseMark)) {\n\t\trebasedMark = isAttachAndDetachEffect(currMark)\n\t\t\t? withNodeChange({ ...currMark.detach, count: currMark.count }, currMark.changes)\n\t\t\t: withCellId(currMark, undefined);\n\t} else if (isAttachAndDetachEffect(baseMark)) {\n\t\tassert(\n\t\t\tbaseMark.cellId !== undefined,\n\t\t\t0x81a / AttachAndDetach mark should target an empty cell /,\n\t\t);\n\t\tconst halfRebasedMark = rebaseMarkIgnoreChild(\n\t\t\tcurrMark,\n\t\t\t{ ...baseMark.attach, cellId: cloneCellId(baseMark.cellId), count: baseMark.count },\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\t\trebasedMark = rebaseMarkIgnoreChild(\n\t\t\thalfRebasedMark,\n\t\t\t{ ...baseMark.detach, count: baseMark.count },\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\t} else {\n\t\trebasedMark = currMark;\n\t}\n\treturn rebasedMark;\n}\n\n/\n @returns A pair of marks that represent the effects which should remain in place in the face of concurrent move,\n * and the effects that should be sent to the move destination.\n /\nfunction separateEffectsForMove(mark: MarkEffect): { remains?: MarkEffect; follows?: MarkEffect } {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\":\n\t\t\treturn { follows: mark };\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn { follows: mark.detach, remains: mark.attach };\n\t\tcase \"MoveIn\":\n\t\t\treturn { remains: mark };\n\t\tcase NoopMarkType:\n\t\t\treturn {};\n\t\tcase \"Insert\": {\n\t\t\tconst follows: MoveOut = {\n\t\t\t\ttype: \"MoveOut\",\n\t\t\t\tid: mark.id,\n\t\t\t};\n\t\t\tconst remains: MoveIn = {\n\t\t\t\ttype: \"MoveIn\",\n\t\t\t\tid: mark.id,\n\t\t\t};\n\t\t\tif (mark.revision !== undefined) {\n\t\t\t\tfollows.revision = mark.revision;\n\t\t\t\tremains.revision = mark.revision;\n\t\t\t}\n\t\t\treturn { remains, follows };\n\t\t}\n\t\tdefault:\n\t\t\tunreachableCase(type);\n\t}\n}\n\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction sendEffectToDest(\n\tmarkEffect: MarkEffect,\n\tmoveEffects: MoveEffectTable<unknown>,\n\t{ revision, localId: id }: ChangeAtomId,\n\tcount: number,\n) {\n\tconst effect = getMoveEffect(\n\t\tmoveEffects,\n\t\tCrossFieldTarget.Destination,\n\t\trevision,\n\t\tid,\n\t\tcount,\n\t\tfalse,\n\t);\n\tif (effect.length < count) {\n\t\tconst [markEffect1, markEffect2] = splitMarkEffect(markEffect, effect.length);\n\t\tconst newEffect =\n\t\t\teffect.value !== undefined\n\t\t\t\t? { ...effect.value, movedMark: markEffect1 }\n\t\t\t\t: { movedMark: markEffect1 };\n\t\tsetMoveEffect(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Destination,\n\t\t\trevision,\n\t\t\tid,\n\t\t\teffect.length,\n\t\t\tnewEffect,\n\t\t);\n\t\tsendEffectToDest(\n\t\t\tmarkEffect2,\n\t\t\tmoveEffects,\n\t\t\t{ revision, localId: brand(id + effect.length) },\n\t\t\tcount - effect.length,\n\t\t);\n\t} else {\n\t\tconst newEffect: MoveEffect<unknown> =\n\t\t\teffect.value !== undefined\n\t\t\t\t? { ...effect.value, movedEffect: markEffect }\n\t\t\t\t: { movedEffect: markEffect };\n\t\tsetMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, count, newEffect);\n\t}\n}\n\nfunction moveRebasedChanges<TNodeChange>(\n\tnodeChange: TNodeChange,\n\tmoveEffects: MoveEffectTable<TNodeChange>,\n\t{ revision, localId: id }: ChangeAtomId,\n) {\n\tconst effect = getMoveEffect(\n\t\tmoveEffects,\n\t\tCrossFieldTarget.Destination,\n\t\trevision,\n\t\tid,\n\t\t1,\n\t\tfalse,\n\t).value;\n\n\tconst newEffect =\n\t\teffect !== undefined\n\t\t\t? { ...effect, rebasedChanges: nodeChange }\n\t\t\t: { rebasedChanges: nodeChange };\n\n\tsetMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, 1, newEffect);\n}\n\nfunction rebaseNodeChange<TNodeChange>(\n\tcurrMark: Mark<TNodeChange>,\n\tbaseMark: Mark<TNodeChange>,\n\tnodeRebaser: NodeChangeRebaser<TNodeChange>,\n): Mark<TNodeChange> {\n\tconst baseChange = baseMark.changes;\n\tconst currChange = currMark.changes;\n\n\tif (baseChange === undefined && currChange === undefined) {\n\t\treturn currMark;\n\t}\n\n\tif (markEmptiesCells(baseMark) && !isMoveMark(baseMark)) {\n\t\treturn withNodeChange(\n\t\t\tcurrMark,\n\t\t\tnodeRebaser(currChange, baseChange, NodeExistenceState.Dead),\n\t\t);\n\t} else if (markFillsCells(baseMark) && !isMoveMark(baseMark)) {\n\t\treturn withNodeChange(\n\t\t\tcurrMark,\n\t\t\tnodeRebaser(currChange, baseChange, NodeExistenceState.Alive),\n\t\t);\n\t}\n\n\treturn withNodeChange(currMark, nodeRebaser(currChange, baseChange));\n}\n\nfunction makeDetachedMark<T>(mark: Mark<T>, cellId: ChangeAtomId): Mark<T> {\n\tassert(mark.cellId === undefined, 0x69f / Expected mark to be attached /);\n\treturn { ...mark, cellId };\n}\n\nfunction withCellId<TMark extends Mark<unknown>>(mark: TMark, cellId: CellId \| undefined): TMark {\n\tconst newMark = { ...mark, cellId };\n\tif (cellId === undefined) {\n\t\tdelete newMark.cellId;\n\t}\n\treturn newMark;\n}\n\nfunction getMovedEffectFromBaseMark(\n\tmoveEffects: MoveEffectTable<unknown>,\n\tbaseMark: Mark<unknown>,\n\tbaseRevision: RevisionTag \| undefined,\n): MarkEffect \| undefined {\n\tif (isMoveIn(baseMark)) {\n\t\treturn getMovedEffect(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.revision ?? baseRevision,\n\t\t\tbaseMark.id,\n\t\t\tbaseMark.count,\n\t\t);\n\t} else if (isAttachAndDetachEffect(baseMark) && isMoveIn(baseMark.attach)) {\n\t\treturn getMovedEffect(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.attach.revision ?? baseRevision,\n\t\t\tbaseMark.attach.id,\n\t\t\tbaseMark.count,\n\t\t);\n\t} else {\n\t\treturn undefined;\n\t}\n}\n\n// It is expected that the range from `id` to `id + count - 1` has the same move effect.\n// The call sites to this function are making queries about a mark which has already been split by a `MarkQueue`\n// to match the ranges in `moveEffects`.\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction getMovedEffect(\n\tmoveEffects: MoveEffectTable<unknown>,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): MarkEffect \| undefined {\n\tconst effect = getMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, count);\n\tassert(effect.length === count, 0x6f3 / Expected effect to cover entire mark /);\n\treturn effect.value?.movedEffect;\n}\n\nfunction getMovedChangesFromBaseMark<T>(\n\tmoveEffects: MoveEffectTable<T>,\n\tbaseMark: Mark<T>,\n\tbaseRevision: RevisionTag \| undefined,\n): T \| undefined {\n\tif (isMoveIn(baseMark)) {\n\t\treturn getMovedNodeChanges(moveEffects, baseMark.revision ?? baseRevision, baseMark.id);\n\t} else if (isAttachAndDetachEffect(baseMark) && isMoveIn(baseMark.attach)) {\n\t\treturn getMovedNodeChanges(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.attach.revision ?? baseRevision,\n\t\t\tbaseMark.attach.id,\n\t\t);\n\t} else {\n\t\treturn undefined;\n\t}\n}\n\nfunction getMovedNodeChanges<T>(\n\tmoveEffects: MoveEffectTable<T>,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n): T \| undefined {\n\treturn getMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, 1).value\n\t\t?.rebasedChanges;\n}\n\ntype CellBlockList = CellBlock[];\n\ninterface CellBlock {\n\treadonly cellId: CellId \| undefined;\n\n\t// The index of the oldest revision where this cell is full in its output context.\n\t// May be -Infinity if the cell was full in the input context of the base changeset,\n\t// or +Infinity if the cell was empty for all revisions in the base changeset.\n\treadonly firstAttachedRevisionIndex: number;\n\n\t// The index of the newest revision where this cell is full in its output context.\n\t// May be -Infinity if the cell was empty for all revisions in the base changeset,\n\t// or +Infinity if the cell is full in the output context of the base changeset.\n\treadonly lastAttachedRevisionIndex: number;\n}\n\nfunction handleLineage(\n\tcellId: CellId,\n\tdetachBlocks: Map<RevisionTag, IdRange[]>,\n\tmetadata: RebaseRevisionMetadata,\n) {\n\tconst baseRevisions = metadata\n\t\t.getBaseRevisions()\n\t\t.map((r) => getIntention(r, metadata) ?? fail(\"Intention should be defined\"));\n\n\tremoveLineageEvents(cellId, new Set(baseRevisions));\n\n\tfor (const [revision, detachBlock] of detachBlocks.entries()) {\n\t\tif (shouldReceiveLineage(cellId.revision, revision, metadata)) {\n\t\t\tconst intention = metadata.tryGetInfo(revision)?.rollbackOf ?? revision;\n\t\t\tfor (const entry of detachBlock) {\n\t\t\t\taddLineageEntry(cellId, intention, entry.id, entry.count, entry.count);\n\t\t\t}\n\t\t}\n\t}\n}\n\nfunction getRevisionIndex(metadata: RevisionMetadataSource, revision: RevisionTag): number {\n\tconst index = metadata.getIndex(revision);\n\tif (index !== undefined) {\n\t\treturn index;\n\t}\n\n\t// This revision is not in the changesets being handled and must be older than them.\n\treturn -Infinity;\n}\n\nfunction updateLineageState(\n\tcellBlocks: CellBlockList,\n\tdetachBlocks: Map<RevisionTag, IdRange[]>,\n\tbaseMark: Mark<unknown>,\n\tbaseRevision: RevisionTag \| undefined,\n\trebasedMark: Mark<unknown>,\n\tmetadata: RevisionMetadataSource,\n) {\n\tconst attachRevisionIndex = getAttachRevisionIndex(metadata, baseMark, baseRevision);\n\tconst detachRevisionIndex = getDetachRevisionIndex(metadata, baseMark, baseRevision);\n\tfor (const revision of detachBlocks.keys()) {\n\t\tconst revisionIndex = getRevisionIndex(metadata, revision);\n\t\t// revisionIndex can be -Infinity if it is from a re-detach\n\t\tif (\n\t\t\trevisionIndex > -Infinity &&\n\t\t\tattachRevisionIndex <= revisionIndex &&\n\t\t\trevisionIndex < detachRevisionIndex\n\t\t) {\n\t\t\tdetachBlocks.delete(revision);\n\t\t}\n\t}\n\n\tcellBlocks.push({\n\t\tcellId: rebasedMark.cellId,\n\t\tfirstAttachedRevisionIndex: attachRevisionIndex,\n\t\tlastAttachedRevisionIndex: detachRevisionIndex - 1,\n\t});\n}\n\nfunction getAttachRevisionIndex(\n\tmetadata: RevisionMetadataSource,\n\tbaseMark: Mark<unknown>,\n\tbaseRevision: RevisionTag \| undefined,\n): number {\n\tif (!areInputCellsEmpty(baseMark)) {\n\t\treturn -Infinity;\n\t}\n\n\tif (markFillsCells(baseMark)) {\n\t\tassert(isAttach(baseMark), 0x81b / Only attach marks can fill cells /);\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\tif (isAttachAndDetachEffect(baseMark)) {\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.attach.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\treturn Infinity;\n}\n\nfunction getDetachRevisionIndex(\n\tmetadata: RevisionMetadataSource,\n\tbaseMark: Mark<unknown>,\n\tbaseRevision: RevisionTag \| undefined,\n): number {\n\tif (!areOutputCellsEmpty(baseMark)) {\n\t\treturn Infinity;\n\t}\n\n\tif (markEmptiesCells(baseMark)) {\n\t\tassert(isDetach(baseMark), 0x81c / Only detach marks can empty cells /);\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\tif (isAttachAndDetachEffect(baseMark)) {\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.detach.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\treturn -Infinity;\n}\n\nfunction addLineageToRecipients(\n\tcellBlocks: CellBlockList,\n\trevision: RevisionTag,\n\tid: ChangesetLocalId,\n\tcount: number,\n\tmetadata: RebaseRevisionMetadata,\n) {\n\tconst rollbackOf = metadata.tryGetInfo(revision)?.rollbackOf;\n\tconst intention = rollbackOf ?? revision;\n\tconst intentionIndex = getRevisionIndex(metadata, intention);\n\tfor (let i = cellBlocks.length - 1; i >= 0; i--) {\n\t\tconst entry = cellBlocks[i];\n\t\tif (\n\t\t\tentry.firstAttachedRevisionIndex <= intentionIndex &&\n\t\t\tintentionIndex <= entry.lastAttachedRevisionIndex\n\t\t) {\n\t\t\t// These cells were full in this revision, so cells earlier in the sequence\n\t\t\t// do not need to know about this lineage event.\n\t\t\treturn;\n\t\t}\n\n\t\t// We only add lineage to cells which were detached before the lineage event occurred.\n\t\tif (entry.cellId === undefined) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (shouldReceiveLineage(entry.cellId.revision, revision, metadata)) {\n\t\t\taddLineageEntry(entry.cellId, intention, id, count, 0);\n\t\t}\n\t}\n}\n\nfunction addLineageEntry(\n\tlineageHolder: HasLineage,\n\trevision: RevisionTag,\n\tid: ChangesetLocalId,\n\tcount: number,\n\toffset: number,\n) {\n\tif (lineageHolder.lineage === undefined) {\n\t\tlineageHolder.lineage = [];\n\t}\n\n\tif (lineageHolder.lineage.length > 0) {\n\t\tconst lastEntry = lineageHolder.lineage[lineageHolder.lineage.length - 1];\n\t\tif (lastEntry.revision === revision && (lastEntry.id as number) + lastEntry.count === id) {\n\t\t\tif (lastEntry.offset === lastEntry.count) {\n\t\t\t\tlineageHolder.lineage[lineageHolder.lineage.length - 1] = {\n\t\t\t\t\t...lastEntry,\n\t\t\t\t\tcount: lastEntry.count + count,\n\t\t\t\t\toffset: lastEntry.offset + offset,\n\t\t\t\t};\n\t\t\t\treturn;\n\t\t\t} else if (offset === 0) {\n\t\t\t\tlineageHolder.lineage[lineageHolder.lineage.length - 1] = {\n\t\t\t\t\t...lastEntry,\n\t\t\t\t\tcount: lastEntry.count + count,\n\t\t\t\t};\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t}\n\n\tlineageHolder.lineage.push({ revision, id, count, offset });\n}\n\nfunction removeLineageEvents(lineageHolder: HasLineage, revisionsToRemove: Set<RevisionTag>) {\n\tif (lineageHolder.lineage === undefined) {\n\t\treturn;\n\t}\n\n\tlineageHolder.lineage = lineageHolder.lineage.filter(\n\t\t(event) => !revisionsToRemove.has(event.revision),\n\t);\n\tif (lineageHolder.lineage.length === 0) {\n\t\tdelete lineageHolder.lineage;\n\t}\n}\n\nfunction addIdRange(lineageEntries: IdRange[], range: IdRange): void {\n\tif (lineageEntries.length > 0) {\n\t\tconst lastEntry = lineageEntries[lineageEntries.length - 1];\n\t\tif ((lastEntry.id as number) + lastEntry.count === range.id) {\n\t\t\tlastEntry.count += range.count;\n\t\t\treturn;\n\t\t}\n\t}\n\n\tlineageEntries.push(range);\n}\n\nfunction setMarkAdjacentCells(mark: Mark<unknown>, adjacentCells: IdRange[]): void {\n\tassert(\n\t\tmark.cellId !== undefined,\n\t\t0x74d / Can only set adjacent cells on a mark with cell ID /,\n\t);\n\tassert(mark.cellId.adjacentCells === undefined, 0x74e / Should not overwrite adjacentCells /);\n\tmark.cellId.adjacentCells = adjacentCells;\n}\n\nfunction shouldReceiveLineage(\n\tcellRevision: RevisionTag \| undefined,\n\tdetachRevision: RevisionTag,\n\tmetadata: RevisionMetadataSource,\n): boolean {\n\tif (cellRevision === undefined) {\n\t\t// An undefined cell revision means that the cell was created by the changeset we are rebasing.\n\t\t// Since this cell was been empty for all base revisions, it should receive lineage from all of them.\n\t\t// TODO: This cell does not need lineage from roll-forward revisions.\n\t\treturn true;\n\t}\n\n\tconst cellRevisionIndex = getRevisionIndex(metadata, cellRevision);\n\tconst rollbackOf = metadata.tryGetInfo(detachRevision)?.rollbackOf;\n\tconst detachIntention = rollbackOf ?? detachRevision;\n\tconst detachRevisionIndex = getRevisionIndex(metadata, detachIntention);\n\tif (detachRevisionIndex === undefined) {\n\t\t// This case means that these cells are being \"re-detached\" through a `redetachId`.\n\t\t// We could use the revision of the re-detach to determine whether or not this cell needs this lineage entry.\n\t\t// But to be conservative we always add lineage here.\n\t\treturn true;\n\t}\n\n\tconst isRollback = rollbackOf !== undefined;\n\treturn isRollback\n\t\t? detachRevisionIndex < cellRevisionIndex\n\t\t: detachRevisionIndex > cellRevisionIndex;\n}\n\n/\n Returns a number N which encodes how the cells of the two marks are aligned.\n * - If N is zero, then the first cell of `baseMark` is the same as the first cell of `newMark`.\n * - If N is positive, then the first N cells of `newMark` (or all its cells if N is greater than its length)\n * are before the first cell of `baseMark`.\n * - If N is negative, then the first N cells of `baseMark` (or all its cells if N is greater than its length)\n * are before the first cell of `newMark`.\n /\nfunction compareCellPositions(\n\tbaseRevision: RevisionTag \| undefined,\n\tbaseMark: EmptyInputCellMark<unknown>,\n\tnewMark: EmptyInputCellMark<unknown>,\n\tmetadata: RevisionMetadataSource,\n): number {\n\tconst baseId = getInputCellId(baseMark, baseRevision, metadata);\n\tconst baseLength = baseMark.count;\n\tassert(baseId?.revision !== undefined, 0x6a0 / baseMark should have cell ID /);\n\tconst newId = getInputCellId(newMark, undefined, metadata);\n\tassert(newId !== undefined, 0x85a / newMark should have cell ID /);\n\tconst newLength = newMark.count;\n\tif (newId !== undefined && baseId.revision === newId.revision) {\n\t\tconst cmp = compareCellsFromSameRevision(baseId, baseMark.count, newId, newMark.count);\n\t\tif (cmp !== undefined) {\n\t\t\treturn cmp;\n\t\t}\n\t}\n\n\tif (newId !== undefined) {\n\t\tconst offset = getOffsetInCellRange(\n\t\t\tbaseId.lineage,\n\t\t\tnewId.revision,\n\t\t\tnewId.localId,\n\t\t\tnewLength,\n\t\t);\n\t\tif (offset !== undefined) {\n\t\t\treturn offset > 0 ? offset : -Infinity;\n\t\t}\n\n\t\tconst newOffset = getOffsetInCellRange(\n\t\t\tnewId.lineage,\n\t\t\tbaseId.revision,\n\t\t\tbaseId.localId,\n\t\t\tbaseLength,\n\t\t);\n\t\tif (newOffset !== undefined) {\n\t\t\treturn newOffset > 0 ? -newOffset : Infinity;\n\t\t}\n\t}\n\n\tif (newId !== undefined) {\n\t\tconst cmp = compareLineages(baseId, newId);\n\t\tif (cmp !== 0) {\n\t\t\treturn Math.sign(cmp) Infinity;\n\t\t}\n\n\t\tconst cmp2 = compareMissingLineageEntries(baseId.lineage, newId.lineage, metadata);\n\t\tif (cmp2 !== 0) {\n\t\t\treturn Math.sign(cmp2) * Infinity;\n\t\t}\n\t}\n\n\t// Both cells must never have been filled (in their common history), otherwise they would have some common lineage.\n\t// A new attach targets a cell that has never been filled.\n\t// A mark can also target a cell which was initially filled on another branch, but which has never been filled on the current branch.\n\tif (newId.revision === undefined) {\n\t\t// An undefined revision must mean that the cell was created on the branch we are rebasing.\n\t\t// Since it is newer than the `baseMark`'s cell, it should come first.\n\t\treturn Infinity;\n\t}\n\n\tconst baseRevisionIndex = metadata.getIndex(baseId.revision);\n\tconst newRevisionIndex = metadata.getIndex(newId.revision);\n\n\tif (newRevisionIndex !== undefined && baseRevisionIndex !== undefined) {\n\t\treturn newRevisionIndex > baseRevisionIndex ? Infinity : -Infinity;\n\t}\n\n\tif (newRevisionIndex !== undefined) {\n\t\treturn Infinity;\n\t}\n\n\tif (baseRevisionIndex !== undefined) {\n\t\treturn -Infinity;\n\t}\n\n\t// `newMark` points to cells which were emptied before `baseMark` was created.\n\t// We use `baseMark`'s tiebreak policy as if `newMark`'s cells were created concurrently and before `baseMark`.\n\treturn -Infinity;\n}\n\nfunction compareMissingLineageEntries(\n\tlineage1: LineageEvent[] \| undefined,\n\tlineage2: LineageEvent[] \| undefined,\n\tmetadata: RevisionMetadataSource,\n): number {\n\tconst events1 = new Map<RevisionTag, LineageEvent>();\n\tfor (const event of lineage1 ?? []) {\n\t\tevents1.set(event.revision, event);\n\t}\n\n\tconst events2 = new Map<RevisionTag, LineageEvent>();\n\tfor (const event of lineage2 ?? []) {\n\t\tevents2.set(event.revision, event);\n\t}\n\n\tfor (const revision of events1.keys()) {\n\t\tif (events2.has(revision)) {\n\t\t\tevents1.delete(revision);\n\t\t\tevents2.delete(revision);\n\t\t}\n\t}\n\n\tfor (const event of events2.values()) {\n\t\t// We've found a cell C that was emptied before the cell1 started tracking lineage.\n\t\t// The cell1 should come before any such cell, so if cell2 comes after C\n\t\t// then we know that cell1 should come before the cell2.\n\t\t// TODO: Account for the cell1's tiebreak policy\n\t\tif (!metadata.hasRollback(event.revision) && event.offset !== 0) {\n\t\t\treturn -1;\n\t\t}\n\t}\n\n\t// cell1Events now contains only revisions which were not in cell2's lineage.\n\tfor (const event of events1.values()) {\n\t\t// We've found a cell C that was emptied before the cell2 started tracking lineage.\n\t\t// The cell2 should come before any such cell, so if cell1 comes after C\n\t\t// then we know that cell2 should come before the cell1.\n\t\t// TODO: Account for the cell2's tiebreak policy\n\t\tif (!metadata.hasRollback(event.revision) && event.offset !== 0) {\n\t\t\treturn 1;\n\t\t}\n\t}\n\n\treturn 0;\n}\n"]}
1	+ {"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/rebase.ts"],"names":[],"mappings":"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","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { assert, unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\tChangeAtomId,\n\tChangesetLocalId,\n\tRevisionMetadataSource,\n\tRevisionTag,\n\tTaggedChange,\n} from \"../../core/index.js\";\nimport { IdAllocator, brand, fail, getOrAddEmptyToMap } from \"../../util/index.js\";\nimport {\n\tCrossFieldManager,\n\tCrossFieldTarget,\n\tNodeChangeRebaser,\n\tNodeExistenceState,\n\tNodeId,\n\tRebaseRevisionMetadata,\n\tgetIntention,\n} from \"../modular-schema/index.js\";\n\nimport { CellOrderingMethod, sequenceConfig } from \"./config.js\";\nimport { DetachIdOverrideType } from \"./format.js\";\nimport { EmptyInputCellMark } from \"./helperTypes.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport {\n\tMoveEffect,\n\tMoveEffectTable,\n\tgetMoveEffect,\n\tisMoveIn,\n\tisMoveMark,\n\tisMoveOut,\n\tsetMoveEffect,\n} from \"./moveEffectTable.js\";\nimport {\n\tCellId,\n\tCellMark,\n\tChangeset,\n\tHasLineage,\n\tIdRange,\n\tLineageEvent,\n\tMark,\n\tMarkEffect,\n\tMarkList,\n\tMoveId,\n\tMoveIn,\n\tMoveOut,\n\tNoopMark,\n\tNoopMarkType,\n} from \"./types.js\";\nimport {\n\tCellOrder,\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tcellSourcesFromMarks,\n\tcloneCellId,\n\tcloneMark,\n\tcompareCellPositionsUsingTombstones,\n\tcompareCellsFromSameRevision,\n\tcompareLineages,\n\textractMarkEffect,\n\tgetDetachIdForLineage,\n\tgetDetachOutputCellId,\n\tgetEndpoint,\n\tgetInputCellId,\n\tgetOffsetInCellRange,\n\tisAttach,\n\tisAttachAndDetachEffect,\n\tisDetach,\n\tisImpactfulCellRename,\n\tisNewAttach,\n\tisTombstone,\n\tmarkEmptiesCells,\n\tmarkFillsCells,\n\tsplitMarkEffect,\n\twithNodeChange,\n} from \"./utils.js\";\n\n/\n Rebases `change` over `base` assuming they both apply to the same initial state.\n * @param change - The changeset to rebase.\n * @param base - The changeset to rebase over.\n * @returns A changeset that performs the changes in `change` but does so assuming `base` has been applied first.\n /\nexport function rebase(\n\tchange: Changeset,\n\tbase: TaggedChange<Changeset>,\n\trebaseChild: NodeChangeRebaser,\n\tgenId: IdAllocator,\n\tmanager: CrossFieldManager,\n\trevisionMetadata: RebaseRevisionMetadata,\n\tnodeExistenceState: NodeExistenceState = NodeExistenceState.Alive,\n): Changeset {\n\treturn rebaseMarkList(\n\t\tchange,\n\t\tbase.change,\n\t\tbase.revision,\n\t\trevisionMetadata,\n\t\trebaseChild,\n\t\tgenId,\n\t\tmanager as MoveEffectTable,\n\t\tnodeExistenceState,\n\t);\n}\n\nfunction rebaseMarkList(\n\tcurrMarkList: MarkList,\n\tbaseMarkList: MarkList,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RebaseRevisionMetadata,\n\trebaseChild: NodeChangeRebaser,\n\tgenId: IdAllocator,\n\tmoveEffects: CrossFieldManager<MoveEffect>,\n\tnodeExistenceState: NodeExistenceState,\n): MarkList {\n\tconst rebasedMarks: Mark[] = [];\n\tconst queue = new RebaseQueue(baseRevision, baseMarkList, currMarkList, metadata, moveEffects);\n\n\t// Each mark with empty input cells in `currMarkList` should have a lineage event added for all adjacent detaches in the base changeset.\n\t// At the time we process an attach we don't know about detaches of later nodes,\n\t// so we record marks which should have their lineage updated if we encounter a detach.\n\tconst rebasedCellBlocks: CellBlockList = [];\n\n\t// For each revision, stores a list of IDs of detaches encountered in the base changeset which are adjacent to the current position.\n\tconst detachBlocks = new Map<RevisionTag, IdRange[]>();\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark: currMark } = queue.pop();\n\t\tconst rebasedMark = rebaseMark(\n\t\t\tcurrMark,\n\t\t\tbaseMark,\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\trebaseChild,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\n\t\tif (sequenceConfig.cellOrdering === CellOrderingMethod.Lineage) {\n\t\t\tif (\n\t\t\t\tmarkEmptiesCells(baseMark) \|\|\n\t\t\t\tisImpactfulCellRename(baseMark, baseRevision, metadata)\n\t\t\t) {\n\t\t\t\t// Note that we want the revision in the detach ID to be the actual revision, not the intention.\n\t\t\t\t// TODO: re-examine why this case needs the two kinds of overrides to be treated differently.\n\t\t\t\tconst detachId = getDetachIdForLineage(baseMark, baseRevision);\n\t\t\t\tassert(\n\t\t\t\t\tdetachId !== undefined,\n\t\t\t\t\t0x816 / Mark which empties cells should have a detach ID /,\n\t\t\t\t);\n\t\t\t\tassert(\n\t\t\t\t\tdetachId.revision !== undefined,\n\t\t\t\t\t0x74a / Detach ID should have a revision /,\n\t\t\t\t);\n\t\t\t\tconst detachBlock = getOrAddEmptyToMap(detachBlocks, detachId.revision);\n\t\t\t\taddIdRange(detachBlock, {\n\t\t\t\t\tid: detachId.localId,\n\t\t\t\t\tcount: baseMark.count,\n\t\t\t\t});\n\n\t\t\t\taddLineageToRecipients(\n\t\t\t\t\trebasedCellBlocks,\n\t\t\t\t\tdetachId.revision,\n\t\t\t\t\tdetachId.localId,\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t\tmetadata,\n\t\t\t\t);\n\n\t\t\t\tassert(\n\t\t\t\t\tareInputCellsEmpty(rebasedMark) && rebasedMark.cellId.revision !== undefined,\n\t\t\t\t\t0x817 / Mark should have empty input cells after rebasing over a cell-emptying mark /,\n\t\t\t\t);\n\n\t\t\t\t// A re-detach sports a cell ID with the adjacent cells from the original detach.\n\t\t\t\t// Marks that are rebased over such a re-detach will adopt this cell ID as-is and do not need to have the\n\t\t\t\t// adjacent cells be updated. Moreover, the base changeset may not have all the detaches from the original\n\t\t\t\t// detach revision, so using such re-detach marks to compile the list of adjacent cells would run the risk\n\t\t\t\t// of ending up with incomplete adjacent cell information in the rebased mark.\n\t\t\t\tif (!isRedetach(baseMark)) {\n\t\t\t\t\t// BUG#6604:\n\t\t\t\t\t// We track blocks of adjacent cells for rollbacks separately from that of the original revision\n\t\t\t\t\t// that they are a rollback of, but all rebased marks use the original revision in their `CellId`.\n\t\t\t\t\t// This means we assign adjacent cells information for the rollback to a `CellId` that advertises\n\t\t\t\t\t// itself as being about the original revision.\n\t\t\t\t\t// This could lead to a situation where we try to compare two cells and fail to order them correctly\n\t\t\t\t\t// because one sports adjacent cells information for the original revision and the other sports\n\t\t\t\t\t// adjacent cells information for the rollback.\n\t\t\t\t\tsetMarkAdjacentCells(rebasedMark, detachBlock);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif (areInputCellsEmpty(rebasedMark)) {\n\t\t\t\thandleLineage(rebasedMark.cellId, detachBlocks, metadata);\n\t\t\t}\n\t\t\tupdateLineageState(\n\t\t\t\trebasedCellBlocks,\n\t\t\t\tdetachBlocks,\n\t\t\t\tbaseMark,\n\t\t\t\tbaseRevision,\n\t\t\t\trebasedMark,\n\t\t\t\tmetadata,\n\t\t\t);\n\t\t}\n\t\trebasedMarks.push(rebasedMark);\n\t}\n\n\treturn mergeMarkList(rebasedMarks);\n}\n\nfunction mergeMarkList(marks: Mark[]): Mark[] {\n\tconst factory = new MarkListFactory();\n\tfor (const mark of marks) {\n\t\tfactory.push(mark);\n\t}\n\n\treturn factory.list;\n}\n\nexport function isRedetach(effect: MarkEffect): boolean {\n\tswitch (effect.type) {\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\":\n\t\t\treturn effect.idOverride?.type === DetachIdOverrideType.Redetach;\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn isRedetach(effect.detach);\n\t\tdefault:\n\t\t\treturn false;\n\t}\n}\n\n/\n Generates a NoOp mark that targets the same cells as the input mark.\n * @param mark - The mark the NoOp should target.\n * @param revision - The revision, if available.\n * @returns A NoOp mark that targets the same cells as the input mark.\n /\nfunction generateNoOpWithCellId(\n\tmark: Mark,\n\trevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n): CellMark<NoopMark> {\n\tconst length = mark.count;\n\tconst cellId = getInputCellId(mark, revision, metadata);\n\treturn cellId === undefined ? { count: length } : { count: length, cellId };\n}\n\nclass RebaseQueue {\n\tprivate readonly baseMarks: MarkQueue;\n\tprivate readonly newMarks: MarkQueue;\n\tprivate readonly baseMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\tprivate readonly newMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\n\tpublic constructor(\n\t\tbaseRevision: RevisionTag \| undefined,\n\t\tbaseMarks: Changeset,\n\t\tnewMarks: Changeset,\n\t\tprivate readonly metadata: RevisionMetadataSource,\n\t\tprivate readonly moveEffects: MoveEffectTable,\n\t) {\n\t\tthis.baseMarks = new MarkQueue(baseMarks, baseRevision, moveEffects);\n\t\tthis.newMarks = new MarkQueue(newMarks, undefined, moveEffects);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(\n\t\t\tbaseMarks,\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tgetInputCellId,\n\t\t);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(\n\t\t\tnewMarks,\n\t\t\tundefined,\n\t\t\tmetadata,\n\t\t\tgetInputCellId,\n\t\t);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): RebaseMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\t!(baseMark === undefined && newMark === undefined),\n\t\t\t0x722 / Cannot pop from empty queue /,\n\t\t);\n\n\t\tif (baseMark === undefined) {\n\t\t\tconst dequeuedNewMark = this.newMarks.dequeue();\n\t\t\treturn {\n\t\t\t\tbaseMark: generateNoOpWithCellId(dequeuedNewMark, undefined, this.metadata),\n\t\t\t\tnewMark: dequeuedNewMark,\n\t\t\t};\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tswitch (sequenceConfig.cellOrdering) {\n\t\t\t\tcase CellOrderingMethod.Tombstone: {\n\t\t\t\t\tconst baseId = getInputCellId(baseMark, this.baseMarks.revision, this.metadata);\n\t\t\t\t\tconst newId = getInputCellId(newMark, undefined, this.metadata);\n\t\t\t\t\tassert(\n\t\t\t\t\t\tbaseId !== undefined && newId !== undefined,\n\t\t\t\t\t\t0x89f / Both marks should have cell IDs /,\n\t\t\t\t\t);\n\t\t\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\t\t\tbaseId,\n\t\t\t\t\t\tnewId,\n\t\t\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\t\t\tthis.newMarksCellSources,\n\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t);\n\t\t\t\t\tswitch (comparison) {\n\t\t\t\t\t\tcase CellOrder.SameCell:\n\t\t\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t\t\tcase CellOrder.OldThenNew:\n\t\t\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\t\t\tcase CellOrder.NewThenOld:\n\t\t\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\tunreachableCase(comparison);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tcase CellOrderingMethod.Lineage: {\n\t\t\t\t\tconst cmp = compareCellPositions(\n\t\t\t\t\t\tthis.baseMarks.revision,\n\t\t\t\t\t\tbaseMark,\n\t\t\t\t\t\tnewMark,\n\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t);\n\t\t\t\t\tif (cmp < 0) {\n\t\t\t\t\t\treturn this.dequeueBase(-cmp);\n\t\t\t\t\t} else if (cmp > 0) {\n\t\t\t\t\t\tconst dequeuedNewMark = this.newMarks.dequeueUpTo(cmp);\n\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\tnewMark: dequeuedNewMark,\n\t\t\t\t\t\t\tbaseMark: generateNoOpWithCellId(\n\t\t\t\t\t\t\t\tdequeuedNewMark,\n\t\t\t\t\t\t\t\tundefined,\n\t\t\t\t\t\t\t\tthis.metadata,\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t};\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tdefault:\n\t\t\t\t\tunreachableCase(sequenceConfig.cellOrdering);\n\t\t\t}\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (areInputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length?: number): RebaseMarks {\n\t\tconst baseMark =\n\t\t\tlength !== undefined ? this.baseMarks.dequeueUpTo(length) : this.baseMarks.dequeue();\n\n\t\tlet newMark: Mark = generateNoOpWithCellId(\n\t\t\tbaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t\tthis.metadata,\n\t\t);\n\n\t\tconst movedEffect = getMovedEffectFromBaseMark(\n\t\t\tthis.moveEffects,\n\t\t\tbaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t);\n\n\t\tif (movedEffect !== undefined) {\n\t\t\tnewMark = addMovedMarkEffect(newMark, movedEffect);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueNew(): RebaseMarks {\n\t\tconst newMark = this.newMarks.dequeue();\n\t\treturn { newMark, baseMark: generateNoOpWithCellId(newMark, undefined, this.metadata) };\n\t}\n\n\tprivate dequeueBoth(): RebaseMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\tbaseMark !== undefined && newMark !== undefined,\n\t\t\t0x69c / Cannot dequeue both unless both mark queues are non-empty /,\n\t\t);\n\t\tconst length = Math.min(newMark.count, baseMark.count);\n\t\tconst sizedBaseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst sizedNewMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedMark = getMovedEffectFromBaseMark(\n\t\t\tthis.moveEffects,\n\t\t\tsizedBaseMark,\n\t\t\tthis.baseMarks.revision,\n\t\t);\n\t\treturn {\n\t\t\tbaseMark: sizedBaseMark,\n\t\t\tnewMark:\n\t\t\t\tmovedMark === undefined\n\t\t\t\t\t? sizedNewMark\n\t\t\t\t\t: addMovedMarkEffect(sizedNewMark, movedMark),\n\t\t};\n\t}\n}\n\n/\n Combines `mark` and `effect` into a single mark.\n * This function is only intended to handle cases where `mark` is part of a changeset being rebased\n * and `effect` is an effect from the same changeset whose target has been moved by the base changeset.\n * @returns a mark which has the composite effect of `mark` and `effect`.\n /\nfunction addMovedMarkEffect(mark: Mark, effect: MarkEffect): Mark {\n\tif (isMoveIn(mark) && isMoveOut(effect)) {\n\t\treturn { ...mark, type: \"Insert\" };\n\t} else if (isAttachAndDetachEffect(mark) && isMoveIn(mark.attach) && isMoveOut(effect)) {\n\t\treturn { ...mark.detach, count: mark.count };\n\t} else if (isTombstone(mark)) {\n\t\treturn { ...mark, ...effect };\n\t}\n\tassert(false, 0x818 / Unexpected combination of mark effects at source and destination /);\n}\n\n/\n Represents the marks rebasing should process next.\n * If `baseMark` and `newMark` are both defined, then they are `SizedMark`s covering the same range of nodes.\n /\ninterface RebaseMarks {\n\tbaseMark: Mark;\n\tnewMark: Mark;\n}\n\nfunction rebaseMark(\n\tcurrMark: Mark,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n\trebaseChild: NodeChangeRebaser,\n\tmoveEffects: MoveEffectTable,\n\tnodeExistenceState: NodeExistenceState,\n): Mark {\n\tconst rebasedMark = rebaseNodeChange(cloneMark(currMark), baseMark, rebaseChild);\n\tconst movedNodeChanges = getMovedChangesFromBaseMark(moveEffects, baseMark, baseRevision);\n\tif (movedNodeChanges !== undefined) {\n\t\tassert(\n\t\t\trebasedMark.changes === undefined,\n\t\t\t0x8dc / Unexpected collision of new node changes /,\n\t\t);\n\t\trebasedMark.changes = movedNodeChanges;\n\t}\n\n\treturn rebaseMarkIgnoreChild(\n\t\trebasedMark,\n\t\tbaseMark,\n\t\tbaseRevision,\n\t\tmetadata,\n\t\tmoveEffects,\n\t\tnodeExistenceState,\n\t);\n}\n\nfunction rebaseMarkIgnoreChild(\n\tcurrMark: Mark,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n\tmetadata: RevisionMetadataSource,\n\tmoveEffects: MoveEffectTable,\n\tnodeExistenceState: NodeExistenceState,\n): Mark {\n\tlet rebasedMark: Mark;\n\tif (isDetach(baseMark)) {\n\t\tif (baseMark.cellId !== undefined) {\n\t\t\t// Detaches on empty cells have an implicit revive effect.\n\t\t\tdelete currMark.cellId;\n\t\t}\n\t\tassert(\n\t\t\t!isNewAttach(currMark),\n\t\t\t0x69d / A new attach should not be rebased over its cell being emptied /,\n\t\t);\n\t\tconst baseCellId = getDetachOutputCellId(baseMark, baseRevision, metadata);\n\n\t\tif (isMoveOut(baseMark)) {\n\t\t\tassert(isMoveMark(baseMark), 0x6f0 / Only move marks have move IDs /);\n\t\t\tassert(\n\t\t\t\t!isNewAttach(currMark),\n\t\t\t\t0x819 / New attaches should not be rebased over moves /,\n\t\t\t);\n\t\t\tconst { remains, follows } = separateEffectsForMove(extractMarkEffect(currMark));\n\t\t\tif (follows !== undefined) {\n\t\t\t\tsendEffectToDest(\n\t\t\t\t\tfollows,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tgetEndpoint(baseMark, baseRevision),\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tif (currMark.changes !== undefined) {\n\t\t\t\tmoveRebasedChanges(\n\t\t\t\t\tcurrMark.changes,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tgetEndpoint(baseMark, baseRevision),\n\t\t\t\t);\n\t\t\t}\n\t\t\trebasedMark = { ...(remains ?? {}), count: baseMark.count };\n\t\t} else {\n\t\t\trebasedMark = currMark;\n\t\t}\n\t\trebasedMark = makeDetachedMark(rebasedMark, cloneCellId(baseCellId));\n\t} else if (markFillsCells(baseMark)) {\n\t\trebasedMark = isAttachAndDetachEffect(currMark)\n\t\t\t? withNodeChange({ ...currMark.detach, count: currMark.count }, currMark.changes)\n\t\t\t: withCellId(currMark, undefined);\n\t} else if (isAttachAndDetachEffect(baseMark)) {\n\t\tassert(\n\t\t\tbaseMark.cellId !== undefined,\n\t\t\t0x81a / AttachAndDetach mark should target an empty cell /,\n\t\t);\n\t\tconst halfRebasedMark = rebaseMarkIgnoreChild(\n\t\t\tcurrMark,\n\t\t\t{ ...baseMark.attach, cellId: cloneCellId(baseMark.cellId), count: baseMark.count },\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\t\trebasedMark = rebaseMarkIgnoreChild(\n\t\t\thalfRebasedMark,\n\t\t\t{ ...baseMark.detach, count: baseMark.count },\n\t\t\tbaseRevision,\n\t\t\tmetadata,\n\t\t\tmoveEffects,\n\t\t\tnodeExistenceState,\n\t\t);\n\t} else {\n\t\trebasedMark = currMark;\n\t}\n\treturn rebasedMark;\n}\n\n/\n @returns A pair of marks that represent the effects which should remain in place in the face of concurrent move,\n * and the effects that should be sent to the move destination.\n /\nfunction separateEffectsForMove(mark: MarkEffect): { remains?: MarkEffect; follows?: MarkEffect } {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\":\n\t\t\treturn { follows: mark };\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn { follows: mark.detach, remains: mark.attach };\n\t\tcase \"MoveIn\":\n\t\t\treturn { remains: mark };\n\t\tcase NoopMarkType:\n\t\t\treturn {};\n\t\tcase \"Insert\": {\n\t\t\tconst follows: MoveOut = {\n\t\t\t\ttype: \"MoveOut\",\n\t\t\t\tid: mark.id,\n\t\t\t};\n\t\t\tconst remains: MoveIn = {\n\t\t\t\ttype: \"MoveIn\",\n\t\t\t\tid: mark.id,\n\t\t\t};\n\t\t\tif (mark.revision !== undefined) {\n\t\t\t\tfollows.revision = mark.revision;\n\t\t\t\tremains.revision = mark.revision;\n\t\t\t}\n\t\t\treturn { remains, follows };\n\t\t}\n\t\tdefault:\n\t\t\tunreachableCase(type);\n\t}\n}\n\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction sendEffectToDest(\n\tmarkEffect: MarkEffect,\n\tmoveEffects: MoveEffectTable,\n\t{ revision, localId: id }: ChangeAtomId,\n\tcount: number,\n) {\n\tconst effect = getMoveEffect(\n\t\tmoveEffects,\n\t\tCrossFieldTarget.Destination,\n\t\trevision,\n\t\tid,\n\t\tcount,\n\t\tfalse,\n\t);\n\tif (effect.length < count) {\n\t\tconst [markEffect1, markEffect2] = splitMarkEffect(markEffect, effect.length);\n\t\tconst newEffect =\n\t\t\teffect.value !== undefined\n\t\t\t\t? { ...effect.value, movedMark: markEffect1 }\n\t\t\t\t: { movedMark: markEffect1 };\n\t\tsetMoveEffect(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Destination,\n\t\t\trevision,\n\t\t\tid,\n\t\t\teffect.length,\n\t\t\tnewEffect,\n\t\t);\n\t\tsendEffectToDest(\n\t\t\tmarkEffect2,\n\t\t\tmoveEffects,\n\t\t\t{ revision, localId: brand(id + effect.length) },\n\t\t\tcount - effect.length,\n\t\t);\n\t} else {\n\t\tconst newEffect: MoveEffect =\n\t\t\teffect.value !== undefined\n\t\t\t\t? { ...effect.value, movedEffect: markEffect }\n\t\t\t\t: { movedEffect: markEffect };\n\t\tsetMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, count, newEffect);\n\t}\n}\n\nfunction moveRebasedChanges(\n\tnodeChange: NodeId,\n\tmoveEffects: MoveEffectTable,\n\t{ revision, localId: id }: ChangeAtomId,\n) {\n\tconst effect = getMoveEffect(\n\t\tmoveEffects,\n\t\tCrossFieldTarget.Destination,\n\t\trevision,\n\t\tid,\n\t\t1,\n\t\tfalse,\n\t).value;\n\n\tconst newEffect =\n\t\teffect !== undefined\n\t\t\t? { ...effect, rebasedChanges: nodeChange }\n\t\t\t: { rebasedChanges: nodeChange };\n\n\tsetMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, 1, newEffect);\n}\n\nfunction rebaseNodeChange(currMark: Mark, baseMark: Mark, nodeRebaser: NodeChangeRebaser): Mark {\n\tconst baseChange = baseMark.changes;\n\tconst currChange = currMark.changes;\n\n\tif (baseChange === undefined && currChange === undefined) {\n\t\treturn currMark;\n\t}\n\n\tif (markEmptiesCells(baseMark) && !isMoveMark(baseMark)) {\n\t\treturn withNodeChange(\n\t\t\tcurrMark,\n\t\t\tnodeRebaser(currChange, baseChange, NodeExistenceState.Dead),\n\t\t);\n\t} else if (markFillsCells(baseMark) && !isMoveMark(baseMark)) {\n\t\treturn withNodeChange(\n\t\t\tcurrMark,\n\t\t\tnodeRebaser(currChange, baseChange, NodeExistenceState.Alive),\n\t\t);\n\t}\n\n\treturn withNodeChange(currMark, nodeRebaser(currChange, baseChange));\n}\n\nfunction makeDetachedMark(mark: Mark, cellId: ChangeAtomId): Mark {\n\tassert(mark.cellId === undefined, 0x69f / Expected mark to be attached /);\n\treturn { ...mark, cellId };\n}\n\nfunction withCellId<TMark extends Mark>(mark: TMark, cellId: CellId \| undefined): TMark {\n\tconst newMark = { ...mark, cellId };\n\tif (cellId === undefined) {\n\t\tdelete newMark.cellId;\n\t}\n\treturn newMark;\n}\n\nfunction getMovedEffectFromBaseMark(\n\tmoveEffects: MoveEffectTable,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n): MarkEffect \| undefined {\n\tif (isMoveIn(baseMark)) {\n\t\treturn getMovedEffect(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.revision ?? baseRevision,\n\t\t\tbaseMark.id,\n\t\t\tbaseMark.count,\n\t\t);\n\t} else if (isAttachAndDetachEffect(baseMark) && isMoveIn(baseMark.attach)) {\n\t\treturn getMovedEffect(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.attach.revision ?? baseRevision,\n\t\t\tbaseMark.attach.id,\n\t\t\tbaseMark.count,\n\t\t);\n\t} else {\n\t\treturn undefined;\n\t}\n}\n\n// It is expected that the range from `id` to `id + count - 1` has the same move effect.\n// The call sites to this function are making queries about a mark which has already been split by a `MarkQueue`\n// to match the ranges in `moveEffects`.\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction getMovedEffect(\n\tmoveEffects: MoveEffectTable,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): MarkEffect \| undefined {\n\tconst effect = getMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, count);\n\tassert(effect.length === count, 0x6f3 / Expected effect to cover entire mark /);\n\treturn effect.value?.movedEffect;\n}\n\nfunction getMovedChangesFromBaseMark(\n\tmoveEffects: MoveEffectTable,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n): NodeId \| undefined {\n\tif (isMoveIn(baseMark)) {\n\t\treturn getMovedNodeChanges(moveEffects, baseMark.revision ?? baseRevision, baseMark.id);\n\t} else if (isAttachAndDetachEffect(baseMark) && isMoveIn(baseMark.attach)) {\n\t\treturn getMovedNodeChanges(\n\t\t\tmoveEffects,\n\t\t\tbaseMark.attach.revision ?? baseRevision,\n\t\t\tbaseMark.attach.id,\n\t\t);\n\t} else {\n\t\treturn undefined;\n\t}\n}\n\nfunction getMovedNodeChanges(\n\tmoveEffects: MoveEffectTable,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n): NodeId \| undefined {\n\treturn getMoveEffect(moveEffects, CrossFieldTarget.Destination, revision, id, 1).value\n\t\t?.rebasedChanges;\n}\n\ntype CellBlockList = CellBlock[];\n\ninterface CellBlock {\n\treadonly cellId: CellId \| undefined;\n\n\t// The index of the oldest revision where this cell is full in its output context.\n\t// May be -Infinity if the cell was full in the input context of the base changeset,\n\t// or +Infinity if the cell was empty for all revisions in the base changeset.\n\treadonly firstAttachedRevisionIndex: number;\n\n\t// The index of the newest revision where this cell is full in its output context.\n\t// May be -Infinity if the cell was empty for all revisions in the base changeset,\n\t// or +Infinity if the cell is full in the output context of the base changeset.\n\treadonly lastAttachedRevisionIndex: number;\n}\n\nfunction handleLineage(\n\tcellId: CellId,\n\tdetachBlocks: Map<RevisionTag, IdRange[]>,\n\tmetadata: RebaseRevisionMetadata,\n) {\n\tconst baseRevisions = metadata\n\t\t.getBaseRevisions()\n\t\t.map((r) => getIntention(r, metadata) ?? fail(\"Intention should be defined\"));\n\n\tremoveLineageEvents(cellId, new Set(baseRevisions));\n\n\tfor (const [revision, detachBlock] of detachBlocks.entries()) {\n\t\tif (shouldReceiveLineage(cellId.revision, revision, metadata)) {\n\t\t\tconst intention = metadata.tryGetInfo(revision)?.rollbackOf ?? revision;\n\t\t\tfor (const entry of detachBlock) {\n\t\t\t\taddLineageEntry(cellId, intention, entry.id, entry.count, entry.count);\n\t\t\t}\n\t\t}\n\t}\n}\n\nfunction getRevisionIndex(metadata: RevisionMetadataSource, revision: RevisionTag): number {\n\tconst index = metadata.getIndex(revision);\n\tif (index !== undefined) {\n\t\treturn index;\n\t}\n\n\t// This revision is not in the changesets being handled and must be older than them.\n\treturn -Infinity;\n}\n\nfunction updateLineageState(\n\tcellBlocks: CellBlockList,\n\tdetachBlocks: Map<RevisionTag, IdRange[]>,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n\trebasedMark: Mark,\n\tmetadata: RevisionMetadataSource,\n) {\n\tconst attachRevisionIndex = getAttachRevisionIndex(metadata, baseMark, baseRevision);\n\tconst detachRevisionIndex = getDetachRevisionIndex(metadata, baseMark, baseRevision);\n\tfor (const revision of detachBlocks.keys()) {\n\t\tconst revisionIndex = getRevisionIndex(metadata, revision);\n\t\t// revisionIndex can be -Infinity if it is from a re-detach\n\t\tif (\n\t\t\trevisionIndex > -Infinity &&\n\t\t\tattachRevisionIndex <= revisionIndex &&\n\t\t\trevisionIndex < detachRevisionIndex\n\t\t) {\n\t\t\tdetachBlocks.delete(revision);\n\t\t}\n\t}\n\n\tcellBlocks.push({\n\t\tcellId: rebasedMark.cellId,\n\t\tfirstAttachedRevisionIndex: attachRevisionIndex,\n\t\tlastAttachedRevisionIndex: detachRevisionIndex - 1,\n\t});\n}\n\nfunction getAttachRevisionIndex(\n\tmetadata: RevisionMetadataSource,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n): number {\n\tif (!areInputCellsEmpty(baseMark)) {\n\t\treturn -Infinity;\n\t}\n\n\tif (markFillsCells(baseMark)) {\n\t\tassert(isAttach(baseMark), 0x81b / Only attach marks can fill cells /);\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\tif (isAttachAndDetachEffect(baseMark)) {\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.attach.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\treturn Infinity;\n}\n\nfunction getDetachRevisionIndex(\n\tmetadata: RevisionMetadataSource,\n\tbaseMark: Mark,\n\tbaseRevision: RevisionTag \| undefined,\n): number {\n\tif (!areOutputCellsEmpty(baseMark)) {\n\t\treturn Infinity;\n\t}\n\n\tif (markEmptiesCells(baseMark)) {\n\t\tassert(isDetach(baseMark), 0x81c / Only detach marks can empty cells /);\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\tif (isAttachAndDetachEffect(baseMark)) {\n\t\treturn getRevisionIndex(\n\t\t\tmetadata,\n\t\t\tbaseMark.detach.revision ?? baseRevision ?? fail(\"Mark must have revision\"),\n\t\t);\n\t}\n\n\treturn -Infinity;\n}\n\nfunction addLineageToRecipients(\n\tcellBlocks: CellBlockList,\n\trevision: RevisionTag,\n\tid: ChangesetLocalId,\n\tcount: number,\n\tmetadata: RebaseRevisionMetadata,\n) {\n\tconst rollbackOf = metadata.tryGetInfo(revision)?.rollbackOf;\n\tconst intention = rollbackOf ?? revision;\n\tconst intentionIndex = getRevisionIndex(metadata, intention);\n\tfor (let i = cellBlocks.length - 1; i >= 0; i--) {\n\t\tconst entry = cellBlocks[i];\n\t\tif (\n\t\t\tentry.firstAttachedRevisionIndex <= intentionIndex &&\n\t\t\tintentionIndex <= entry.lastAttachedRevisionIndex\n\t\t) {\n\t\t\t// These cells were full in this revision, so cells earlier in the sequence\n\t\t\t// do not need to know about this lineage event.\n\t\t\treturn;\n\t\t}\n\n\t\t// We only add lineage to cells which were detached before the lineage event occurred.\n\t\tif (entry.cellId === undefined) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (shouldReceiveLineage(entry.cellId.revision, revision, metadata)) {\n\t\t\taddLineageEntry(entry.cellId, intention, id, count, 0);\n\t\t}\n\t}\n}\n\nfunction addLineageEntry(\n\tlineageHolder: HasLineage,\n\trevision: RevisionTag,\n\tid: ChangesetLocalId,\n\tcount: number,\n\toffset: number,\n) {\n\tif (lineageHolder.lineage === undefined) {\n\t\tlineageHolder.lineage = [];\n\t}\n\n\tif (lineageHolder.lineage.length > 0) {\n\t\tconst lastEntry = lineageHolder.lineage[lineageHolder.lineage.length - 1];\n\t\tif (lastEntry.revision === revision && (lastEntry.id as number) + lastEntry.count === id) {\n\t\t\tif (lastEntry.offset === lastEntry.count) {\n\t\t\t\tlineageHolder.lineage[lineageHolder.lineage.length - 1] = {\n\t\t\t\t\t...lastEntry,\n\t\t\t\t\tcount: lastEntry.count + count,\n\t\t\t\t\toffset: lastEntry.offset + offset,\n\t\t\t\t};\n\t\t\t\treturn;\n\t\t\t} else if (offset === 0) {\n\t\t\t\tlineageHolder.lineage[lineageHolder.lineage.length - 1] = {\n\t\t\t\t\t...lastEntry,\n\t\t\t\t\tcount: lastEntry.count + count,\n\t\t\t\t};\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t}\n\n\tlineageHolder.lineage.push({ revision, id, count, offset });\n}\n\nfunction removeLineageEvents(lineageHolder: HasLineage, revisionsToRemove: Set<RevisionTag>) {\n\tif (lineageHolder.lineage === undefined) {\n\t\treturn;\n\t}\n\n\tlineageHolder.lineage = lineageHolder.lineage.filter(\n\t\t(event) => !revisionsToRemove.has(event.revision),\n\t);\n\tif (lineageHolder.lineage.length === 0) {\n\t\tdelete lineageHolder.lineage;\n\t}\n}\n\nfunction addIdRange(lineageEntries: IdRange[], range: IdRange): void {\n\tif (lineageEntries.length > 0) {\n\t\tconst lastEntry = lineageEntries[lineageEntries.length - 1];\n\t\tif ((lastEntry.id as number) + lastEntry.count === range.id) {\n\t\t\tlastEntry.count += range.count;\n\t\t\treturn;\n\t\t}\n\t}\n\n\tlineageEntries.push(range);\n}\n\nfunction setMarkAdjacentCells(mark: Mark, adjacentCells: IdRange[]): void {\n\tassert(\n\t\tmark.cellId !== undefined,\n\t\t0x74d / Can only set adjacent cells on a mark with cell ID /,\n\t);\n\tassert(mark.cellId.adjacentCells === undefined, 0x74e / Should not overwrite adjacentCells /);\n\tmark.cellId.adjacentCells = adjacentCells;\n}\n\nfunction shouldReceiveLineage(\n\tcellRevision: RevisionTag \| undefined,\n\tdetachRevision: RevisionTag,\n\tmetadata: RevisionMetadataSource,\n): boolean {\n\tif (cellRevision === undefined) {\n\t\t// An undefined cell revision means that the cell was created by the changeset we are rebasing.\n\t\t// Since this cell was been empty for all base revisions, it should receive lineage from all of them.\n\t\t// TODO: This cell does not need lineage from roll-forward revisions.\n\t\treturn true;\n\t}\n\n\tconst cellRevisionIndex = getRevisionIndex(metadata, cellRevision);\n\tconst rollbackOf = metadata.tryGetInfo(detachRevision)?.rollbackOf;\n\tconst detachIntention = rollbackOf ?? detachRevision;\n\tconst detachRevisionIndex = getRevisionIndex(metadata, detachIntention);\n\tif (detachRevisionIndex === undefined) {\n\t\t// This case means that these cells are being \"re-detached\" through a `redetachId`.\n\t\t// We could use the revision of the re-detach to determine whether or not this cell needs this lineage entry.\n\t\t// But to be conservative we always add lineage here.\n\t\treturn true;\n\t}\n\n\tconst isRollback = rollbackOf !== undefined;\n\treturn isRollback\n\t\t? detachRevisionIndex < cellRevisionIndex\n\t\t: detachRevisionIndex > cellRevisionIndex;\n}\n\n/\n Returns a number N which encodes how the cells of the two marks are aligned.\n * - If N is zero, then the first cell of `baseMark` is the same as the first cell of `newMark`.\n * - If N is positive, then the first N cells of `newMark` (or all its cells if N is greater than its length)\n * are before the first cell of `baseMark`.\n * - If N is negative, then the first N cells of `baseMark` (or all its cells if N is greater than its length)\n * are before the first cell of `newMark`.\n /\nfunction compareCellPositions(\n\tbaseRevision: RevisionTag \| undefined,\n\tbaseMark: EmptyInputCellMark,\n\tnewMark: EmptyInputCellMark,\n\tmetadata: RevisionMetadataSource,\n): number {\n\tconst baseId = getInputCellId(baseMark, baseRevision, metadata);\n\tconst baseLength = baseMark.count;\n\tassert(baseId?.revision !== undefined, 0x6a0 / baseMark should have cell ID /);\n\tconst newId = getInputCellId(newMark, undefined, metadata);\n\tassert(newId !== undefined, 0x85a / newMark should have cell ID /);\n\tconst newLength = newMark.count;\n\tif (newId !== undefined && baseId.revision === newId.revision) {\n\t\tconst cmp = compareCellsFromSameRevision(baseId, baseMark.count, newId, newMark.count);\n\t\tif (cmp !== undefined) {\n\t\t\treturn cmp;\n\t\t}\n\t}\n\n\tif (newId !== undefined) {\n\t\tconst offset = getOffsetInCellRange(\n\t\t\tbaseId.lineage,\n\t\t\tnewId.revision,\n\t\t\tnewId.localId,\n\t\t\tnewLength,\n\t\t);\n\t\tif (offset !== undefined) {\n\t\t\treturn offset > 0 ? offset : -Infinity;\n\t\t}\n\n\t\tconst newOffset = getOffsetInCellRange(\n\t\t\tnewId.lineage,\n\t\t\tbaseId.revision,\n\t\t\tbaseId.localId,\n\t\t\tbaseLength,\n\t\t);\n\t\tif (newOffset !== undefined) {\n\t\t\treturn newOffset > 0 ? -newOffset : Infinity;\n\t\t}\n\t}\n\n\tif (newId !== undefined) {\n\t\tconst cmp = compareLineages(baseId, newId);\n\t\tif (cmp !== 0) {\n\t\t\treturn Math.sign(cmp) Infinity;\n\t\t}\n\n\t\tconst cmp2 = compareMissingLineageEntries(baseId.lineage, newId.lineage, metadata);\n\t\tif (cmp2 !== 0) {\n\t\t\treturn Math.sign(cmp2) * Infinity;\n\t\t}\n\t}\n\n\t// Both cells must never have been filled (in their common history), otherwise they would have some common lineage.\n\t// A new attach targets a cell that has never been filled.\n\t// A mark can also target a cell which was initially filled on another branch, but which has never been filled on the current branch.\n\tif (newId.revision === undefined) {\n\t\t// An undefined revision must mean that the cell was created on the branch we are rebasing.\n\t\t// Since it is newer than the `baseMark`'s cell, it should come first.\n\t\treturn Infinity;\n\t}\n\n\tconst baseRevisionIndex = metadata.getIndex(baseId.revision);\n\tconst newRevisionIndex = metadata.getIndex(newId.revision);\n\n\tif (newRevisionIndex !== undefined && baseRevisionIndex !== undefined) {\n\t\treturn newRevisionIndex > baseRevisionIndex ? Infinity : -Infinity;\n\t}\n\n\tif (newRevisionIndex !== undefined) {\n\t\treturn Infinity;\n\t}\n\n\tif (baseRevisionIndex !== undefined) {\n\t\treturn -Infinity;\n\t}\n\n\t// `newMark` points to cells which were emptied before `baseMark` was created.\n\t// We use `baseMark`'s tiebreak policy as if `newMark`'s cells were created concurrently and before `baseMark`.\n\treturn -Infinity;\n}\n\nfunction compareMissingLineageEntries(\n\tlineage1: LineageEvent[] \| undefined,\n\tlineage2: LineageEvent[] \| undefined,\n\tmetadata: RevisionMetadataSource,\n): number {\n\tconst events1 = new Map<RevisionTag, LineageEvent>();\n\tfor (const event of lineage1 ?? []) {\n\t\tevents1.set(event.revision, event);\n\t}\n\n\tconst events2 = new Map<RevisionTag, LineageEvent>();\n\tfor (const event of lineage2 ?? []) {\n\t\tevents2.set(event.revision, event);\n\t}\n\n\tfor (const revision of events1.keys()) {\n\t\tif (events2.has(revision)) {\n\t\t\tevents1.delete(revision);\n\t\t\tevents2.delete(revision);\n\t\t}\n\t}\n\n\tfor (const event of events2.values()) {\n\t\t// We've found a cell C that was emptied before the cell1 started tracking lineage.\n\t\t// The cell1 should come before any such cell, so if cell2 comes after C\n\t\t// then we know that cell1 should come before the cell2.\n\t\t// TODO: Account for the cell1's tiebreak policy\n\t\tif (!metadata.hasRollback(event.revision) && event.offset !== 0) {\n\t\t\treturn -1;\n\t\t}\n\t}\n\n\t// cell1Events now contains only revisions which were not in cell2's lineage.\n\tfor (const event of events1.values()) {\n\t\t// We've found a cell C that was emptied before the cell2 started tracking lineage.\n\t\t// The cell2 should come before any such cell, so if cell1 comes after C\n\t\t// then we know that cell2 should come before the cell1.\n\t\t// TODO: Account for the cell2's tiebreak policy\n\t\tif (!metadata.hasRollback(event.revision) && event.offset !== 0) {\n\t\t\treturn 1;\n\t\t}\n\t}\n\n\treturn 0;\n}\n"]}

package/lib/feature-libraries/sequence-field/relevantRemovedRoots.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@
  */
 import { DeltaDetachedNodeId, TaggedChange } from "../../core/index.js";
 import { Changeset } from "./types.js";
-export type RelevantRemovedRootsFromTChild<TChild> = (child: TChild) => Iterable<DeltaDetachedNodeId>;
-export declare function relevantRemovedRoots<TChild>({ change, revision }: TaggedChange<Changeset<TChild>>, relevantRemovedRootsFromChild: RelevantRemovedRootsFromTChild<TChild>): Iterable<DeltaDetachedNodeId>;
+import { RelevantRemovedRootsFromChild } from "../modular-schema/index.js";
+export declare function relevantRemovedRoots({ change, revision }: TaggedChange<Changeset>, relevantRemovedRootsFromChild: RelevantRemovedRootsFromChild): Iterable<DeltaDetachedNodeId>;
 //# sourceMappingURL=relevantRemovedRoots.d.ts.map

package/lib/feature-libraries/sequence-field/relevantRemovedRoots.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"relevantRemovedRoots.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/relevantRemovedRoots.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAGH~~,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAkB,MAAM,qBAAqB,CAAC;~~AAExF~~,OAAO,EAAE,SAAS,EAAQ,MAAM,YAAY,CAAC;~~AAG7C~~,~~MAAM~~,~~MAAM~~,~~8BAA8B~~,~~CAAC,MAAM,IAAI,CACpD,KAAK,~~EAAE,MAAM,~~KACT~~,~~QAAQ,~~CAAC~~,mBAAmB,CAAC,CAAC~~;~~AAEnC~~,wBAAiB,oBAAoB,~~CAAC~~,~~MAAM,EAC3C,~~EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,~~MAAM~~,~~CAAC,CAAC,EACrD,~~6BAA6B,EAAE,~~8BAA8B~~,~~CAAC~~,~~MAAM,CAAC,GACnE,~~QAAQ,CAAC,mBAAmB,CAAC,CAgB/B"}
1	+ {"version":3,"file":"relevantRemovedRoots.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/relevantRemovedRoots.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAkB,MAAM,qBAAqB,CAAC;AAGxF,OAAO,EAAE,SAAS,EAAQ,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAE3E,wBAAiB,oBAAoB,CACpC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,EAC7C,6BAA6B,EAAE,6BAA6B,GAC1D,QAAQ,CAAC,mBAAmB,CAAC,CAgB/B"}

package/lib/feature-libraries/sequence-field/relevantRemovedRoots.js CHANGED Viewed

@@ -2,10 +2,10 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { offsetDetachId } from "../../core/index.js";
 import { nodeIdFromChangeAtom } from "../deltaUtils.js";
-import { isInsert, isDetachOfRemovedNodes, isAttachAndDetachEffect } from "./utils.js";
+import { isAttachAndDetachEffect, isDetachOfRemovedNodes, isInsert } from "./utils.js";
 export function* relevantRemovedRoots({ change, revision }, relevantRemovedRootsFromChild) {
     for (const mark of change) {
         if (refersToRelevantRemovedRoots(mark)) {

package/lib/feature-libraries/sequence-field/relevantRemovedRoots.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"relevantRemovedRoots.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/relevantRemovedRoots.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,~~4BAA4B~~,CAAC;~~AACpD~~,OAAO,EAAqC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;~~AAExD~~,OAAO,EAAE,~~QAAQ~~,EAAE,sBAAsB,EAAE,~~uBAAuB~~,EAAE,MAAM,YAAY,CAAC;~~AAMvF~~,MAAM,SAAS,CAAC,CAAC,oBAAoB,CACpC,EAAE,MAAM,EAAE,QAAQ,~~EAAmC~~,~~EACrD~~,~~6BAAqE~~;~~IAErE~~,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QAC1B,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;YACvC,MAAM,CACL,IAAI,CAAC,MAAM,KAAK,SAAS,EACzB,KAAK,CAAC,oEAAoE,CAC1E,CAAC;YACF,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aAChC;SACD;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACnD;KACD;AACF,CAAC;AAED,SAAS,4BAA4B,~~CAAS~~,~~IAAkB~~;IAC/D,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;QAC9B,MAAM,MAAM,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAClE,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;YACrB,2CAA2C;YAC3C,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE;YACxC,2DAA2D;YAC3D,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,qCAAqC;YACrC,uFAAuF;YACvF,kGAAkG;YAClG,8DAA8D;YAC9D,8FAA8F;YAC9F,+FAA+F;YAC/F,OAAO,IAAI,CAAC;SACZ;KACD;IACD,OAAO,KAAK,CAAC;AACd,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\";\nimport { DeltaDetachedNodeId, TaggedChange, offsetDetachId } from \"../../core/index.js\";\nimport { nodeIdFromChangeAtom } from \"../deltaUtils.js\";\nimport { Changeset, Mark } from \"./types.js\";\nimport { ~~isInsert~~, isDetachOfRemovedNodes, ~~isAttachAndDetachEffect~~ } from \"./utils.js\";\~~n\nexport~~ ~~type~~ ~~RelevantRemovedRootsFromTChild<TChild>~~ = (\n\~~tchild: TChild,\~~n~~) => Iterable<DeltaDetachedNodeId>;\n~~\nexport function relevantRemovedRoots~~<TChild>~~(\n\t{ change, revision }: TaggedChange<Changeset~~<TChild>>,\~~n\trelevantRemovedRootsFromChild: ~~RelevantRemovedRootsFromTChild<TChild>,\~~n): Iterable<DeltaDetachedNodeId> {\n\tfor (const mark of change) {\n\t\tif (refersToRelevantRemovedRoots(mark)) {\n\t\t\tassert(\n\t\t\t\tmark.cellId !== undefined,\n\t\t\t\t0x81d /* marks referring to removed trees must have an assigned cell ID /,\n\t\t\t);\n\t\t\tconst nodeId = nodeIdFromChangeAtom(mark.cellId, revision);\n\t\t\tfor (let i = 0; i < mark.count; i += 1) {\n\t\t\t\tyield offsetDetachId(nodeId, i);\n\t\t\t}\n\t\t}\n\t\tif (mark.changes !== undefined) {\n\t\t\tyield relevantRemovedRootsFromChild(mark.changes);\n\t\t}\n\t}\n}\n\nfunction refersToRelevantRemovedRoots~~<TChild>~~(mark: Mark~~<TChild>~~): boolean {\n\tif (mark.cellId !== undefined) {\n\t\tconst effect = isAttachAndDetachEffect(mark) ? mark.attach : mark;\n\t\tif (isInsert(effect)) {\n\t\t\t// This tree is being inserted or restored.\n\t\t\treturn true;\n\t\t} else if (isDetachOfRemovedNodes(mark)) {\n\t\t\t// This removed tree is being restored as part of a detach.\n\t\t\treturn true;\n\t\t}\n\t\tif (mark.changes !== undefined) {\n\t\t\t// This removed tree is being edited.\n\t\t\t// Note: there is a possibility that the child changes only affect a distant descendant\n\t\t\t// which may have been removed from this (removed) subtree. In such a case, this tree is not truly\n\t\t\t// relevant, but including it is the conservative thing to do.\n\t\t\t// In the future, we may represent changes to removed trees using the ID of the lowest removed\n\t\t\t// ancestor, which would allow us to avoid including such trees when they truly are not needed.\n\t\t\treturn true;\n\t\t}\n\t}\n\treturn false;\n}\n"]}
1	+ {"version":3,"file":"relevantRemovedRoots.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/relevantRemovedRoots.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAqC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,OAAO,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGvF,MAAM,SAAS,CAAC,CAAC,oBAAoB,CACpC,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAC7C,6BAA4D;IAE5D,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QAC1B,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;YACvC,MAAM,CACL,IAAI,CAAC,MAAM,KAAK,SAAS,EACzB,KAAK,CAAC,oEAAoE,CAC1E,CAAC;YACF,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aAChC;SACD;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACnD;KACD;AACF,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC/C,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;QAC9B,MAAM,MAAM,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAClE,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;YACrB,2CAA2C;YAC3C,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE;YACxC,2DAA2D;YAC3D,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,qCAAqC;YACrC,uFAAuF;YACvF,kGAAkG;YAClG,8DAA8D;YAC9D,8FAA8F;YAC9F,+FAA+F;YAC/F,OAAO,IAAI,CAAC;SACZ;KACD;IACD,OAAO,KAAK,CAAC;AACd,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\";\n\nimport { DeltaDetachedNodeId, TaggedChange, offsetDetachId } from \"../../core/index.js\";\nimport { nodeIdFromChangeAtom } from \"../deltaUtils.js\";\n\nimport { Changeset, Mark } from \"./types.js\";\nimport { isAttachAndDetachEffect, isDetachOfRemovedNodes, isInsert } from \"./utils.js\";\nimport { RelevantRemovedRootsFromChild } from \"../modular-schema/index.js\";\n\nexport function relevantRemovedRoots(\n\t{ change, revision }: TaggedChange<Changeset>,\n\trelevantRemovedRootsFromChild: RelevantRemovedRootsFromChild,\n): Iterable<DeltaDetachedNodeId> {\n\tfor (const mark of change) {\n\t\tif (refersToRelevantRemovedRoots(mark)) {\n\t\t\tassert(\n\t\t\t\tmark.cellId !== undefined,\n\t\t\t\t0x81d /* marks referring to removed trees must have an assigned cell ID /,\n\t\t\t);\n\t\t\tconst nodeId = nodeIdFromChangeAtom(mark.cellId, revision);\n\t\t\tfor (let i = 0; i < mark.count; i += 1) {\n\t\t\t\tyield offsetDetachId(nodeId, i);\n\t\t\t}\n\t\t}\n\t\tif (mark.changes !== undefined) {\n\t\t\tyield relevantRemovedRootsFromChild(mark.changes);\n\t\t}\n\t}\n}\n\nfunction refersToRelevantRemovedRoots(mark: Mark): boolean {\n\tif (mark.cellId !== undefined) {\n\t\tconst effect = isAttachAndDetachEffect(mark) ? mark.attach : mark;\n\t\tif (isInsert(effect)) {\n\t\t\t// This tree is being inserted or restored.\n\t\t\treturn true;\n\t\t} else if (isDetachOfRemovedNodes(mark)) {\n\t\t\t// This removed tree is being restored as part of a detach.\n\t\t\treturn true;\n\t\t}\n\t\tif (mark.changes !== undefined) {\n\t\t\t// This removed tree is being edited.\n\t\t\t// Note: there is a possibility that the child changes only affect a distant descendant\n\t\t\t// which may have been removed from this (removed) subtree. In such a case, this tree is not truly\n\t\t\t// relevant, but including it is the conservative thing to do.\n\t\t\t// In the future, we may represent changes to removed trees using the ID of the lowest removed\n\t\t\t// ancestor, which would allow us to avoid including such trees when they truly are not needed.\n\t\t\treturn true;\n\t\t}\n\t}\n\treturn false;\n}\n"]}

package/lib/feature-libraries/sequence-field/sequenceFieldChangeHandler.d.ts CHANGED Viewed

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 import { FieldChangeHandler } from "../modular-schema/index.js";
-import { Changeset } from "./types.js";
 import { SequenceFieldEditor } from "./sequenceFieldEditor.js";
+import { Changeset } from "./types.js";
 export type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;
 export declare const sequenceFieldChangeHandler: SequenceFieldChangeHandler;
 //# sourceMappingURL=sequenceFieldChangeHandler.d.ts.map

package/lib/feature-libraries/sequence-field/sequenceFieldChangeHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sequenceFieldChangeHandler.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;~~AAChE~~,OAAO,EAAE,~~SAAS~~,~~EAAE~~,MAAM,~~YAAY~~,CAAC;~~AAGvC~~,OAAO,EAAE,~~mBAAmB~~,~~EAAuB~~,MAAM,~~0BAA0B~~,CAAC;~~AAKpF~~,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAE5F,eAAO,MAAM,0BAA0B,EAAE,0BAQxC,CAAC"}
1	+ {"version":3,"file":"sequenceFieldChangeHandler.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAKhE,OAAO,EAAE,mBAAmB,EAAuB,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAE5F,eAAO,MAAM,0BAA0B,EAAE,0BAQxC,CAAC"}

package/lib/feature-libraries/sequence-field/sequenceFieldChangeHandler.js CHANGED Viewed

@@ -2,12 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { relevantRemovedRoots } from "./relevantRemovedRoots.js";
 import { sequenceFieldChangeRebaser } from "./sequenceFieldChangeRebaser.js";
 import { sequenceFieldChangeCodecFactory } from "./sequenceFieldCodecs.js";
 import { sequenceFieldEditor } from "./sequenceFieldEditor.js";
 import { sequenceFieldToDelta } from "./sequenceFieldToDelta.js";
 import { createEmpty, isEmpty } from "./utils.js";
-import { relevantRemovedRoots } from "./relevantRemovedRoots.js";
 export const sequenceFieldChangeHandler = {
     rebaser: sequenceFieldChangeRebaser,
     codecsFactory: sequenceFieldChangeCodecFactory,

package/lib/feature-libraries/sequence-field/sequenceFieldChangeHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sequenceFieldChangeHandler.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;~~AACjE~~,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;~~AAClD~~,~~OAAO,EAAE,oBAAoB,EAAE,~~MAAM,~~2BAA2B,~~CAAC~~;AAIjE~~,MAAM,~~CAAC,MAAM,~~0BAA0B,GAA+B;IACrE,OAAO,EAAE,0BAA0B;IACnC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,oBAAoB;IAC/B,oBAAoB;IACpB,OAAO;IACP,WAAW;CACX,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldChangeHandler } from \"../modular-schema/index.js\";\nimport { ~~Changeset~~ } from \"./~~types~~.js\";\nimport { sequenceFieldChangeRebaser } from \"./sequenceFieldChangeRebaser.js\";\nimport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nimport { SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nimport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nimport { ~~createEmpty,~~ ~~isEmpty~~ } from \"./~~utils~~.js\";\nimport { ~~relevantRemovedRoots~~ } from \"./~~relevantRemovedRoots~~.js\";\n\nexport type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;\n\nexport const sequenceFieldChangeHandler: SequenceFieldChangeHandler = {\n\trebaser: sequenceFieldChangeRebaser,\n\tcodecsFactory: sequenceFieldChangeCodecFactory,\n\teditor: sequenceFieldEditor,\n\tintoDelta: sequenceFieldToDelta,\n\trelevantRemovedRoots,\n\tisEmpty,\n\tcreateEmpty,\n};\n"]}
1	+ {"version":3,"file":"sequenceFieldChangeHandler.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIlD,MAAM,CAAC,MAAM,0BAA0B,GAA+B;IACrE,OAAO,EAAE,0BAA0B;IACnC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,oBAAoB;IAC/B,oBAAoB;IACpB,OAAO;IACP,WAAW;CACX,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldChangeHandler } from \"../modular-schema/index.js\";\n\nimport { relevantRemovedRoots } from \"./relevantRemovedRoots.js\";\nimport { sequenceFieldChangeRebaser } from \"./sequenceFieldChangeRebaser.js\";\nimport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nimport { SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nimport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nimport { Changeset } from \"./types.js\";\nimport { createEmpty, isEmpty } from \"./utils.js\";\n\nexport type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;\n\nexport const sequenceFieldChangeHandler: SequenceFieldChangeHandler = {\n\trebaser: sequenceFieldChangeRebaser,\n\tcodecsFactory: sequenceFieldChangeCodecFactory,\n\teditor: sequenceFieldEditor,\n\tintoDelta: sequenceFieldToDelta,\n\trelevantRemovedRoots,\n\tisEmpty,\n\tcreateEmpty,\n};\n"]}

package/lib/feature-libraries/sequence-field/sequenceFieldChangeRebaser.d.ts CHANGED Viewed

@@ -4,10 +4,10 @@
  */
 import { FieldChangeRebaser } from "../modular-schema/index.js";
 import { compose } from "./compose.js";
-import { Changeset } from "./types.js";
 import { invert } from "./invert.js";
-import { rebase } from "./rebase.js";
 import { prune } from "./prune.js";
+import { rebase } from "./rebase.js";
+import { Changeset } from "./types.js";
 export type SequenceChangeRebaser = FieldChangeRebaser<Changeset>;
 export declare const sequenceFieldChangeRebaser: {
     compose: typeof compose;

package/lib/feature-libraries/sequence-field/sequenceFieldChangeRebaser.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sequenceFieldChangeRebaser.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeRebaser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;~~AAChE~~,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~YAAY~~,CAAC;~~AACvC~~,OAAO,EAAE,~~MAAM~~,EAAE,MAAM,~~aAAa~~,CAAC;~~AACrC~~,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,~~KAAK~~,EAAE,MAAM,YAAY,CAAC;~~AAEnC~~,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}
1	+ {"version":3,"file":"sequenceFieldChangeRebaser.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeRebaser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}

package/lib/feature-libraries/sequence-field/sequenceFieldChangeRebaser.js CHANGED Viewed

@@ -4,8 +4,8 @@
  */
 import { compose } from "./compose.js";
 import { invert } from "./invert.js";
-import { rebase } from "./rebase.js";
 import { prune } from "./prune.js";
+import { rebase } from "./rebase.js";
 export const sequenceFieldChangeRebaser = {
     compose,
     invert,

package/lib/feature-libraries/sequence-field/sequenceFieldChangeRebaser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sequenceFieldChangeRebaser.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeRebaser.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAGH~~,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;~~AAEvC~~,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,~~MAAM~~,EAAE,MAAM,~~aAAa~~,CAAC;~~AACrC~~,OAAO,EAAE,~~KAAK~~,EAAE,MAAM,~~YAAY~~,CAAC;~~AAInC~~,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACzC,OAAO;IACP,MAAM;IACN,MAAM;IACN,KAAK;CACL,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldChangeRebaser } from \"../modular-schema/index.js\";\nimport { compose } from \"./compose.js\";\nimport { ~~Changeset~~ } from \"./~~types~~.js\";\nimport { ~~invert~~ } from \"./~~invert~~.js\";\nimport { rebase } from \"./rebase.js\";\nimport { ~~prune~~ } from \"./~~prune~~.js\";\n\nexport type SequenceChangeRebaser = FieldChangeRebaser<Changeset>;\n\nexport const sequenceFieldChangeRebaser = {\n\tcompose,\n\tinvert,\n\trebase,\n\tprune,\n};\n"]}
1	+ {"version":3,"file":"sequenceFieldChangeRebaser.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeRebaser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKrC,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACzC,OAAO;IACP,MAAM;IACN,MAAM;IACN,KAAK;CACL,CAAC","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { FieldChangeRebaser } from \"../modular-schema/index.js\";\n\nimport { compose } from \"./compose.js\";\nimport { invert } from \"./invert.js\";\nimport { prune } from \"./prune.js\";\nimport { rebase } from \"./rebase.js\";\nimport { Changeset } from \"./types.js\";\n\nexport type SequenceChangeRebaser = FieldChangeRebaser<Changeset>;\n\nexport const sequenceFieldChangeRebaser = {\n\tcompose,\n\tinvert,\n\trebase,\n\tprune,\n};\n"]}

package/lib/feature-libraries/sequence-field/sequenceFieldCodecs.d.ts CHANGED Viewed

@@ -2,9 +2,8 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { JsonCompatibleReadOnly } from "../../util/index.js";
 import { IJsonCodec } from "../../codec/index.js";
 import { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../../core/index.js";
-import { Changeset } from "./types.js";
-export declare const sequenceFieldChangeCodecFactory: <TNodeChange>(childCodec: IJsonCodec<TNodeChange, JsonCompatibleReadOnly, JsonCompatibleReadOnly, ChangeEncodingContext>, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>) => import("../../codec/codec.js").ICodecFamily<Changeset<TNodeChange>, ChangeEncodingContext>;
+import { FieldChangeEncodingContext } from "../index.js";
+export declare const sequenceFieldChangeCodecFactory: (revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>) => import("../../codec/codec.js").ICodecFamily<import("./types.js").MarkList, FieldChangeEncodingContext>;
 //# sourceMappingURL=sequenceFieldCodecs.d.ts.map

package/lib/feature-libraries/sequence-field/sequenceFieldCodecs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sequenceFieldCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAIH~~,OAAO,~~EAAE,sBAAsB,EAAiB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,~~EAAgC,UAAU,EAAmB,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;~~AAE7F~~,OAAO,~~EAIN~~,~~SAAS~~,~~EAST~~,MAAM,~~YAAY~~,CAAC;~~AAIpB~~,eAAO,MAAM,+BAA+B,~~8IAOzB~~,WACjB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB~~,+FAIC~~,CAAC"}
1	+ {"version":3,"file":"sequenceFieldCodecs.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldCodecs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAgC,UAAU,EAAmB,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAoB7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAGzD,eAAO,MAAM,+BAA+B,qBACzB,WACjB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,2GAC+F,CAAC"}

package/lib/feature-libraries/sequence-field/sequenceFieldCodecs.js CHANGED Viewed

@@ -2,18 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { unreachableCase } from "@fluidframework/core-utils";
-import { Type } from "@sinclair/typebox";
-import { fail } from "../../util/index.js";
+import { unreachableCase } from "@fluidframework/core-utils/internal";
 import { DiscriminatedUnionDispatcher, makeCodecFamily } from "../../codec/index.js";
+import { fail } from "../../util/index.js";
 import { makeChangeAtomIdCodec } from "../changeAtomIdCodec.js";
-import { NoopMarkType, } from "./types.js";
 import { Changeset as ChangesetSchema } from "./format.js";
+import { NoopMarkType, } from "./types.js";
 import { isNoopMark } from "./utils.js";
-export const sequenceFieldChangeCodecFactory = (childCodec, revisionTagCodec) => makeCodecFamily([
-    [0, makeV0Codec(childCodec, revisionTagCodec)],
-]);
-function makeV0Codec(childCodec, revisionTagCodec) {
+import { EncodedNodeChangeset } from "../modular-schema/index.js";
+export const sequenceFieldChangeCodecFactory = (revisionTagCodec) => makeCodecFamily([[1, makeV1Codec(revisionTagCodec)]]);
+function makeV1Codec(revisionTagCodec) {
     const changeAtomIdCodec = makeChangeAtomIdCodec(revisionTagCodec);
     const markEffectCodec = {
         encode(effect, context) {
@@ -211,13 +209,13 @@ function makeV0Codec(childCodec, revisionTagCodec) {
                     count: mark.count,
                 };
                 if (!isNoopMark(mark)) {
-                    encodedMark.effect = markEffectCodec.encode(mark, context);
+                    encodedMark.effect = markEffectCodec.encode(mark, context.baseContext);
                 }
                 if (mark.cellId !== undefined) {
-                    encodedMark.cellId = cellIdCodec.encode(mark.cellId, context);
+                    encodedMark.cellId = cellIdCodec.encode(mark.cellId, context.baseContext);
                 }
                 if (mark.changes !== undefined) {
-                    encodedMark.changes = childCodec.encode(mark.changes, context);
+                    encodedMark.changes = context.encodeNode(mark.changes);
                 }
                 jsonMarks.push(encodedMark);
             }
@@ -230,19 +228,19 @@ function makeV0Codec(childCodec, revisionTagCodec) {
                     count: mark.count,
                 };
                 if (mark.effect !== undefined) {
-                    Object.assign(decodedMark, markEffectCodec.decode(mark.effect, context));
+                    Object.assign(decodedMark, markEffectCodec.decode(mark.effect, context.baseContext));
                 }
                 if (mark.cellId !== undefined) {
-                    decodedMark.cellId = cellIdCodec.decode(mark.cellId, context);
+                    decodedMark.cellId = cellIdCodec.decode(mark.cellId, context.baseContext);
                 }
                 if (mark.changes !== undefined) {
-                    decodedMark.changes = childCodec.decode(mark.changes, context);
+                    decodedMark.changes = context.decodeNode(mark.changes);
                 }
                 marks.push(decodedMark);
             }
             return marks;
         },
-        encodedSchema: ChangesetSchema(childCodec.encodedSchema ?? Type.Any()),
+        encodedSchema: ChangesetSchema(EncodedNodeChangeset),
     };
 }
 //# sourceMappingURL=sequenceFieldCodecs.js.map