fix: migrate commands to CommandResult selection contract

Author: mazeincoding

apps/web/src/lib/commands/base-command.ts

@@ -1,9 +1,23 @@
 import type { EditorSelectionPatch } from "@/lib/selection/editor-selection";
+import type { ElementRef } from "@/lib/timeline/types";
 
 export interface CommandResult {
 	selection?: EditorSelectionPatch;
 }
 
+export function createElementSelectionResult(
+	selectedElements: ElementRef[],
+): CommandResult {
+	return {
+		selection: {
+			selectedElements,
+			selectedKeyframes: [],
+			keyframeSelectionAnchor: null,
+			selectedMaskPoints: null,
+		},
+	};
+}
+
 export abstract class Command {
 	abstract execute(): CommandResult | undefined;
 

apps/web/src/lib/commands/batch-command.ts

@@ -10,7 +10,7 @@ export class BatchCommand extends Command {
 
 		for (const command of this.commands) {
 			const result = command.execute();
-			if (result?.select !== undefined) {
+			if (result?.selection !== undefined) {
 				latestSelectionResult = result;
 			}
 		}
@@ -29,7 +29,7 @@ export class BatchCommand extends Command {
 
 		for (const command of this.commands) {
 			const result = command.redo();
-			if (result?.select !== undefined) {
+			if (result?.selection !== undefined) {
 				latestSelectionResult = result;
 			}
 		}

apps/web/src/lib/commands/timeline/clipboard/paste.ts

@@ -1,9 +1,17 @@
-import { Command, type CommandResult } from "@/lib/commands/base-command";
+import {
+	Command,
+	createElementSelectionResult,
+	type CommandResult,
+} from "@/lib/commands/base-command";
 import { EditorCore } from "@/core";
 import type { SceneTracks, TimelineElement } from "@/lib/timeline";
 import type { ElementClipboardItem } from "@/lib/clipboard";
 import { generateUUID } from "@/utils/id";
-import { applyPlacement, resolveTrackPlacement, enforceMainTrackStart } from "@/lib/timeline/placement";
+import {
+	applyPlacement,
+	resolveTrackPlacement,
+	enforceMainTrackStart,
+} from "@/lib/timeline/placement";
 import { cloneAnimations } from "@/lib/animation";
 
 export class PasteCommand extends Command {
@@ -122,7 +130,7 @@ export class PasteCommand extends Command {
 		editor.timeline.updateTracks(updatedTracks);
 
 		if (this.pastedElements.length > 0) {
-			return { select: this.pastedElements };
+			return createElementSelectionResult(this.pastedElements);
 		}
 		return undefined;
 	}
@@ -183,4 +191,3 @@ function buildPastedElements({
 
 	return elementsToAdd;
 }
-

apps/web/src/lib/commands/timeline/element/duplicate-elements.ts

@@ -1,8 +1,15 @@
-import { Command, type CommandResult } from "@/lib/commands/base-command";
+import {
+	Command,
+	createElementSelectionResult,
+	type CommandResult,
+} from "@/lib/commands/base-command";
 import type { SceneTracks, TimelineElement } from "@/lib/timeline";
 import { generateUUID } from "@/utils/id";
 import { EditorCore } from "@/core";
-import { applyPlacement, resolveTrackPlacement } from "@/lib/timeline/placement";
+import {
+	applyPlacement,
+	resolveTrackPlacement,
+} from "@/lib/timeline/placement";
 import { cloneAnimations } from "@/lib/animation";
 
 interface DuplicateElementsParams {
@@ -91,9 +98,7 @@ export class DuplicateElementsCommand extends Command {
 		editor.timeline.updateTracks(updatedTracks);
 
 		if (this.duplicatedElements.length > 0) {
-			return {
-				select: this.duplicatedElements,
-			};
+			return createElementSelectionResult(this.duplicatedElements);
 		}
 		return undefined;
 	}

apps/web/src/lib/commands/timeline/element/move-elements.ts

@@ -1,4 +1,8 @@
-import { Command, type CommandResult } from "@/lib/commands/base-command";
+import {
+	Command,
+	createElementSelectionResult,
+	type CommandResult,
+} from "@/lib/commands/base-command";
 import { EditorCore } from "@/core";
 import type {
 	SceneTracks,
@@ -114,12 +118,12 @@ export class MoveElementCommand extends Command {
 		});
 
 		editor.timeline.updateTracks(updatedTracks);
-		return {
-			select: this.moves.map(({ elementId, targetTrackId }) => ({
+		return createElementSelectionResult(
+			this.moves.map(({ elementId, targetTrackId }) => ({
 				trackId: targetTrackId,
 				elementId,
 			})),
-		};
+		);
 	}
 
 	undo(): void {

apps/web/src/lib/commands/timeline/element/split-elements.ts

@@ -1,4 +1,8 @@
-import { Command, type CommandResult } from "@/lib/commands/base-command";
+import {
+	Command,
+	createElementSelectionResult,
+	type CommandResult,
+} from "@/lib/commands/base-command";
 import type { SceneTracks, TimelineElement } from "@/lib/timeline";
 import { generateUUID } from "@/utils/id";
 import { EditorCore } from "@/core";
@@ -164,9 +168,7 @@ export class SplitElementsCommand extends Command {
 		editor.timeline.updateTracks(updatedTracks);
 
 		if (this.rightSideElements.length > 0) {
-			return {
-				select: this.rightSideElements,
-			};
+			return createElementSelectionResult(this.rightSideElements);
 		}
 		return undefined;
 	}