npm - @fluidframework/tree - Versions diffs - 2.74.0 → 2.81.0-374083 - Mend

@fluidframework/tree 2.74.0 → 2.81.0-374083

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 (1318) hide show

package/dist/feature-libraries/sequence-field/compose.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.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, fail } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\ttype ChangeAtomId,\n\ttype RevisionMetadataSource,\n\ttype RevisionTag,\n\toffsetChangeAtomId,\n} from \"../../core/index.js\";\nimport type { IdAllocator } from \"../../util/index.js\";\nimport {\n\ttype CrossFieldManager,\n\tCrossFieldTarget,\n\ttype NodeChangeComposer,\n\ttype NodeId,\n} from \"../modular-schema/index.js\";\n\nimport type { MoveMarkEffect } from \"./helperTypes.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport {\n\ttype MoveEffect,\n\ttype MoveEffectTable,\n\tgetCrossFieldTargetFromMove,\n\tgetMoveEffect,\n\tgetMoveIn,\n\tisMoveIn,\n\tisMoveMark,\n\tisMoveOut,\n\tsetMoveEffect,\n} from \"./moveEffectTable.js\";\nimport {\n\ttype Attach,\n\ttype CellMark,\n\ttype Changeset,\n\ttype Detach,\n\ttype Mark,\n\ttype MarkEffect,\n\ttype MarkList,\n\ttype MoveId,\n\ttype NoopMark,\n\tNoopMarkType,\n} from \"./types.js\";\nimport {\n\tCellOrder,\n\tareEqualCellIds,\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tasAttachAndDetach,\n\tcellSourcesFromMarks,\n\tcompareCellPositionsUsingTombstones,\n\textractMarkEffect,\n\tgetEndpoint,\n\tgetInputCellId,\n\tgetOutputCellId,\n\tisAttach,\n\tisAttachAndDetachEffect,\n\tisDetach,\n\tisImpactfulCellRename,\n\tisNewAttach,\n\tisNoopMark,\n\tisRename,\n\tmarkEmptiesCells,\n\tmarkFillsCells,\n\tmarkHasCellEffect,\n\tnormalizeCellRename,\n\tsettleMark,\n\twithNodeChange,\n\twithRevision,\n} from \"./utils.js\";\n\n/\n Composes a sequence of changesets into a single changeset.\n * @param changes - The changesets to be applied.\n * Parts of the input may be reused in the output, but the input is not mutated.\n * Each changeset in the list is assumed to be applicable after the previous one.\n * @returns A changeset that is equivalent to applying each of the given `changes` in order.\n \n WARNING! This implementation is incomplete:\n * - Tombstone information is ignored.\n * - Support for moves is not implemented.\n * - Support for slices is not implemented.\n /\nexport function compose(\n\tchange1: Changeset,\n\tchange2: Changeset,\n\tcomposeChild: NodeChangeComposer,\n\t_genId: IdAllocator,\n\tmanager: CrossFieldManager,\n\trevisionMetadata: RevisionMetadataSource,\n): Changeset {\n\treturn composeMarkLists(\n\t\tchange1,\n\t\tchange2,\n\t\tcomposeChild,\n\t\tmanager as MoveEffectTable,\n\t\trevisionMetadata,\n\t);\n}\n\nfunction composeMarkLists(\n\tbaseMarkList: MarkList,\n\tnewMarkList: MarkList,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n\trevisionMetadata: RevisionMetadataSource,\n): MarkList {\n\tconst factory = new MarkListFactory();\n\tconst queue = new ComposeQueue(baseMarkList, newMarkList, moveEffects, revisionMetadata);\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark } = queue.pop();\n\t\tif (newMark === undefined) {\n\t\t\tassert(\n\t\t\t\tbaseMark !== undefined,\n\t\t\t\t0x4db / Non-empty queue should not return two undefined marks /,\n\t\t\t);\n\t\t\tfactory.push(\n\t\t\t\tcomposeMark(baseMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\tcomposeChildChanges(node, undefined, composeChild),\n\t\t\t\t),\n\t\t\t);\n\t\t} else {\n\t\t\t// We only compose changesets that will not be further rebased.\n\t\t\t// It is therefore safe to remove any intentions that have no impact in the context they apply to.\n\t\t\tconst settledNewMark = settleMark(newMark);\n\t\t\tif (baseMark === undefined) {\n\t\t\t\tfactory.push(\n\t\t\t\t\tcomposeMark(settledNewMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\t\tcomposeChildChanges(undefined, node, composeChild),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t} else {\n\t\t\t\t// Past this point, we are guaranteed that `settledNewMark` and `baseMark` have the same length and\n\t\t\t\t// start at the same location in the revision after the base changes.\n\t\t\t\t// They therefore refer to the same range for that revision.\n\t\t\t\tconst settledBaseMark = settleMark(baseMark);\n\t\t\t\tconst composedMark = composeMarks(\n\t\t\t\t\tsettledBaseMark,\n\t\t\t\t\tsettledNewMark,\n\t\t\t\t\tcomposeChild,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t);\n\t\t\t\tfactory.push(composedMark);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn factory.list;\n}\n\n/\n Composes two marks where `newMark` is based on the state produced by `baseMark`.\n * @param baseMark - The mark to compose with `newMark`.\n * Its output range should be the same as `newMark`'s input range.\n * @param newRev - The revision the new mark is part of.\n * @param newMark - The mark to compose with `baseMark`.\n * Its input range should be the same as `baseMark`'s output range.\n * @returns A mark that is equivalent to applying both `baseMark` and `newMark` successively.\n /\nfunction composeMarks(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tconst nodeChange = handleNodeChanges(baseMark, newMark, composeChild, moveEffects);\n\n\treturn withUpdatedEndpoint(\n\t\twithNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange),\n\t\tbaseMark.count,\n\t\tmoveEffects,\n\t);\n}\n\nfunction composeMarksIgnoreChild(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tif (isNoopMark(baseMark)) {\n\t\treturn newMark;\n\t} else if (isNoopMark(newMark)) {\n\t\treturn baseMark;\n\t}\n\n\tif (isRename(baseMark) && isRename(newMark)) {\n\t\treturn { ...baseMark, idOverride: newMark.idOverride };\n\t} else if (isRename(baseMark)) {\n\t\tassert(\n\t\t\tisAttach(newMark) \|\| isAttachAndDetachEffect(newMark),\n\t\t\t0x9f1 / Unexpected mark type /,\n\t\t);\n\t\treturn { ...newMark, cellId: baseMark.cellId };\n\t} else if (isRename(newMark)) {\n\t\tassert(\n\t\t\tisDetach(baseMark) \|\| isAttachAndDetachEffect(baseMark),\n\t\t\t0x9f2 / Unexpected mark type /,\n\t\t);\n\t\treturn isDetach(baseMark)\n\t\t\t? { ...baseMark, idOverride: newMark.idOverride }\n\t\t\t: { ...baseMark, detach: { ...baseMark.detach, idOverride: newMark.idOverride } };\n\t}\n\n\tif (isImpactfulCellRename(newMark)) {\n\t\tconst newAttachAndDetach = asAttachAndDetach(newMark);\n\t\tassert(\n\t\t\tnewAttachAndDetach.cellId !== undefined,\n\t\t\t0x9f3 / Impactful cell rename must target empty cell /,\n\t\t);\n\t\tconst newDetachRevision = newAttachAndDetach.detach.revision;\n\t\tif (markEmptiesCells(baseMark)) {\n\t\t\t// baseMark is a detach which cancels with the attach portion of the AttachAndDetach,\n\t\t\t// so we are just left with the detach portion of the AttachAndDetach.\n\t\t\tconst newDetach: CellMark<Detach> = {\n\t\t\t\t...newAttachAndDetach.detach,\n\t\t\t\tcount: baseMark.count,\n\t\t\t};\n\n\t\t\tif (isMoveIn(newAttachAndDetach.attach) && isMoveOut(newAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveOut(baseMark), 0x808 / Unexpected mark type /);\n\n\t\t\t\t// The base changeset and new changeset both move these nodes.\n\t\t\t\t// Call the original position of the nodes A, the position after the base changeset is applied B,\n\t\t\t\t// and the position after the new changeset is applied C.\n\t\t\t\t// The new changeset moves the nodes from B, temporarily returns them to A, and then moves them to C.\n\t\t\t\t// The composition of the base and new changesets will be a move directly from A to C,\n\t\t\t\t// since the move from A to B cancels out with the return from B to A.\n\t\t\t\t// This if-block is handling marks at A.\n\t\t\t\t// When we compose the marks at B we will link the start of the base move (A to B)\n\t\t\t\t// with the end of the new move (B to C).\n\t\t\t\t// Because we are replacing the mark representing the start of the move with the new changeset's\n\t\t\t\t// move-out from A, we update the base move-in at B to consider that its start point.\n\t\t\t\tconst newDetachId = {\n\t\t\t\t\trevision: newDetachRevision,\n\t\t\t\t\tlocalId: newAttachAndDetach.detach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tgetEndpoint(baseMark),\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t\tnewDetachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tbaseMark.revision,\n\t\t\t\t\tbaseMark.id,\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(newDetach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\tnewDetachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn newDetach;\n\t\t}\n\n\t\tif (isImpactfulCellRename(baseMark)) {\n\t\t\tassert(\n\t\t\t\tbaseMark.cellId !== undefined,\n\t\t\t\t0x9f4 / Impactful cell rename must target empty cell /,\n\t\t\t);\n\t\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\t\tconst newOutputId = getOutputCellId(newAttachAndDetach);\n\n\t\t\tconst originalAttach = { ...baseAttachAndDetach.attach };\n\t\t\tconst finalDetach = { ...newAttachAndDetach.detach };\n\n\t\t\thandleMovePivot(baseMark.count, originalAttach, finalDetach, moveEffects);\n\n\t\t\tif (areEqualCellIds(newOutputId, baseAttachAndDetach.cellId)) {\n\t\t\t\treturn { count: baseAttachAndDetach.count, cellId: baseAttachAndDetach.cellId };\n\t\t\t}\n\n\t\t\t// `newMark`'s attach portion cancels with `baseMark`'s detach portion.\n\t\t\tconst detachRevision = finalDetach.revision;\n\t\t\tif (detachRevision !== undefined) {\n\t\t\t\tfinalDetach.revision = detachRevision;\n\t\t\t}\n\n\t\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, originalAttach, finalDetach);\n\t\t}\n\n\t\treturn normalizeCellRename(\n\t\t\tnewAttachAndDetach.cellId,\n\t\t\tnewAttachAndDetach.count,\n\t\t\tnewAttachAndDetach.attach,\n\t\t\tnewAttachAndDetach.detach,\n\t\t);\n\t}\n\tif (isImpactfulCellRename(baseMark)) {\n\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\tif (markFillsCells(newMark)) {\n\t\t\tconst originalAttach = withRevision(\n\t\t\t\t{\n\t\t\t\t\t...baseAttachAndDetach.attach,\n\t\t\t\t\tcellId: baseAttachAndDetach.cellId,\n\t\t\t\t\tcount: baseAttachAndDetach.count,\n\t\t\t\t},\n\t\t\t\tbaseAttachAndDetach.attach.revision,\n\t\t\t);\n\n\t\t\tif (isMoveIn(baseAttachAndDetach.attach) && isMoveOut(baseAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveIn(newMark), 0x809 / Unexpected mark type /);\n\n\t\t\t\tconst originalAttachId = {\n\t\t\t\t\trevision: baseAttachAndDetach.attach.revision,\n\t\t\t\t\tlocalId: baseAttachAndDetach.attach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tgetEndpoint(newMark),\n\t\t\t\t\tbaseAttachAndDetach.count,\n\t\t\t\t\toriginalAttachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tnewMark.revision,\n\t\t\t\t\tnewMark.id,\n\t\t\t\t\tnewMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(originalAttach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\toriginalAttachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn originalAttach;\n\t\t} else {\n\t\t\t// Other mark types have been handled by previous conditional branches.\n\t\t\tassert(newMark.type === NoopMarkType, 0x80a / Unexpected mark type /);\n\t\t\treturn baseMark;\n\t\t}\n\t}\n\n\tif (!markHasCellEffect(baseMark) && !markHasCellEffect(newMark)) {\n\t\treturn createNoopMark(newMark.count, undefined, getInputCellId(baseMark));\n\t} else if (!markHasCellEffect(baseMark)) {\n\t\treturn newMark;\n\t} else if (!markHasCellEffect(newMark)) {\n\t\treturn baseMark;\n\t} else if (areInputCellsEmpty(baseMark)) {\n\t\tassert(isDetach(newMark), 0x71c / Unexpected mark type /);\n\t\tassert(isAttach(baseMark), 0x71d / Expected generative mark /);\n\n\t\tconst attach = extractMarkEffect(baseMark);\n\t\tconst detach = extractMarkEffect(newMark);\n\n\t\thandleMovePivot(baseMark.count, attach, detach, moveEffects);\n\n\t\tif (areEqualCellIds(getOutputCellId(newMark), baseMark.cellId)) {\n\t\t\t// The output and input cell IDs are the same, so this mark has no effect.\n\t\t\treturn { count: baseMark.count, cellId: baseMark.cellId };\n\t\t}\n\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, attach, detach);\n\t} else {\n\t\tconst length = baseMark.count;\n\t\treturn createNoopMark(length, undefined);\n\t}\n}\n\n/\n Checks if `baseAttach` and `newDetach` are both moves, and if so updates their move endpoints as appropriate,\n * and removes their `finalEndpoint` endpoint fields. Note that can mutate `baseAttach` and `newDetach`.\n * If the effects are not both moves this function does nothing.\n * @param count - The number of cells targeted\n * @param baseAttach - The base attach effect at this location\n * @param newDetach - The new detach effect at this location\n /\nfunction handleMovePivot(\n\tcount: number,\n\tbaseAttach: Attach,\n\tnewDetach: Detach,\n\tmoveEffects: MoveEffectTable,\n): void {\n\tif (isMoveIn(baseAttach) && isMoveOut(newDetach)) {\n\t\tconst finalSource = getEndpoint(baseAttach);\n\t\tconst finalDest = getEndpoint(newDetach);\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Source, finalSource, count, finalDest);\n\n\t\tconst truncatedEndpoint1 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Destination,\n\t\t\tbaseAttach.revision,\n\t\t\tbaseAttach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint1 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\tfinalDest,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint1,\n\t\t\t);\n\t\t}\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Destination, finalDest, count, finalSource);\n\n\t\tconst truncatedEndpoint2 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Source,\n\t\t\tnewDetach.revision,\n\t\t\tnewDetach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint2 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\tfinalSource,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint2,\n\t\t\t);\n\t\t}\n\n\t\t// The `finalEndpoint` field of AttachAndDetach move effect pairs is not used,\n\t\t// so we remove it as a normalization.\n\t\tdelete baseAttach.finalEndpoint;\n\t\tdelete newDetach.finalEndpoint;\n\t}\n}\n\nfunction createNoopMark(\n\tlength: number,\n\tnodeChange: NodeId \| undefined,\n\tcellId?: ChangeAtomId,\n): Mark {\n\tconst mark: CellMark<NoopMark> = { count: length };\n\tif (nodeChange !== undefined) {\n\t\tassert(length === 1, 0x692 / A mark with a node change must have length one /);\n\t\tmark.changes = nodeChange;\n\t}\n\tif (cellId !== undefined) {\n\t\tmark.cellId = cellId;\n\t}\n\treturn mark;\n}\n\nfunction handleNodeChanges(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): NodeId \| undefined {\n\tif (newMark.changes !== undefined) {\n\t\tconst baseSource = getMoveIn(baseMark);\n\n\t\t// TODO: Make sure composeChild is not called twice on the node changes.\n\t\tif (baseSource !== undefined) {\n\t\t\tsetModifyAfter(moveEffects, getEndpoint(baseSource), newMark.changes);\n\t\t\treturn undefined;\n\t\t}\n\t}\n\n\treturn composeChildChanges(baseMark.changes, newMark.changes, composeChild);\n}\n\nfunction composeChildChanges(\n\tbaseChange: NodeId \| undefined,\n\tnewChange: NodeId \| undefined,\n\tcomposeChild: NodeChangeComposer,\n): NodeId \| undefined {\n\tif (baseChange === undefined && newChange === undefined) {\n\t\treturn undefined;\n\t}\n\n\treturn composeChild(baseChange, newChange);\n}\n\nfunction composeMark<TMark extends Mark>(\n\tmark: TMark,\n\tmoveEffects: MoveEffectTable,\n\tcomposeChild: (node: NodeId) => NodeId \| undefined,\n): TMark {\n\tconst nodeChanges = mark.changes !== undefined ? composeChild(mark.changes) : undefined;\n\tconst updatedMark = withUpdatedEndpoint(mark, mark.count, moveEffects);\n\treturn withNodeChange(updatedMark, nodeChanges);\n}\n\nexport class ComposeQueue {\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\tbaseMarks: Changeset,\n\t\tnewMarks: Changeset,\n\t\tprivate readonly moveEffects: MoveEffectTable,\n\t\tprivate readonly revisionMetadata: RevisionMetadataSource,\n\t) {\n\t\tthis.baseMarks = new MarkQueue(baseMarks, moveEffects);\n\t\tthis.newMarks = new MarkQueue(newMarks, moveEffects);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(baseMarks, getOutputCellId);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(newMarks, getInputCellId);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tif (baseMark === undefined && newMark === undefined) {\n\t\t\treturn {};\n\t\t} else if (baseMark === undefined) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areOutputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tconst baseCellId: ChangeAtomId =\n\t\t\t\tgetOutputCellId(baseMark) ?? fail(0xb29 / Expected defined output ID /);\n\n\t\t\tif (markEmptiesCells(baseMark) && baseCellId.revision === undefined) {\n\t\t\t\t// The base revision should always be defined except when squashing changes into a transaction.\n\t\t\t\t// In the future, we want to support reattaches in the new change here.\n\t\t\t\t// We will need to be able to order the base mark relative to the new mark\n\t\t\t\t// (which requires the local changes to have a revision tag))\n\t\t\t\tassert(\n\t\t\t\t\tisNewAttach(newMark),\n\t\t\t\t\t0x695 / TODO: Assign revision tags to each change in a transaction /,\n\t\t\t\t);\n\t\t\t\treturn this.dequeueNew();\n\t\t\t}\n\n\t\t\tconst newCellId = getInputCellId(newMark);\n\t\t\tassert(newCellId !== undefined, 0x89d / Both marks should have cell IDs /);\n\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\tbaseCellId,\n\t\t\t\tnewCellId,\n\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\tthis.newMarksCellSources,\n\t\t\t\tthis.revisionMetadata,\n\t\t\t);\n\t\t\tswitch (comparison) {\n\t\t\t\tcase CellOrder.SameCell:\n\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\tcase CellOrder.OldThenNew:\n\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\tcase CellOrder.NewThenOld:\n\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\tdefault:\n\t\t\t\t\tunreachableCase(comparison);\n\t\t\t}\n\t\t} else if (areOutputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\t\tif (movedChanges !== undefined) {\n\t\t\tthis.moveEffects.onMoveIn(movedChanges);\n\t\t}\n\n\t\tconst newMark = createNoopMark(baseMark.count, movedChanges, getOutputCellId(baseMark));\n\t\treturn { baseMark, newMark };\n\t}\n\n\tprivate dequeueNew(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst baseMark = createNoopMark(newMark.count, undefined, getInputCellId(newMark));\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueBoth(): ComposeMarks {\n\t\tconst length = this.peekMinLength();\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tlet newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\n\t\tif (movedChanges !== undefined) {\n\t\t\tassert(newMark.changes === undefined, 0x8da / Unexpected node changeset collision /);\n\t\t\tnewMark = withNodeChange(newMark, movedChanges);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate peekMinLength(): number {\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\t0x8db / Cannot peek length unless both mark queues are non-empty /,\n\t\t);\n\n\t\treturn Math.min(newMark.count, baseMark.count);\n\t}\n}\n\ninterface ComposeMarks {\n\tbaseMark?: Mark;\n\tnewMark?: Mark;\n}\n\nfunction getMovedChangesFromMark(\n\tmoveEffects: MoveEffectTable,\n\tmarkEffect: MarkEffect,\n): NodeId \| undefined {\n\tif (isAttachAndDetachEffect(markEffect)) {\n\t\treturn getMovedChangesFromMark(moveEffects, markEffect.detach);\n\t}\n\tif (!isMoveOut(markEffect)) {\n\t\treturn undefined;\n\t}\n\n\treturn getModifyAfter(moveEffects, markEffect.revision, markEffect.id);\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 getModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n): NodeId \| undefined {\n\tconst target = CrossFieldTarget.Source;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, 1);\n\n\tif (effect.value?.modifyAfter !== undefined) {\n\t\treturn effect.value.modifyAfter;\n\t}\n\n\treturn undefined;\n}\n\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction setModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\t{ revision, localId: id }: ChangeAtomId,\n\tmodifyAfter: NodeId,\n): void {\n\tconst target = CrossFieldTarget.Source;\n\tconst count = 1;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count, false);\n\tconst newEffect: MoveEffect =\n\t\teffect.value !== undefined ? { ...effect.value, modifyAfter } : { modifyAfter };\n\tsetMoveEffect(moveEffects, target, revision, id, count, newEffect);\n}\n\nfunction setEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\tendpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count, false);\n\tconst newEffect = effect.value !== undefined ? { ...effect.value, endpoint } : { endpoint };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(endpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value !== undefined\n\t\t\t? { ...effect.value, truncatedEndpoint }\n\t\t\t: { truncatedEndpoint };\n\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpointForInner: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value !== undefined\n\t\t\t? { ...effect.value, truncatedEndpointForInner }\n\t\t\t: { truncatedEndpointForInner };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpointForInner, effect.length),\n\t\t);\n\t}\n}\n\nfunction withUpdatedEndpoint<TMark extends MarkEffect>(\n\tmark: TMark,\n\tcount: number,\n\teffects: MoveEffectTable,\n): TMark {\n\tif (isAttachAndDetachEffect(mark)) {\n\t\treturn {\n\t\t\t...mark,\n\t\t\tattach: withUpdatedEndpoint(mark.attach, count, effects),\n\t\t\tdetach: withUpdatedEndpoint(mark.detach, count, effects),\n\t\t};\n\t}\n\n\tif (!isMoveMark(mark)) {\n\t\treturn mark;\n\t}\n\tconst finalDest = getComposedEndpoint(\n\t\teffects,\n\t\tgetCrossFieldTargetFromMove(mark),\n\t\tmark.revision,\n\t\tmark.id,\n\t\tcount,\n\t);\n\n\tif (finalDest === undefined) {\n\t\treturn mark;\n\t}\n\n\tconst output = { ...mark };\n\tchangeFinalEndpoint(output, finalDest);\n\n\treturn output;\n}\n\nfunction changeFinalEndpoint(mark: MoveMarkEffect, endpoint: ChangeAtomId): void {\n\tif (areEqualCellIds(endpoint, { revision: mark.revision, localId: mark.id })) {\n\t\tdelete mark.finalEndpoint;\n\t} else {\n\t\tmark.finalEndpoint = endpoint;\n\t}\n}\n\nfunction getComposedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x815 / Expected effect to cover entire mark /);\n\treturn effect.value?.truncatedEndpoint ?? effect.value?.endpoint;\n}\n\nfunction getTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x934 / Expected effect to cover entire mark */);\n\treturn effect.value?.truncatedEndpointForInner;\n}\n"]}
1	+ {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.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, fail } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\tareEqualChangeAtomIdOpts,\n\tareEqualChangeAtomIds,\n\ttype ChangeAtomId,\n\ttype RevisionMetadataSource,\n\ttype RevisionTag,\n} from \"../../core/index.js\";\nimport type { IdAllocator } from \"../../util/index.js\";\nimport type {\n\tComposeNodeManager,\n\tNodeChangeComposer,\n\tNodeId,\n} from \"../modular-schema/index.js\";\n\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport type { NodeRangeQueryFunc } from \"./moveEffectTable.js\";\nimport type {\n\tCellMark,\n\tChangeset,\n\tDetach,\n\tMark,\n\tMarkEffect,\n\tMarkList,\n\tNoopMark,\n} from \"./types.js\";\nimport {\n\tCellOrder,\n\tareEqualCellIds,\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tcellSourcesFromMarks,\n\tcompareCellPositionsUsingTombstones,\n\textractMarkEffect,\n\tgetAttachedRootId,\n\tgetDetachOutputCellId,\n\tgetDetachedRootId,\n\tgetInputCellId,\n\tgetMovedNodeId,\n\tgetOutputCellId,\n\tisAttach,\n\tisDetach,\n\tisNewAttach,\n\tisNoopMark,\n\tisPin,\n\tisRename,\n\tmarkEmptiesCells,\n\tmarkHasCellEffect,\n\tnormalizeCellRename,\n\twithNodeChange,\n} from \"./utils.js\";\n\n/\n Composes a sequence of changesets into a single changeset.\n * @param changes - The changesets to be applied.\n * Parts of the input may be reused in the output, but the input is not mutated.\n * Each changeset in the list is assumed to be applicable after the previous one.\n * @returns A changeset that is equivalent to applying each of the given `changes` in order.\n \n WARNING! This implementation is incomplete:\n * - Tombstone information is ignored.\n * - Support for moves is not implemented.\n * - Support for slices is not implemented.\n /\nexport function compose(\n\tchange1: Changeset,\n\tchange2: Changeset,\n\tcomposeChild: NodeChangeComposer,\n\t_genId: IdAllocator,\n\tmanager: ComposeNodeManager,\n\trevisionMetadata: RevisionMetadataSource,\n): Changeset {\n\treturn composeMarkLists(change1, change2, composeChild, manager, revisionMetadata);\n}\n\nfunction composeMarkLists(\n\tbaseMarkList: MarkList,\n\tnewMarkList: MarkList,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: ComposeNodeManager,\n\trevisionMetadata: RevisionMetadataSource,\n): MarkList {\n\tconst factory = new MarkListFactory();\n\tconst queue = new ComposeQueue(baseMarkList, newMarkList, moveEffects, revisionMetadata);\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark } = queue.pop();\n\t\tconst composedMark = composeMarks(baseMark, newMark, composeChild, moveEffects);\n\t\tfactory.push(composedMark);\n\t}\n\n\treturn factory.list;\n}\n\n/\n Composes two marks where `newMark` is based on the state produced by `baseMark`.\n * @param baseMark - The mark to compose with `newMark`.\n * Its output range should be the same as `newMark`'s input range.\n * @param newRev - The revision the new mark is part of.\n * @param newMark - The mark to compose with `baseMark`.\n * Its input range should be the same as `baseMark`'s output range.\n * @returns A mark that is equivalent to applying both `baseMark` and `newMark` successively.\n /\nfunction composeMarks(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: ComposeNodeManager,\n): Mark {\n\tconst nodeChange = handleNodeChanges(baseMark, newMark, composeChild, moveEffects);\n\treturn withNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange);\n}\n\nfunction composeMarksIgnoreChild(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tmoveEffects: ComposeNodeManager,\n): Mark {\n\tif (isNoopMark(baseMark)) {\n\t\treturn newMark;\n\t} else if (isNoopMark(newMark)) {\n\t\treturn updateBaseMarkId(moveEffects, baseMark);\n\t}\n\n\tif (isRename(baseMark) && isRename(newMark)) {\n\t\tif (areEqualChangeAtomIdOpts(baseMark.cellId, newMark.idOverride)) {\n\t\t\treturn createNoopMark(baseMark.count, undefined, baseMark.cellId);\n\t\t}\n\t\treturn { ...baseMark, idOverride: newMark.idOverride };\n\t} else if (isRename(baseMark)) {\n\t\tassert(isAttach(newMark), 0x9f1 / Unexpected mark type /);\n\t\tassert(\n\t\t\tbaseMark.cellId !== undefined && newMark.cellId !== undefined,\n\t\t\t\"Expected marks to target an empty cell\",\n\t\t);\n\t\treturn { ...newMark, cellId: baseMark.cellId };\n\t} else if (isRename(newMark)) {\n\t\tassert(isDetach(baseMark), 0x9f2 / Unexpected mark type /);\n\t\treturn updateBaseMarkId(moveEffects, { ...baseMark, cellRename: newMark.idOverride });\n\t}\n\n\tif (!markHasCellEffect(baseMark)) {\n\t\tassert(baseMark.type === \"Insert\", \"Expected baseMark to be a pin\");\n\n\t\t// `newMark` can be either a remove or another pin.\n\t\t// A pin is treated as a detach and attach, so we call `composeAttachDetach` in either case.\n\t\tmoveEffects.composeAttachDetach(\n\t\t\tgetAttachedRootId(baseMark),\n\t\t\t{\n\t\t\t\trevision: newMark.revision,\n\t\t\t\tlocalId: newMark.id,\n\t\t\t},\n\t\t\tbaseMark.count,\n\t\t);\n\n\t\tconst pinId = getAttachedRootId(baseMark);\n\t\treturn newMark.type === \"Remove\"\n\t\t\t? {\n\t\t\t\t\t...newMark,\n\t\t\t\t\tdetachCellId: baseMark.detachCellId ?? pinId,\n\t\t\t\t\tcellRename: getDetachOutputCellId(newMark),\n\t\t\t\t}\n\t\t\t: newMark;\n\t} else if (!markHasCellEffect(newMark)) {\n\t\tif (isAttach(newMark) && isAttach(baseMark)) {\n\t\t\t// When composing two inserts, the second insert (which is a pin) should take precedence.\n\t\t\t// We treat the pin as a detach and reattach.\n\t\t\tmoveEffects.composeAttachDetach(\n\t\t\t\tgetAttachedRootId(baseMark),\n\t\t\t\tgetAttachedRootId(newMark),\n\t\t\t\tbaseMark.count,\n\t\t\t);\n\n\t\t\tconst composed = { cellId: baseMark.cellId, ...newMark };\n\t\t\tdelete composed.detachCellId;\n\t\t\treturn composed;\n\t\t}\n\t\treturn updateBaseMarkId(moveEffects, baseMark);\n\t} else if (areInputCellsEmpty(baseMark)) {\n\t\tassert(isDetach(newMark), 0x71c / Unexpected mark type /);\n\t\tassert(isAttach(baseMark), 0x71d / Expected generative mark /);\n\n\t\tconst attach = extractMarkEffect(baseMark);\n\t\tconst detach = extractMarkEffect(newMark);\n\n\t\tmoveEffects.composeAttachDetach(\n\t\t\tgetAttachedRootId(baseMark),\n\t\t\tgetDetachedRootId(newMark),\n\t\t\tbaseMark.count,\n\t\t);\n\n\t\tif (areEqualCellIds(getOutputCellId(newMark), baseMark.cellId)) {\n\t\t\t// The output and input cell IDs are the same, so this mark has no effect.\n\t\t\treturn { count: baseMark.count, cellId: baseMark.cellId };\n\t\t}\n\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, attach, detach);\n\t} else {\n\t\tassert(baseMark.type === \"Remove\", \"Unexpected mark type\");\n\t\tassert(newMark.type === \"Insert\", \"Unexpected mark type\");\n\t\tconst detachId = getDetachedRootId(baseMark);\n\t\tconst attachId = getAttachedRootId(newMark);\n\n\t\t// Note that we cannot assert that this returns true,\n\t\t// as it may not be until a second pass that MCF can tell that this is a reattach of the same node.\n\t\tmoveEffects.composeDetachAttach(detachId, attachId, baseMark.count, true);\n\n\t\t// The composition has no net effect but we preserve the second change's intention to pin the nodes here.\n\t\tconst composedMark = { ...newMark };\n\t\tdelete composedMark.cellId;\n\t\tconst baseDetachCellId = baseMark.detachCellId ?? detachId;\n\t\tif (!areEqualChangeAtomIds(baseDetachCellId, attachId)) {\n\t\t\tcomposedMark.detachCellId = baseDetachCellId;\n\t\t}\n\n\t\treturn composedMark;\n\t}\n}\n\nfunction updateBaseMarkId(moveEffects: ComposeNodeManager, baseMark: Mark): Mark {\n\tif (isDetach(baseMark)) {\n\t\tconst baseDetachId = getDetachedRootId(baseMark);\n\t\tconst updatedDetachId = getUpdatedDetachId(moveEffects, baseMark);\n\t\tif (\n\t\t\tupdatedDetachId !== undefined &&\n\t\t\t!areEqualChangeAtomIds(updatedDetachId, baseDetachId)\n\t\t) {\n\t\t\treturn {\n\t\t\t\t...baseMark,\n\t\t\t\trevision: updatedDetachId.revision,\n\t\t\t\tid: updatedDetachId.localId,\n\t\t\t\tdetachCellId: baseMark.detachCellId ?? baseDetachId,\n\t\t\t};\n\t\t}\n\t}\n\n\treturn baseMark;\n}\n\nfunction createNoopMark(\n\tlength: number,\n\tnodeChange: NodeId \| undefined,\n\tcellId?: ChangeAtomId,\n): Mark {\n\tconst mark: CellMark<NoopMark> = { count: length };\n\tif (nodeChange !== undefined) {\n\t\tassert(length === 1, 0x692 / A mark with a node change must have length one /);\n\t\tmark.changes = nodeChange;\n\t}\n\tif (cellId !== undefined) {\n\t\tmark.cellId = cellId;\n\t}\n\treturn mark;\n}\n\nfunction handleNodeChanges(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: ComposeNodeManager,\n): NodeId \| undefined {\n\tif (\n\t\tnewMark.changes !== undefined &&\n\t\tbaseMark.type === \"Insert\" &&\n\t\tbaseMark.cellId !== undefined\n\t) {\n\t\tmoveEffects.sendNewChangesToBaseSourceLocation(\n\t\t\tgetAttachedRootId(baseMark),\n\t\t\tnewMark.changes,\n\t\t);\n\t\treturn undefined;\n\t}\n\n\t// TODO: Make sure composeChild is not called twice on the node changes.\n\treturn composeChildChanges(baseMark.changes, newMark.changes, composeChild);\n}\n\nfunction composeChildChanges(\n\tbaseChange: NodeId \| undefined,\n\tnewChange: NodeId \| undefined,\n\tcomposeChild: NodeChangeComposer,\n): NodeId \| undefined {\n\tif (baseChange === undefined && newChange === undefined) {\n\t\treturn undefined;\n\t}\n\n\treturn composeChild(baseChange, newChange);\n}\n\nexport class ComposeQueue {\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\tbaseMarks: Changeset,\n\t\tnewMarks: Changeset,\n\t\tprivate readonly moveEffects: ComposeNodeManager,\n\t\tprivate readonly revisionMetadata: RevisionMetadataSource,\n\t) {\n\t\tconst queryFunc: NodeRangeQueryFunc = (mark) =>\n\t\t\tisDetach(mark) \|\| isPin(mark)\n\t\t\t\t? moveEffects.getNewChangesForBaseDetach(getMovedNodeId(mark), mark.count).length\n\t\t\t\t: mark.count;\n\n\t\tthis.baseMarks = new MarkQueue(baseMarks, queryFunc);\n\t\tthis.newMarks = new MarkQueue(newMarks, (mark) => mark.count);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(baseMarks, getOutputCellId);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(newMarks, getInputCellId);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tif (baseMark === undefined && newMark === undefined) {\n\t\t\tfail(\"Should not pop when queue is empty\");\n\t\t} else if (baseMark === undefined) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areOutputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tconst baseCellId: ChangeAtomId =\n\t\t\t\tgetOutputCellId(baseMark) ?? fail(0xb29 / Expected defined output ID /);\n\n\t\t\tif (markEmptiesCells(baseMark) && baseCellId.revision === undefined) {\n\t\t\t\t// The base revision should always be defined except when squashing changes into a transaction.\n\t\t\t\t// In the future, we want to support reattaches in the new change here.\n\t\t\t\t// We will need to be able to order the base mark relative to the new mark\n\t\t\t\t// (which requires the local changes to have a revision tag))\n\t\t\t\tassert(\n\t\t\t\t\tisNewAttach(newMark),\n\t\t\t\t\t0x695 / TODO: Assign revision tags to each change in a transaction /,\n\t\t\t\t);\n\t\t\t\treturn this.dequeueNew();\n\t\t\t}\n\n\t\t\tconst newCellId = getInputCellId(newMark);\n\t\t\tassert(newCellId !== undefined, 0x89d / Both marks should have cell IDs /);\n\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\tbaseCellId,\n\t\t\t\tnewCellId,\n\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\tthis.newMarksCellSources,\n\t\t\t\tthis.revisionMetadata,\n\t\t\t);\n\t\t\tswitch (comparison) {\n\t\t\t\tcase CellOrder.SameCell: {\n\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.OldThenNew: {\n\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.NewThenOld: {\n\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(comparison);\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (areOutputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\t\tconst newMark = createNoopMark(baseMark.count, movedChanges, getOutputCellId(baseMark));\n\t\treturn { baseMark, newMark };\n\t}\n\n\tprivate dequeueNew(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst baseMark = createNoopMark(newMark.count, undefined, getInputCellId(newMark));\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueBoth(): ComposeMarks {\n\t\tconst length = this.peekMinLength();\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tlet newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\n\t\tif (movedChanges !== undefined) {\n\t\t\tassert(newMark.changes === undefined, 0x8da / Unexpected node changeset collision /);\n\t\t\tnewMark = withNodeChange(newMark, movedChanges);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate peekMinLength(): number {\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\t0x8db / Cannot peek length unless both mark queues are non-empty */,\n\t\t);\n\n\t\treturn Math.min(newMark.count, baseMark.count);\n\t}\n}\n\ninterface ComposeMarks {\n\tbaseMark: Mark;\n\tnewMark: Mark;\n}\n\nfunction getMovedChangesFromMark(\n\tmoveEffects: ComposeNodeManager,\n\tmarkEffect: MarkEffect,\n): NodeId \| undefined {\n\tif (!isDetach(markEffect)) {\n\t\treturn undefined;\n\t}\n\n\treturn moveEffects.getNewChangesForBaseDetach(getDetachedRootId(markEffect), 1).value\n\t\t?.nodeChange;\n}\n\nfunction getUpdatedDetachId(\n\tmanager: ComposeNodeManager,\n\tmark: CellMark<Detach>,\n): ChangeAtomId \| undefined {\n\treturn manager.getNewChangesForBaseDetach(getDetachedRootId(mark), mark.count).value\n\t\t?.detachId;\n}\n"]}

