@fluidframework/tree 2.90.0-378676 → 2.91.0

package/src/feature-libraries/sequence-field/replaceRevisions.ts

@@ -11,19 +11,23 @@ import {
 	type RevisionReplacer,
 	type RevisionTag,
 } from "../../core/index.js";
-import type { Mutable } from "../../util/index.js";
 
+import type { MoveMarkEffect } from "./helperTypes.js";
 import { MarkListFactory } from "./markListFactory.js";
 import {
-	type Attach,
 	type Changeset,
 	type Detach,
+	type HasMoveFields,
 	type HasMoveId,
 	type HasRevisionTag,
+	type Insert,
 	type Mark,
 	type MarkEffect,
 	NoopMarkType,
+	type Remove,
+	type Rename,
 } from "./types.js";
+import { isDetach, isRename } from "./utils.js";
 
 export function replaceRevisions(changeset: Changeset, replacer: RevisionReplacer): Changeset {
 	const updatedMarks = new MarkListFactory();
@@ -36,62 +40,84 @@ export function replaceRevisions(changeset: Changeset, replacer: RevisionReplace
 }
 
 function updateMark(mark: Mark, replacer: RevisionReplacer): Mark {
-	const updatedMark = { ...replaceEffectRevisions(mark, mark.count, replacer) };
+	const updatedMark = { ...updateEffect(mark, mark.count, replacer) };
 	if (mark.cellId !== undefined) {
 		updatedMark.cellId = replacer.getUpdatedAtomId(mark.cellId, mark.count);
 	}
 
 	if (mark.changes !== undefined) {
-		updatedMark.changes = replacer.getUpdatedAtomId(mark.changes, mark.count);
+		updatedMark.changes = replacer.getUpdatedAtomId(mark.changes);
 	}
 
 	return updatedMark;
 }
 
-function replaceEffectRevisions<TMark extends MarkEffect>(
-	mark: TMark,
+function updateEffect<TMark extends MarkEffect>(
+	input: TMark,
 	count: number,
 	replacer: RevisionReplacer,
 ): TMark {
+	const mark =
+		isDetach(input) || isRename(input) ? updateIdOverride(input, count, replacer) : input;
 	const type = mark.type;
 	switch (type) {
+		case "Rename":
 		case NoopMarkType: {
 			return mark;
 		}
-		case "Attach": {
-			return updateRevisionAndId(mark as TMark & Attach, count, replacer);
-		}
-
-		case "Detach": {
-			return replaceDetachRevisions<TMark & Detach>(mark as Detach & TMark, count, replacer);
-		}
-		case "Rename": {
+		case "AttachAndDetach": {
 			return {
 				...mark,
-				idOverride: replacer.getUpdatedAtomId(mark.idOverride, count),
+				attach: updateEffect(mark.attach, count, replacer),
+				detach: updateEffect(mark.detach, count, replacer),
 			};
 		}
+		case "MoveIn":
+		case "MoveOut": {
+			return updateMoveEffect<TMark & MoveMarkEffect>(
+				// For some reason, TypeScript is not able to infer that `mark` cannot be a `NoopMark` here.
+				mark as MoveMarkEffect,
+				count,
+				replacer,
+			);
+		}
+		case "Insert":
+		case "Remove": {
+			return updateRevisionAndId(mark as (TMark & Insert) | (TMark & Remove), count, replacer);
+		}
 		default: {
 			unreachableCase(type);
 		}
 	}
 }
 
-function replaceDetachRevisions<TDetach extends Detach>(
-	detach: TDetach,
+function updateIdOverride<TEffect extends Detach | Rename>(
+	effect: TEffect,
 	count: number,
 	replacer: RevisionReplacer,
-): TDetach {
-	const updated = updateRevisionAndId(detach, count, replacer) as Mutable<TDetach>;
-	if (updated.cellRename !== undefined) {
-		updated.cellRename = replacer.getUpdatedAtomId(updated.cellRename, count);
-	}
-
-	if (updated.detachCellId !== undefined) {
-		updated.detachCellId = replacer.getUpdatedAtomId(updated.detachCellId, count);
+): TEffect {
+	if (effect.idOverride === undefined) {
+		return effect;
 	}
+	const idOverride = replacer.getUpdatedAtomId(effect.idOverride, count);
+	return { ...effect, idOverride };
+}
 
-	return updated;
+function updateMoveEffect<TEffect extends HasMoveFields>(
+	effect: TEffect,
+	count: number,
+	replacer: RevisionReplacer,
+): TEffect {
+	return effect.finalEndpoint === undefined
+		? updateRevisionAndId(effect, count, replacer)
+		: updateRevisionAndId(
+				{
+					...effect,
+					finalEndpoint: replacer.getUpdatedAtomId(effect.finalEndpoint, count),
+				},
+				count,
+				replacer,
+			);
 }
 
 function updateRevisionAndId<T extends HasRevisionTag & HasMoveId>(

package/src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts

@@ -5,18 +5,13 @@
 
 import type { FieldChangeHandler } from "../modular-schema/index.js";
 
+import { relevantRemovedRoots } from "./relevantRemovedRoots.js";
 import { sequenceFieldChangeRebaser } from "./sequenceFieldChangeRebaser.js";
 import { sequenceFieldChangeCodecFactory } from "./sequenceFieldCodecs.js";
 import { type SequenceFieldEditor, sequenceFieldEditor } from "./sequenceFieldEditor.js";
 import { sequenceFieldToDelta } from "./sequenceFieldToDelta.js";
 import type { Changeset } from "./types.js";
-import {
-	createEmpty,
-	getCrossFieldKeys,
-	getDetachCellIds,
-	getNestedChanges,
-	isEmpty,
-} from "./utils.js";
+import { createEmpty, getCrossFieldKeys, getNestedChanges, isEmpty } from "./utils.js";
 
 export type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;
 
@@ -25,9 +20,9 @@ export const sequenceFieldChangeHandler: SequenceFieldChangeHandler = {
 	codecsFactory: sequenceFieldChangeCodecFactory,
 	editor: sequenceFieldEditor,
 	intoDelta: sequenceFieldToDelta,
+	relevantRemovedRoots,
 	isEmpty,
 	getNestedChanges,
 	createEmpty,
 	getCrossFieldKeys,
-	getDetachCellIds,
 };