package/dist/feature-libraries/sequence-field/helperTypes.d.ts CHANGED Viewed

@@ -4,24 +4,28 @@
  */
 import type { DiscriminatedUnionLibrary, IJsonCodec } from "../../codec/index.js";
 import type { ChangeAtomId, ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../../core/index.js";
-import type { EncodedChangeAtomId } from "../modular-schema/index.js";
-import type { AttachAndDetach, CellId, CellMark, Detach, HasMarkFields, Mark, MoveIn, MoveOut } from "./types.js";
+import type { EncodedChangeAtomId, FieldChangeEncodingContext } from "../modular-schema/index.js";
+import type { Encoded } from "./formatV2.js";
+import type { Attach, CellId, CellMark, Detach, HasMarkFields, Mark, MarkEffect } from "./types.js";
 export type EmptyInputCellMark = Mark & DetachedCellMark;
 export interface DetachedCellMark extends HasMarkFields {
     cellId: CellId;
 }
-export type EmptyOutputCellMark = CellMark<Detach | AttachAndDetach>;
-export type MoveMarkEffect = MoveOut | MoveIn;
+export type EmptyOutputCellMark = CellMark<Detach>;
+export type MoveMarkEffect = Attach | Detach;
 export type DetachOfRemovedNodes = Detach & {
     cellId: CellId;
 };
-export type CellRename = AttachAndDetach | DetachOfRemovedNodes;
-export interface SequenceCodecHelpers<TDecodedMarkEffect, TEncodedMarkEffect extends object> {
+export type CellRename = DetachOfRemovedNodes;
+export interface SequenceCodecHelpers {
     readonly changeAtomIdCodec: IJsonCodec<ChangeAtomId, EncodedChangeAtomId, EncodedChangeAtomId, ChangeEncodingContext>;
-    readonly markEffectCodec: IJsonCodec<TDecodedMarkEffect, TEncodedMarkEffect, TEncodedMarkEffect, ChangeEncodingContext>;
-    readonly decoderLibrary: DiscriminatedUnionLibrary<TEncodedMarkEffect, [
-        context: ChangeEncodingContext
-    ], TDecodedMarkEffect>;
+    readonly encodeMarkEffect: (mark: Mark, context: FieldChangeEncodingContext) => Encoded.MarkEffect;
+    readonly decodeMarkEffect: (encoded: Encoded.MarkEffect, count: number, cellId: ChangeAtomId | undefined, context: FieldChangeEncodingContext) => MarkEffect;
     readonly decodeRevision: (encodedRevision: EncodedRevisionTag | undefined, context: ChangeEncodingContext) => RevisionTag;
+    readonly decoderLibrary: DiscriminatedUnionLibrary<Encoded.MarkEffect, [
+        count: number,
+        cellId: ChangeAtomId | undefined,
+        context: FieldChangeEncodingContext
+    ], MarkEffect>;
 }
 //# sourceMappingURL=helperTypes.d.ts.map

package/dist/feature-libraries/sequence-field/helperTypes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helperTypes.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/helperTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EACX,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,~~EAAE~~,mBAAmB,~~EAAE~~,MAAM,4BAA4B,CAAC;~~AAEtE~~,OAAO,KAAK,~~EACX~~,eAAe,~~EACf~~,MAAM,EACN,QAAQ,EACR,MAAM,EACN,aAAa,EACb,IAAI,EACJ,~~MAAM~~,~~EACN~~,~~OAAO,EACP,~~MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,kBAAkB,GAAG,IAAI,GAAG,gBAAgB,CAAC;AAEzD,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,MAAM,~~GAAG,eAAe,~~CAAC,CAAC;~~AAErE~~,MAAM,MAAM,cAAc,GAAG,~~OAAO~~,GAAG,MAAM,CAAC;~~AAC9C~~,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/D,MAAM,MAAM,UAAU,GAAG,~~eAAe,GAAG,~~oBAAoB,CAAC;~~AAEhE~~,MAAM,WAAW,oBAAoB~~,CAAC,kBAAkB,EAAE,kBAAkB,SAAS,MAAM~~;~~IAC1F~~,QAAQ,CAAC,iBAAiB,EAAE,UAAU,CACrC,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,CACrB,CAAC;~~IACF~~,QAAQ,CAAC,~~eAAe~~,EAAE,~~UAAU~~,~~CACnC~~,~~kBAAkB~~,~~EAClB~~,~~kBAAkB~~,~~EAClB~~,~~kBAAkB~~,~~EAClB~~,~~qBAAqB~~,~~CACrB~~,CAAC;~~IACF~~,QAAQ,CAAC,~~cAAc~~,EAAE,~~yBAAyB~~,~~CACjD~~,~~kBAAkB~~,~~EACP;QAAC~~,OAAO,EAAE,~~qBAAqB;KAAC~~,~~EAC3C~~,~~kBAAkB~~,~~CAClB,~~CAAC;~~IACF~~,QAAQ,CAAC,cAAc,EAAE,CACxB,eAAe,EAAE,kBAAkB,GAAG,SAAS,EAC/C,OAAO,EAAE,qBAAqB,KAC1B,WAAW,CAAC;~~CACjB~~"}
1	+ {"version":3,"file":"helperTypes.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/helperTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EACX,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACX,mBAAmB,EACnB,0BAA0B,EAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EACX,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,aAAa,EACb,IAAI,EACJ,UAAU,EACV,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,kBAAkB,GAAG,IAAI,GAAG,gBAAgB,CAAC;AAEzD,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAC7C,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/D,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAE9C,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,iBAAiB,EAAE,UAAU,CACrC,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,CACrB,CAAC;IAEF,QAAQ,CAAC,gBAAgB,EAAE,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,KAC/B,OAAO,CAAC,UAAU,CAAC;IAExB,QAAQ,CAAC,gBAAgB,EAAE,CAC1B,OAAO,EAAE,OAAO,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,OAAO,EAAE,0BAA0B,KAC/B,UAAU,CAAC;IAEhB,QAAQ,CAAC,cAAc,EAAE,CACxB,eAAe,EAAE,kBAAkB,GAAG,SAAS,EAC/C,OAAO,EAAE,qBAAqB,KAC1B,WAAW,CAAC;IAEjB,QAAQ,CAAC,cAAc,EAAE,yBAAyB,CACjD,OAAO,CAAC,UAAU,EACP;QACV,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,YAAY,GAAG,SAAS;QAChC,OAAO,EAAE,0BAA0B;KACnC,EACD,UAAU,CACV,CAAC;CACF"}

package/dist/feature-libraries/sequence-field/helperTypes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helperTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/helperTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport type { DiscriminatedUnionLibrary, IJsonCodec } from \"../../codec/index.js\";\nimport type {\n\tChangeAtomId,\n\tChangeEncodingContext,\n\tEncodedRevisionTag,\n\tRevisionTag,\n} from \"../../core/index.js\";\nimport type { ~~EncodedChangeAtomId~~ } from \"../modular-schema/index.js\";\n\nimport type {\n\~~tAttachAndDetach~~,\n\tCellId,\n\tCellMark,\n\tDetach,\n\tHasMarkFields,\n\tMark,\n\~~tMoveIn~~,\n~~\tMoveOut,\n~~} from \"./types.js\";\n\nexport type EmptyInputCellMark = Mark & DetachedCellMark;\n\nexport interface DetachedCellMark extends HasMarkFields {\n\tcellId: CellId;\n}\n\nexport type EmptyOutputCellMark = CellMark<Detach ~~\| AttachAndDetach~~>;\n\nexport type MoveMarkEffect = ~~MoveOut~~ \| ~~MoveIn~~;\nexport type DetachOfRemovedNodes = Detach & { cellId: CellId };\nexport type CellRename = ~~AttachAndDetach \|~~ DetachOfRemovedNodes;\n\nexport interface SequenceCodecHelpers~~<TDecodedMarkEffect,~~ ~~TEncodedMarkEffect extends object>~~ {\n\treadonly changeAtomIdCodec: IJsonCodec<\n\t\tChangeAtomId,\n\t\tEncodedChangeAtomId,\n\t\tEncodedChangeAtomId,\n\t\tChangeEncodingContext\n\t>;\n\treadonly ~~markEffectCodec~~: ~~IJsonCodec<\~~n\t\~~tTDecodedMarkEffect~~,\n\t\~~tTEncodedMarkEffect~~,\n\t\~~tTEncodedMarkEffect,\~~n\t\~~tChangeEncodingContext\~~n\t~~>;\n~~\~~treadonly decoderLibrary~~: ~~DiscriminatedUnionLibrary<\~~n\t\~~tTEncodedMarkEffect~~,\n\t\t/ ~~args~~ */ ~~[context: ChangeEncodingContext]~~,\n\t\~~tTDecodedMarkEffect\~~n\t~~>;\~~n\treadonly decodeRevision: (\n\t\tencodedRevision: EncodedRevisionTag \| undefined,\n\t\tcontext: ChangeEncodingContext,\n\t) => RevisionTag;\n}\n"]}
1	+ {"version":3,"file":"helperTypes.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/helperTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport type { DiscriminatedUnionLibrary, IJsonCodec } from \"../../codec/index.js\";\nimport type {\n\tChangeAtomId,\n\tChangeEncodingContext,\n\tEncodedRevisionTag,\n\tRevisionTag,\n} from \"../../core/index.js\";\nimport type {\n\tEncodedChangeAtomId,\n\tFieldChangeEncodingContext,\n} from \"../modular-schema/index.js\";\nimport type { Encoded } from \"./formatV2.js\";\n\nimport type {\n\tAttach,\n\tCellId,\n\tCellMark,\n\tDetach,\n\tHasMarkFields,\n\tMark,\n\tMarkEffect,\n} from \"./types.js\";\n\nexport type EmptyInputCellMark = Mark & DetachedCellMark;\n\nexport interface DetachedCellMark extends HasMarkFields {\n\tcellId: CellId;\n}\n\nexport type EmptyOutputCellMark = CellMark<Detach>;\n\nexport type MoveMarkEffect = Attach \| Detach;\nexport type DetachOfRemovedNodes = Detach & { cellId: CellId };\nexport type CellRename = DetachOfRemovedNodes;\n\nexport interface SequenceCodecHelpers {\n\treadonly changeAtomIdCodec: IJsonCodec<\n\t\tChangeAtomId,\n\t\tEncodedChangeAtomId,\n\t\tEncodedChangeAtomId,\n\t\tChangeEncodingContext\n\t>;\n\n\treadonly encodeMarkEffect: (\n\t\tmark: Mark,\n\t\tcontext: FieldChangeEncodingContext,\n\t) => Encoded.MarkEffect;\n\n\treadonly decodeMarkEffect: (\n\t\tencoded: Encoded.MarkEffect,\n\t\tcount: number,\n\t\tcellId: ChangeAtomId \| undefined,\n\t\tcontext: FieldChangeEncodingContext,\n\t) => MarkEffect;\n\n\treadonly decodeRevision: (\n\t\tencodedRevision: EncodedRevisionTag \| undefined,\n\t\tcontext: ChangeEncodingContext,\n\t) => RevisionTag;\n\n\treadonly decoderLibrary: DiscriminatedUnionLibrary<\n\t\tEncoded.MarkEffect,\n\t\t/ args */ [\n\t\t\tcount: number,\n\t\t\tcellId: ChangeAtomId \| undefined,\n\t\t\tcontext: FieldChangeEncodingContext,\n\t\t],\n\t\tMarkEffect\n\t>;\n}\n"]}

package/dist/feature-libraries/sequence-field/index.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export type { Changeset, Remove, Detach, HasMoveId, HasRevisionTag, Insert, Mark, MarkList, MoveIn, MoveOut, CellCount as NodeCount, MoveId, Attach, NoopMark, CellId, HasMarkFields, CellMark, AttachAndDetach, Rename, } from "./types.js";
+export type { Changeset, Detach, HasMoveId, HasRevisionTag, Mark, MarkList, CellCount as NodeCount, MoveId, Attach, NoopMark, CellId, HasMarkFields, CellMark, Rename, } from "./types.js";
 export { DetachIdOverrideType } from "./formatV1.js";
 export { type SequenceFieldChangeHandler, sequenceFieldChangeHandler, } from "./sequenceFieldChangeHandler.js";
 export { type SequenceChangeRebaser, sequenceFieldChangeRebaser, } from "./sequenceFieldChangeRebaser.js";
@@ -14,6 +14,5 @@ export { rebase } from "./rebase.js";
 export { invert } from "./invert.js";
 export { compose } from "./compose.js";
 export { getInputLength, isDetach, cloneMark, extractMarkEffect, } from "./utils.js";
-export { isMoveMark, type MoveMark, type MoveEffectTable, type MoveEffect, } from "./moveEffectTable.js";
-export { relevantRemovedRoots } from "./relevantRemovedRoots.js";
+export { isMoveMark, type MoveMark, } from "./moveEffectTable.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/feature-libraries/sequence-field/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,YAAY,EACX,SAAS,EACT,MAAM,EACN,~~MAAM,EACN,~~SAAS,EACT,cAAc,EACd,~~MAAM,EACN,~~IAAI,EACJ,QAAQ,EACR,~~MAAM,EACN,OAAO,EACP,~~SAAS,IAAI,SAAS,EACtB,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,aAAa,EACb,QAAQ,EACR,~~eAAe,EACf,~~MAAM,GACN,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EACN,KAAK,0BAA0B,EAC/B,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACN,KAAK,qBAAqB,EAC1B,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,KAAK,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACN,cAAc,EACd,QAAQ,EACR,SAAS,EACT,iBAAiB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,UAAU,EACV,KAAK,QAAQ,~~EACb~~,~~KAAK,eAAe,EACpB,KAAK,UAAU,GACf,~~MAAM,sBAAsB,CAAC~~;AAE9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,YAAY,EACX,SAAS,EACT,MAAM,EACN,SAAS,EACT,cAAc,EACd,IAAI,EACJ,QAAQ,EACR,SAAS,IAAI,SAAS,EACtB,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,aAAa,EACb,QAAQ,EACR,MAAM,GACN,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EACN,KAAK,0BAA0B,EAC/B,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACN,KAAK,qBAAqB,EAC1B,0BAA0B,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,KAAK,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACN,cAAc,EACd,QAAQ,EACR,SAAS,EACT,iBAAiB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,UAAU,EACV,KAAK,QAAQ,GACb,MAAM,sBAAsB,CAAC"}

package/dist/feature-libraries/sequence-field/index.js CHANGED Viewed

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.relevantRemovedRoots = exports.isMoveMark = exports.extractMarkEffect = exports.cloneMark = exports.isDetach = exports.getInputLength = exports.compose = exports.invert = exports.rebase = exports.MarkListFactory = exports.sequenceFieldEditor = exports.sequenceFieldToDelta = exports.sequenceFieldChangeCodecFactory = exports.sequenceFieldChangeRebaser = exports.sequenceFieldChangeHandler = exports.DetachIdOverrideType = void 0;
+exports.isMoveMark = exports.extractMarkEffect = exports.cloneMark = exports.isDetach = exports.getInputLength = exports.compose = exports.invert = exports.rebase = exports.MarkListFactory = exports.sequenceFieldEditor = exports.sequenceFieldToDelta = exports.sequenceFieldChangeCodecFactory = exports.sequenceFieldChangeRebaser = exports.sequenceFieldChangeHandler = exports.DetachIdOverrideType = void 0;
 var formatV1_js_1 = require("./formatV1.js");
 Object.defineProperty(exports, "DetachIdOverrideType", { enumerable: true, get: function () { return formatV1_js_1.DetachIdOverrideType; } });
 var sequenceFieldChangeHandler_js_1 = require("./sequenceFieldChangeHandler.js");
@@ -32,6 +32,4 @@ Object.defineProperty(exports, "cloneMark", { enumerable: true, get: function ()
 Object.defineProperty(exports, "extractMarkEffect", { enumerable: true, get: function () { return utils_js_1.extractMarkEffect; } });
 var moveEffectTable_js_1 = require("./moveEffectTable.js");
 Object.defineProperty(exports, "isMoveMark", { enumerable: true, get: function () { return moveEffectTable_js_1.isMoveMark; } });
-var relevantRemovedRoots_js_1 = require("./relevantRemovedRoots.js");
-Object.defineProperty(exports, "relevantRemovedRoots", { enumerable: true, get: function () { return relevantRemovedRoots_js_1.relevantRemovedRoots; } });
 //# sourceMappingURL=index.js.map

package/dist/feature-libraries/sequence-field/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;~~AAuBH~~,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,iFAGyC;AADxC,2IAAA,0BAA0B,OAAA;AAE3B,iFAGyC;AADxC,2IAAA,0BAA0B,OAAA;AAE3B,mEAA2E;AAAlE,yIAAA,+BAA+B,OAAA;AACxC,qEAAiE;AAAxD,+HAAA,oBAAoB,OAAA;AAC7B,mEAAyF;AAAtD,6HAAA,mBAAmB,OAAA;AACtD,2DAAuD;AAA9C,qHAAA,eAAe,OAAA;AACxB,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,2CAAuC;AAA9B,qGAAA,OAAO,OAAA;AAChB,uCAKoB;AAJnB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA;AACR,qGAAA,SAAS,OAAA;AACT,6GAAA,iBAAiB,OAAA;AAElB,~~2DAK8B~~;~~AAJ7B~~,gHAAA,UAAU,OAAA~~;AAMX,qEAAiE;AAAxD,+HAAA,oBAAoB,OAAA~~","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport type {\n\tChangeset,\n\~~tRemove,\n\~~tDetach,\n\tHasMoveId,\n\tHasRevisionTag,\n\~~tInsert,\n\~~tMark,\n\tMarkList,\n\~~tMoveIn,\n\tMoveOut,\n\~~tCellCount as NodeCount,\n\tMoveId,\n\tAttach,\n\tNoopMark,\n\tCellId,\n\tHasMarkFields,\n\tCellMark,\n\~~tAttachAndDetach,\n\~~tRename,\n} from \"./types.js\";\nexport { DetachIdOverrideType } from \"./formatV1.js\";\nexport {\n\ttype SequenceFieldChangeHandler,\n\tsequenceFieldChangeHandler,\n} from \"./sequenceFieldChangeHandler.js\";\nexport {\n\ttype SequenceChangeRebaser,\n\tsequenceFieldChangeRebaser,\n} from \"./sequenceFieldChangeRebaser.js\";\nexport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nexport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nexport { type SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nexport { MarkListFactory } from \"./markListFactory.js\";\nexport { rebase } from \"./rebase.js\";\nexport { invert } from \"./invert.js\";\nexport { compose } from \"./compose.js\";\nexport {\n\tgetInputLength,\n\tisDetach,\n\tcloneMark,\n\textractMarkEffect,\n} from \"./utils.js\";\nexport {\n\tisMoveMark,\n\ttype MoveMark,\n~~\ttype MoveEffectTable,\n\ttype MoveEffect,\n~~} from \"./moveEffectTable.js\";\n~~\nexport { relevantRemovedRoots } from \~~"~~./relevantRemovedRoots.js\";\n"~~]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAkBH,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,iFAGyC;AADxC,2IAAA,0BAA0B,OAAA;AAE3B,iFAGyC;AADxC,2IAAA,0BAA0B,OAAA;AAE3B,mEAA2E;AAAlE,yIAAA,+BAA+B,OAAA;AACxC,qEAAiE;AAAxD,+HAAA,oBAAoB,OAAA;AAC7B,mEAAyF;AAAtD,6HAAA,mBAAmB,OAAA;AACtD,2DAAuD;AAA9C,qHAAA,eAAe,OAAA;AACxB,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,2CAAuC;AAA9B,qGAAA,OAAO,OAAA;AAChB,uCAKoB;AAJnB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA;AACR,qGAAA,SAAS,OAAA;AACT,6GAAA,iBAAiB,OAAA;AAElB,2DAG8B;AAF7B,gHAAA,UAAU,OAAA","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport type {\n\tChangeset,\n\tDetach,\n\tHasMoveId,\n\tHasRevisionTag,\n\tMark,\n\tMarkList,\n\tCellCount as NodeCount,\n\tMoveId,\n\tAttach,\n\tNoopMark,\n\tCellId,\n\tHasMarkFields,\n\tCellMark,\n\tRename,\n} from \"./types.js\";\nexport { DetachIdOverrideType } from \"./formatV1.js\";\nexport {\n\ttype SequenceFieldChangeHandler,\n\tsequenceFieldChangeHandler,\n} from \"./sequenceFieldChangeHandler.js\";\nexport {\n\ttype SequenceChangeRebaser,\n\tsequenceFieldChangeRebaser,\n} from \"./sequenceFieldChangeRebaser.js\";\nexport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nexport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nexport { type SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nexport { MarkListFactory } from \"./markListFactory.js\";\nexport { rebase } from \"./rebase.js\";\nexport { invert } from \"./invert.js\";\nexport { compose } from \"./compose.js\";\nexport {\n\tgetInputLength,\n\tisDetach,\n\tcloneMark,\n\textractMarkEffect,\n} from \"./utils.js\";\nexport {\n\tisMoveMark,\n\ttype MoveMark,\n} from \"./moveEffectTable.js\";\n"]}

package/dist/feature-libraries/sequence-field/invert.d.ts CHANGED Viewed

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 import type { RevisionTag } from "../../core/index.js";
-import { type IdAllocator } from "../../util/index.js";
-import { type CrossFieldManager } from "../modular-schema/index.js";
+import type { IdAllocator } from "../../util/index.js";
+import type { InvertNodeManager } from "../modular-schema/index.js";
 import { type Changeset } from "./types.js";
 /**
  * Inverts a given changeset.
@@ -18,5 +18,5 @@ import { type Changeset } from "./types.js";
  * WARNING! This implementation is incomplete:
  * - Support for slices is not implemented.
  */
-export declare function invert(change: Changeset, isRollback: boolean, genId: IdAllocator, revision: RevisionTag | undefined, crossFieldManager: CrossFieldManager): Changeset;
+export declare function invert(change: Changeset, isRollback: boolean, genId: IdAllocator, revision: RevisionTag | undefined, crossFieldManager: InvertNodeManager): Changeset;
 //# sourceMappingURL=invert.d.ts.map

package/dist/feature-libraries/sequence-field/invert.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"invert.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/invert.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,~~EAAE~~,WAAW,EAAE,MAAM,qBAAqB,CAAC;~~AACvD~~,OAAO,EAAE,~~KAAK,~~WAAW,~~EAA2B~~,MAAM,qBAAqB,CAAC;~~AAChF~~,OAAO,~~EACN,~~KAAK,iBAAiB,~~EAGtB~~,MAAM,4BAA4B,CAAC;~~AAGpC~~,OAAO,~~EAGN~~,KAAK,SAAS,~~EAWd~~,MAAM,YAAY,CAAC;~~AAepB~~;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CACrB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,iBAAiB,EAAE,iBAAiB,GAClC,SAAS,~~CAOX~~"}
1	+ {"version":3,"file":"invert.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/invert.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAgB,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAW,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAqB,iBAAiB,EAAU,MAAM,4BAA4B,CAAC;AAG/F,OAAO,EAIN,KAAK,SAAS,EAOd,MAAM,YAAY,CAAC;AAWpB;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CACrB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,iBAAiB,EAAE,iBAAiB,GAClC,SAAS,CAEX"}

package/dist/feature-libraries/sequence-field/invert.js CHANGED Viewed

@@ -6,8 +6,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invert = void 0;
 const internal_1 = require("@fluidframework/core-utils/internal");
-const index_js_1 = require("../../util/index.js");
-const index_js_2 = require("../modular-schema/index.js");
 const markListFactory_js_1 = require("./markListFactory.js");
 const types_js_1 = require("./types.js");
 const utils_js_1 = require("./utils.js");
@@ -48,191 +46,92 @@ function invertMark(mark, isRollback, crossFieldManager, revision) {
         case "Rename": {
             const inputId = (0, utils_js_1.getInputCellId)(mark);
             (0, internal_1.assert)(inputId !== undefined, 0x9f5 /* Rename mark must have cell ID */);
-            const inverse = {
-                type: "Rename",
-                count: mark.count,
-                cellId: mark.idOverride,
-                // Unlike a remove or move-out, which follow a node, there is no way for this mark to assign the original input cell ID to another cell.
-                // This means it should be safe to always restore the input cell ID (as opposed to only doing it on rollbacks).
-                // Despite that, we still only do it on rollback for the sake of consistency: once a cell has been assigned an ID,
-                // the only way for that cell to be assigned that ID again is if it is rolled back to that state.
-                idOverride: isRollback ? inputId : { localId: inputId.localId },
-            };
-            return [(0, utils_js_1.withNodeChange)(inverse, mark.changes)];
-        }
-        case "Remove": {
-            (0, internal_1.assert)(mark.revision !== undefined, 0x5a1 /* Unable to revert to undefined revision */);
-            const outputId = (0, utils_js_1.getOutputCellId)(mark);
-            const inputId = (0, utils_js_1.getInputCellId)(mark);
-            let inverse;
-            if (inputId === undefined) {
-                inverse = {
-                    type: "Insert",
-                    id: mark.id,
-                    cellId: outputId,
+            // In older client versions, the ID of a detached root was the same as the ID of the cell it was last detached from.
+            // To preserve compatibility with those versions, we must make sure that we do not rename the cell if we are not also
+            // renaming the associated detached root, if there is one.
+            if (isRollback) {
+                // A rollback inverse inverts any associated root rename, so we should also invert the cell rename.
+                const inverse = {
+                    type: "Rename",
                     count: mark.count,
-                    revision,
+                    cellId: mark.idOverride,
+                    // Unlike a remove or move-out, which follow a node, there is no way for this mark to assign the original input cell ID to another cell.
+                    // This means it should be safe to always restore the input cell ID (as opposed to only doing it on rollbacks).
+                    // Despite that, we still only do it on rollback for the sake of consistency: once a cell has been assigned an ID,
+                    // the only way for that cell to be assigned that ID again is if it is rolled back to that state.
+                    idOverride: inputId,
                 };
+                return [(0, utils_js_1.withNodeChange)(inverse, mark.changes)];
             }
             else {
-                inverse = {
-                    type: "Remove",
-                    id: mark.id,
-                    cellId: outputId,
-                    count: mark.count,
-                    revision,
-                };
-                if (isRollback) {
-                    inverse.idOverride = inputId;
-                }
+                // An undo does not invert root renames, so we should not invert cell renames.
+                return [invertNodeChangeOrSkip(mark.count, mark.changes, mark.idOverride)];
             }
-            return [(0, utils_js_1.withNodeChange)(inverse, mark.changes)];
         }
-        case "Insert": {
-            const inputId = (0, utils_js_1.getInputCellId)(mark);
-            (0, internal_1.assert)(inputId !== undefined, 0x80c /* Active inserts should target empty cells */);
-            const removeMark = {
-                type: "Remove",
-                count: mark.count,
-                id: inputId.localId,
-                revision,
-            };
-            if (isRollback) {
-                removeMark.idOverride = inputId;
-            }
-            const inverse = (0, utils_js_1.withNodeChange)(removeMark, mark.changes);
-            return [inverse];
-        }
-        case "MoveOut": {
-            if (mark.changes !== undefined) {
-                (0, internal_1.assert)(mark.count === 1, 0x6ed /* Mark with changes can only target a single cell */);
-                const endpoint = (0, utils_js_1.getEndpoint)(mark);
-                crossFieldManager.set(index_js_2.CrossFieldTarget.Destination, endpoint.revision, endpoint.localId, mark.count, mark.changes, true);
-            }
-            const cellId = (0, utils_js_1.getDetachOutputCellId)(mark) ?? {
-                revision: mark.revision ?? (0, internal_1.fail)(0xb2a /* Revision must be defined */),
-                localId: mark.id,
-            };
-            const moveIn = {
-                type: "MoveIn",
-                id: mark.id,
-                revision,
-            };
-            if (mark.finalEndpoint !== undefined) {
-                moveIn.finalEndpoint = {
-                    localId: mark.finalEndpoint.localId,
-                    revision: mark.revision,
-                };
-            }
-            let effect = moveIn;
-            const inputId = (0, utils_js_1.getInputCellId)(mark);
-            if (inputId !== undefined) {
-                const detach = {
-                    type: "Remove",
-                    id: mark.id,
-                    revision,
-                };
-                if (isRollback) {
-                    detach.idOverride = inputId;
-                }
-                effect = {
-                    type: "AttachAndDetach",
-                    attach: moveIn,
-                    detach,
-                };
-            }
-            return [{ ...effect, count: mark.count, cellId }];
-        }
-        case "MoveIn": {
+        case "Remove": {
+            (0, internal_1.assert)(mark.revision !== undefined, 0x5a1 /* Unable to revert to undefined revision */);
+            const outputId = (0, utils_js_1.getOutputCellId)(mark);
             const inputId = (0, utils_js_1.getInputCellId)(mark);
-            (0, internal_1.assert)(inputId !== undefined, 0x89e /* Active move-ins should target empty cells */);
-            const invertedMark = {
-                type: "MoveOut",
+            (0, internal_1.assert)(inputId === undefined, "Unexpected remove of detached node");
+            const attachId = { revision: isRollback ? mark.revision : revision, localId: mark.id };
+            crossFieldManager.invertDetach({ revision: mark.revision, localId: mark.id }, mark.count, mark.changes, attachId);
+            const inverse = {
+                type: "Insert",
                 id: mark.id,
+                cellId: outputId,
                 count: mark.count,
-                revision,
+                revision: attachId.revision,
             };
-            if (isRollback) {
-                invertedMark.idOverride = inputId;
-            }
-            if (mark.finalEndpoint) {
-                invertedMark.finalEndpoint = {
-                    localId: mark.finalEndpoint.localId,
-                    revision: mark.revision,
-                };
-            }
-            return applyMovedChanges(invertedMark, mark.revision, crossFieldManager);
+            return [inverse];
         }
-        case "AttachAndDetach": {
-            const attach = {
-                count: mark.count,
-                cellId: mark.cellId,
-                ...mark.attach,
-            };
-            const idAfterAttach = (0, utils_js_1.getOutputCellId)(attach);
-            // We put `mark.changes` on the detach so that if it is a move source
-            // the changes can be sent to the endpoint.
-            const detach = {
-                count: mark.count,
-                cellId: idAfterAttach,
-                changes: mark.changes,
-                ...mark.detach,
-            };
-            const attachInverses = invertMark(attach, isRollback, crossFieldManager, revision);
-            const detachInverses = invertMark(detach, isRollback, crossFieldManager, revision);
-            if (detachInverses.length === 0) {
-                return attachInverses;
-            }
-            (0, internal_1.assert)((0, index_js_1.hasSingle)(detachInverses), 0x80d /* Only expected MoveIn marks to be split when inverting */);
-            let detachInverse = detachInverses[0];
-            (0, internal_1.assert)((0, utils_js_1.isAttach)(detachInverse), 0x80e /* Inverse of a detach should be an attach */);
-            const inverses = [];
-            for (const attachInverse of attachInverses) {
-                let detachInverseCurr = detachInverse;
-                if (attachInverse.count !== detachInverse.count) {
-                    [detachInverseCurr, detachInverse] = (0, utils_js_1.splitMark)(detachInverse, attachInverse.count);
-                }
-                if (attachInverse.type === types_js_1.NoopMarkType) {
-                    if (attachInverse.changes !== undefined) {
-                        (0, internal_1.assert)(detachInverseCurr.changes === undefined, 0x80f /* Unexpected node changes */);
-                        detachInverseCurr.changes = attachInverse.changes;
-                    }
-                    inverses.push(detachInverseCurr);
-                    continue;
-                }
-                (0, internal_1.assert)((0, utils_js_1.isDetach)(attachInverse), 0x810 /* Inverse of an attach should be a detach */);
-                (0, internal_1.assert)(detachInverseCurr.cellId !== undefined, 0x9f6 /* Expected empty cell */);
-                const inverted = (0, utils_js_1.normalizeCellRename)(detachInverseCurr.cellId, attachInverse.count, (0, utils_js_1.extractMarkEffect)(detachInverseCurr), (0, utils_js_1.extractMarkEffect)(attachInverse));
-                if (detachInverse.changes !== undefined) {
-                    inverted.changes = detachInverse.changes;
-                }
-                if (attachInverse.changes !== undefined) {
-                    (0, internal_1.assert)(inverted.changes === undefined, 0x811 /* Unexpected node changes */);
-                    inverted.changes = attachInverse.changes;
-                }
-                inverses.push(inverted);
-            }
-            return inverses;
+        case "Insert": {
+            return invertInsert(mark, revision, crossFieldManager, isRollback);
         }
-        default:
+        default: {
             (0, internal_1.unreachableCase)(type);
+        }
     }
 }
-function applyMovedChanges(mark, revision, manager) {
-    // Although this is a source mark, we query the destination because this was a destination mark during the original invert pass.
-    const entry = manager.get(index_js_2.CrossFieldTarget.Destination, revision, mark.id, mark.count, true);
+function invertInsert(mark, revision, manager, isRollback) {
+    const entry = manager.invertAttach((0, utils_js_1.getAttachedRootId)(mark), mark.count);
     if (entry.length < mark.count) {
         const [mark1, mark2] = (0, utils_js_1.splitMark)(mark, entry.length);
-        const mark1WithChanges = entry.value !== undefined
-            ? (0, utils_js_1.withNodeChange)(mark1, entry.value)
-            : mark1;
-        return [mark1WithChanges, ...applyMovedChanges(mark2, revision, manager)];
+        return [
+            invertInsertSegment(mark1, revision, isRollback, entry.value),
+            ...invertInsert(mark2, revision, manager, isRollback),
+        ];
+    }
+    return [invertInsertSegment(mark, revision, isRollback, entry.value)];
+}
+function invertInsertSegment(mark, revision, isRollback, detachEntry) {
+    const inputId = (0, utils_js_1.getInputCellId)(mark);
+    (0, internal_1.assert)(inputId !== undefined, 0x80c /* Active inserts should target empty cells */);
+    const detachId = invertAttachId((0, utils_js_1.getAttachedRootId)(mark), revision, isRollback, detachEntry);
+    const removeMark = {
+        type: "Remove",
+        count: mark.count,
+        id: detachId.localId,
+        revision: detachId.revision,
+    };
+    if (isRollback && !(0, utils_js_1.areEqualCellIds)(inputId, detachId)) {
+        removeMark.cellRename = inputId;
+    }
+    if (detachEntry?.nodeChange !== undefined) {
+        removeMark.changes = detachEntry.nodeChange;
+    }
+    return removeMark;
+}
+function invertAttachId(attachId, revision, isRollback, detachEntry) {
+    if (!isRollback) {
+        return {
+            revision,
+            localId: attachId.localId,
+        };
     }
-    if (entry.value !== undefined) {
-        manager.onMoveIn(entry.value);
-        return [(0, utils_js_1.withNodeChange)(mark, entry.value)];
+    if (detachEntry?.detachId !== undefined) {
+        return detachEntry.detachId;
     }
-    return [mark];
+    return attachId;
 }
 function invertNodeChangeOrSkip(count, changes, cellId) {
     if (changes !== undefined) {