@remotion/studio-server 4.0.469 → 4.0.471

package/dist/preview-server/routes/reorder-effect.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reorderEffectHandler = void 0;
+const node_fs_1 = require("node:fs");
+const renderer_1 = require("@remotion/renderer");
+const reorder_effect_1 = require("../../codemods/reorder-effect");
+const file_watcher_1 = require("../../file-watcher");
+const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
+const format_log_file_location_1 = require("../format-log-file-location");
+const undo_stack_1 = require("../undo-stack");
+const formatting_1 = require("./log-updates/formatting");
+const log_update_1 = require("./log-updates/log-update");
+const reorderEffectHandler = async ({ input: { fileName, sequenceNodePath, fromIndex, toIndex, clientId }, remotionRoot, logLevel, }) => {
+    try {
+        renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[reorder-effect] Received request for fileName="${fileName}" fromIndex=${fromIndex} toIndex=${toIndex}`);
+        const { absolutePath, fileRelativeToRoot } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName,
+            action: 'modify',
+        });
+        const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
+        const { output, formatted, effectLabel, logLine } = await (0, reorder_effect_1.reorderEffect)({
+            input: fileContents,
+            sequenceNodePath: sequenceNodePath.nodePath,
+            fromIndex,
+            toIndex,
+        });
+        (0, undo_stack_1.pushToUndoStack)({
+            filePath: absolutePath,
+            oldContents: fileContents,
+            newContents: null,
+            logLevel,
+            remotionRoot,
+            logLine,
+            description: {
+                undoMessage: `↩️  Reordering of ${effectLabel}`,
+                redoMessage: `↪️  Reordering of ${effectLabel}`,
+            },
+            entryType: 'reorder-effect',
+            suppressHmrOnFileRestore: false,
+        });
+        (0, undo_stack_1.suppressUndoStackInvalidation)(absolutePath);
+        (0, file_watcher_1.writeFileAndNotifyFileWatchers)(absolutePath, output, clientId);
+        const locationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
+            remotionRoot,
+            absolutePath,
+            line: logLine,
+        });
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Reordered ${(0, formatting_1.attrName)(effectLabel)}`);
+        if (!formatted) {
+            (0, log_update_1.warnAboutPrettierOnce)(logLevel);
+        }
+        renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[reorder-effect] Wrote ${fileRelativeToRoot}${formatted ? ' (formatted)' : ''}`);
+        (0, undo_stack_1.printUndoHint)(logLevel);
+        return {
+            success: true,
+        };
+    }
+    catch (err) {
+        return {
+            success: false,
+            reason: err.message,
+            stack: err.stack,
+        };
+    }
+};
+exports.reorderEffectHandler = reorderEffectHandler;

package/dist/preview-server/routes/save-effect-props.js

@@ -65,6 +65,7 @@ const saveEffectPropsHandler = ({ input: { fileName, sequenceNodePath, effectInd
     (0, undo_stack_1.pushToUndoStack)({
         filePath: absolutePath,
         oldContents: fileContents,
+        newContents: null,
         logLevel,
         remotionRoot,
         logLine,

package/dist/preview-server/routes/save-sequence-props.js

@@ -14,87 +14,173 @@ const can_update_sequence_props_1 = require("./can-update-sequence-props");
 const format_prop_change_1 = require("./log-updates/format-prop-change");
 const log_update_1 = require("./log-updates/log-update");
 const save_props_mutex_1 = require("./save-props-mutex");
-const saveSequencePropsHandler = ({ input: { fileName, nodePath, key, value, defaultValue, schema, clientId }, remotionRoot, logLevel, }) => (0, save_props_mutex_1.withSavePropsLock)(async () => {
-    renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[save-sequence-props] Received request for fileName="${fileName}" key="${key}"`);
-    const { absolutePath, fileRelativeToRoot } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
-        remotionRoot,
-        fileName,
-        action: 'modify',
-    });
-    const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
-    const { output, oldValueStrings, formatted, logLine, removedProps } = await (0, update_sequence_props_1.updateSequenceProps)({
-        input: fileContents,
-        nodePath: nodePath.nodePath,
-        updates: [
-            {
-                key,
-                value: JSON.parse(value),
-                defaultValue: defaultValue !== null ? JSON.parse(defaultValue) : null,
-            },
-        ],
-        schema: no_react_1.NoReactInternals.sequenceSchema,
-    });
-    const oldValueString = oldValueStrings[0];
-    const newValueString = JSON.stringify(JSON.parse(value));
-    const parsedDefault = defaultValue !== null ? JSON.parse(defaultValue) : null;
-    const defaultValueString = parsedDefault !== null ? JSON.stringify(parsedDefault) : null;
-    const normalizedOld = (0, log_update_1.normalizeQuotes)(oldValueString);
-    const normalizedNew = (0, log_update_1.normalizeQuotes)(newValueString);
-    const normalizedDefault = defaultValueString !== null ? (0, log_update_1.normalizeQuotes)(defaultValueString) : null;
-    const undoPropChange = (0, format_prop_change_1.formatPropChange)({
-        key,
-        oldValueString: normalizedNew,
-        newValueString: normalizedOld,
-        defaultValueString: normalizedDefault,
-        removedProps: [],
-        addedProps: removedProps,
-    });
-    const redoPropChange = (0, format_prop_change_1.formatPropChange)({
-        key,
-        oldValueString: normalizedOld,
-        newValueString: normalizedNew,
-        defaultValueString: normalizedDefault,
-        removedProps,
-        addedProps: [],
-    });
-    (0, undo_stack_1.pushToUndoStack)({
-        filePath: absolutePath,
-        oldContents: fileContents,
+const saveSequencePropsHandler = ({ input: { edits, clientId, undoLabel, redoLabel }, remotionRoot, logLevel, }) => (0, save_props_mutex_1.withSavePropsLock)(async () => {
+    var _a;
+    if (edits.length === 0) {
+        throw new Error('No sequence prop edits to save');
+    }
+    renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[save-sequence-props] Received request with ${edits.length} edit(s)`);
+    const editGroups = new Map();
+    for (const [index, edit] of edits.entries()) {
+        const parsedValue = JSON.parse(edit.value);
+        const parsedDefaultValue = edit.defaultValue !== null ? JSON.parse(edit.defaultValue) : null;
+        const { absolutePath, fileRelativeToRoot } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName: edit.fileName,
+            action: 'modify',
+        });
+        const group = (_a = editGroups.get(absolutePath)) !== null && _a !== void 0 ? _a : {
+            fileRelativeToRoot,
+            edits: [],
+        };
+        group.edits.push({
+            index,
+            fileName: edit.fileName,
+            nodePath: edit.nodePath,
+            key: edit.key,
+            value: parsedValue,
+            valueString: JSON.stringify(parsedValue),
+            defaultValue: parsedDefaultValue,
+            defaultValueString: parsedDefaultValue !== null
+                ? JSON.stringify(parsedDefaultValue)
+                : null,
+            schema: edit.schema,
+        });
+        editGroups.set(absolutePath, group);
+    }
+    const snapshots = [];
+    const outputByPath = new Map();
+    const resultByIndex = new Map();
+    for (const [absolutePath, group] of editGroups) {
+        const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
+        const { output, formatted, results: updateResults, } = await (0, update_sequence_props_1.updateMultipleSequenceProps)({
+            input: fileContents,
+            changes: group.edits.map((edit) => {
+                return {
+                    nodePath: edit.nodePath.nodePath,
+                    updates: [
+                        {
+                            key: edit.key,
+                            value: edit.value,
+                            defaultValue: edit.defaultValue,
+                        },
+                    ],
+                    schema: no_react_1.NoReactInternals.sequenceSchema,
+                };
+            }),
+            prettierConfigOverride: null,
+        });
+        const [{ logLine: firstLogLine }] = updateResults;
+        outputByPath.set(absolutePath, output);
+        snapshots.push({
+            filePath: absolutePath,
+            oldContents: fileContents,
+            newContents: output,
+            logLine: firstLogLine,
+        });
+        for (const [resultIndex, result] of updateResults.entries()) {
+            const edit = group.edits[resultIndex];
+            resultByIndex.set(edit.index, {
+                oldValueString: result.oldValueStrings[0],
+                logLine: result.logLine,
+                removedProps: result.removedProps,
+                formatted,
+            });
+        }
+    }
+    const [firstEdit] = edits;
+    const firstResult = resultByIndex.get(0);
+    if (!firstResult) {
+        throw new Error('Could not compute sequence prop edit result');
+    }
+    const undoMessage = undoLabel !== null
+        ? `↩️  ${undoLabel}`
+        : edits.length === 1
+            ? `↩️  ${(0, format_prop_change_1.formatPropChange)({
+                key: firstEdit.key,
+                oldValueString: (0, log_update_1.normalizeQuotes)(JSON.stringify(JSON.parse(firstEdit.value))),
+                newValueString: (0, log_update_1.normalizeQuotes)(firstResult.oldValueString),
+                defaultValueString: firstEdit.defaultValue !== null
+                    ? (0, log_update_1.normalizeQuotes)(JSON.stringify(JSON.parse(firstEdit.defaultValue)))
+                    : null,
+                removedProps: [],
+                addedProps: firstResult.removedProps,
+            })}`
+            : '↩️  Update selected sequence props';
+    const redoMessage = redoLabel !== null
+        ? `↪️  ${redoLabel}`
+        : edits.length === 1
+            ? `↪️  ${(0, format_prop_change_1.formatPropChange)({
+                key: firstEdit.key,
+                oldValueString: (0, log_update_1.normalizeQuotes)(firstResult.oldValueString),
+                newValueString: (0, log_update_1.normalizeQuotes)(JSON.stringify(JSON.parse(firstEdit.value))),
+                defaultValueString: firstEdit.defaultValue !== null
+                    ? (0, log_update_1.normalizeQuotes)(JSON.stringify(JSON.parse(firstEdit.defaultValue)))
+                    : null,
+                removedProps: firstResult.removedProps,
+                addedProps: [],
+            })}`
+            : '↪️  Update selected sequence props';
+    (0, undo_stack_1.pushTransactionToUndoStack)({
+        snapshots,
         logLevel,
         remotionRoot,
-        logLine,
-        description: {
-            undoMessage: `↩️  ${undoPropChange}`,
-            redoMessage: `↪️  ${redoPropChange}`,
-        },
+        description: { undoMessage, redoMessage },
         entryType: 'sequence-props',
         suppressHmrOnFileRestore: true,
     });
-    (0, undo_stack_1.suppressUndoStackInvalidation)(absolutePath);
-    (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(absolutePath);
-    (0, file_watcher_1.writeFileAndNotifyFileWatchers)(absolutePath, output, clientId);
-    (0, log_update_1.logUpdate)({
-        fileRelativeToRoot,
-        line: logLine,
-        key,
-        oldValueString,
-        newValueString,
-        defaultValueString,
-        formatted,
-        logLevel,
-        removedProps,
-        addedProps: [],
-    });
+    for (const [absolutePath, output] of outputByPath) {
+        (0, undo_stack_1.suppressUndoStackInvalidation)(absolutePath);
+        (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(absolutePath);
+        (0, file_watcher_1.writeFileAndNotifyFileWatchers)(absolutePath, output, clientId);
+    }
+    for (const { edits: groupEdits, fileRelativeToRoot } of editGroups.values()) {
+        for (const edit of groupEdits) {
+            const result = resultByIndex.get(edit.index);
+            if (!result) {
+                throw new Error('Could not compute sequence prop edit result');
+            }
+            (0, log_update_1.logUpdate)({
+                fileRelativeToRoot,
+                line: result.logLine,
+                key: edit.key,
+                oldValueString: result.oldValueString,
+                newValueString: edit.valueString,
+                defaultValueString: edit.defaultValueString,
+                formatted: result.formatted,
+                logLevel,
+                removedProps: result.removedProps,
+                addedProps: [],
+            });
+        }
+    }
     (0, undo_stack_1.printUndoHint)(logLevel);
-    const newStatus = (0, can_update_sequence_props_1.computeSequencePropsStatusFromContent)({
-        fileContents: output,
-        keys: (0, studio_shared_1.getAllSchemaKeys)(schema),
-        nodePath: nodePath.nodePath,
-        effects: [],
+    const results = edits.map((edit) => {
+        const { absolutePath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName: edit.fileName,
+            action: 'modify',
+        });
+        const output = outputByPath.get(absolutePath);
+        if (!output) {
+            throw new Error('Could not compute sequence prop edit status');
+        }
+        const newStatus = (0, can_update_sequence_props_1.computeSequencePropsStatusFromContent)({
+            fileContents: output,
+            keys: (0, studio_shared_1.getAllSchemaKeys)(edit.schema),
+            nodePath: edit.nodePath.nodePath,
+            effects: [],
+        });
+        return {
+            fileName: edit.fileName,
+            nodePath: edit.nodePath,
+            props: newStatus.props,
+        };
     });
     return {
         canUpdate: true,
-        props: newStatus.props,
+        props: results[0].props,
+        results,
     };
 });
 exports.saveSequencePropsHandler = saveSequencePropsHandler;

package/dist/preview-server/routes/subscribe-to-sequence-props.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToSequenceProps = void 0;
 const sequence_props_watchers_1 = require("../sequence-props-watchers");
-const subscribeToSequenceProps = ({ input: { fileName, line, column, keys, effects, clientId }, remotionRoot, logLevel, }) => {
+const subscribeToSequenceProps = ({ input: { fileName, line, column, nodePath, keys, effects, clientId }, remotionRoot, logLevel, }) => {
     const result = (0, sequence_props_watchers_1.subscribeToSequencePropsWatchers)({
         fileName,
         line,
         column,
+        nodePath,
         keys,
         effects,
         remotionRoot,

package/dist/preview-server/routes/unregister-client-render.d.ts

@@ -0,0 +1,4 @@
+import type { ApiHandler } from '../api-types';
+export declare const unregisterClientRenderHandler: ApiHandler<{
+    id: string;
+}, void>;

package/dist/preview-server/routes/unregister-client-render.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unregisterClientRenderHandler = void 0;
+const client_render_queue_1 = require("../../client-render-queue");
+const validate_same_origin_1 = require("../validate-same-origin");
+const unregisterClientRenderHandler = ({ input: { id }, request, }) => {
+    (0, validate_same_origin_1.validateSameOrigin)(request);
+    (0, client_render_queue_1.removeCompletedClientRender)(id);
+    return Promise.resolve();
+};
+exports.unregisterClientRenderHandler = unregisterClientRenderHandler;

package/dist/preview-server/routes/update-default-props.js

@@ -33,6 +33,7 @@ const updateDefaultPropsHandler = async ({ input: { compositionId, defaultProps,
         (0, undo_stack_1.pushToUndoStack)({
             filePath: projectInfo.rootFile,
             oldContents: fileContents,
+            newContents: null,
             logLevel,
             remotionRoot,
             logLine,

package/dist/preview-server/sequence-props-watchers.d.ts

@@ -1,9 +1,10 @@
 import { type SubscribeToSequencePropsResponse } from '@remotion/studio-shared';
 import type { SequenceNodePath } from 'remotion';
-export declare const subscribeToSequencePropsWatchers: ({ fileName, line, column, keys, effects, remotionRoot, clientId, logLevel, }: {
+export declare const subscribeToSequencePropsWatchers: ({ fileName, line, column, nodePath: preferredNodePath, keys, effects, remotionRoot, clientId, logLevel, }: {
     fileName: string;
     line: number;
     column: number;
+    nodePath: SequenceNodePath | null;
     keys: string[];
     effects: string[][];
     remotionRoot: string;

package/dist/preview-server/sequence-props-watchers.js

@@ -13,7 +13,26 @@ const live_events_1 = require("./live-events");
 const node_path_cache_1 = require("./node-path-cache");
 const can_update_sequence_props_1 = require("./routes/can-update-sequence-props");
 const sequencePropsWatchers = {};
-const getSequencePropsStatus = ({ fileName, line, column, keys, effects, remotionRoot, logLevel, }) => {
+const getSequencePropsStatus = ({ fileName, line, column, preferredNodePath, keys, effects, remotionRoot, logLevel, }) => {
+    if (preferredNodePath) {
+        const fromNodePath = (0, can_update_sequence_props_1.computeSequencePropsStatus)({
+            fileName,
+            nodePath: preferredNodePath,
+            keys,
+            effects,
+            remotionRoot,
+        });
+        return {
+            status: fromNodePath,
+            nodePath: {
+                absolutePath: node_path_1.default.resolve(remotionRoot, fileName),
+                nodePath: preferredNodePath,
+                sequenceKeys: keys,
+                effectKeys: effects,
+            },
+            success: true,
+        };
+    }
     // Try cached nodePath first (handles stale source maps after suppressed rebuilds)
     const cachedNodePath = (0, node_path_cache_1.getCachedNodePath)(fileName, line, column);
     if (cachedNodePath) {
@@ -47,12 +66,13 @@ const getSequencePropsStatus = ({ fileName, line, column, keys, effects, remotio
     });
     return status;
 };
-const subscribeToSequencePropsWatchers = ({ fileName, line, column, keys, effects, remotionRoot, clientId, logLevel, }) => {
+const subscribeToSequencePropsWatchers = ({ fileName, line, column, nodePath: preferredNodePath, keys, effects, remotionRoot, clientId, logLevel, }) => {
     var _a;
     const initialResult = getSequencePropsStatus({
         fileName,
         line,
         column,
+        preferredNodePath,
         keys,
         effects,
         remotionRoot,

package/dist/preview-server/start-server.d.ts

@@ -38,6 +38,7 @@ export declare const startServer: (options: {
     binariesDirectory: string | null;
     forceIPv4: boolean;
     audioLatencyHint: AudioContextLatencyCategory | null;
+    previewSampleRate: number | null;
     enableCrossSiteIsolation: boolean;
     askAIEnabled: boolean;
     forceNew: boolean;

package/dist/preview-server/start-server.js

@@ -102,6 +102,7 @@ const startServer = async (options) => {
                 gitSource: options.gitSource,
                 binariesDirectory: options.binariesDirectory,
                 audioLatencyHint: options.audioLatencyHint,
+                previewSampleRate: options.previewSampleRate,
                 enableCrossSiteIsolation: options.enableCrossSiteIsolation,
             });
         })

package/dist/preview-server/undo-stack.d.ts

@@ -3,12 +3,19 @@ export interface UndoEntryDescription {
     undoMessage: string;
     redoMessage: string;
 }
-type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'delete-effect' | 'delete-jsx-node' | 'duplicate-jsx-node' | 'delete-composition' | 'rename-composition' | 'duplicate-composition';
-type UndoEntry = {
+type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'keyframe-delete' | 'add-effect' | 'delete-effect' | 'reorder-effect' | 'delete-jsx-node' | 'duplicate-jsx-node' | 'insert-jsx-element' | 'delete-composition' | 'rename-composition' | 'duplicate-composition';
+type UndoEntrySnapshot = {
     filePath: string;
     oldContents: string;
+    newContents: string | null;
+    /** 1-based source line for terminal/IDE file links (e.g. path:line). */
+    logLine: number;
+};
+type UndoEntry = {
+    filePath: string;
     /** 1-based source line for terminal/IDE file links (e.g. path:line). */
     logLine: number;
+    snapshots: UndoEntrySnapshot[];
     description: UndoEntryDescription;
     /** When true, undo/redo file restores call `suppressBundlerUpdateForFile` (skip HMR refresh). */
     suppressHmrOnFileRestore: boolean;
@@ -20,12 +27,20 @@ type UndoEntry = {
     entryType: 'sequence-props';
 } | {
     entryType: 'effect-props';
+} | {
+    entryType: 'keyframe-delete';
+} | {
+    entryType: 'add-effect';
 } | {
     entryType: 'delete-effect';
+} | {
+    entryType: 'reorder-effect';
 } | {
     entryType: 'delete-jsx-node';
 } | {
     entryType: 'duplicate-jsx-node';
+} | {
+    entryType: 'insert-jsx-element';
 } | {
     entryType: 'delete-composition';
 } | {
@@ -33,9 +48,10 @@ type UndoEntry = {
 } | {
     entryType: 'duplicate-composition';
 });
-export declare function pushToUndoStack({ filePath, oldContents, logLevel, remotionRoot, logLine, description, entryType, suppressHmrOnFileRestore }: {
+export declare function pushToUndoStack({ filePath, oldContents, newContents, logLevel, remotionRoot, logLine, description, entryType, suppressHmrOnFileRestore }: {
     filePath: string;
     oldContents: string;
+    newContents: string | null;
     logLevel: LogLevel;
     remotionRoot: string;
     logLine: number;
@@ -43,10 +59,24 @@ export declare function pushToUndoStack({ filePath, oldContents, logLevel, remot
     entryType: UndoEntryType;
     suppressHmrOnFileRestore: boolean;
 }): void;
+export declare function pushTransactionToUndoStack({ snapshots, logLevel, remotionRoot, description, entryType, suppressHmrOnFileRestore }: {
+    snapshots: Array<{
+        filePath: string;
+        oldContents: string;
+        newContents: string | null;
+        logLine: number;
+    }>;
+    logLevel: LogLevel;
+    remotionRoot: string;
+    description: UndoEntryDescription;
+    entryType: UndoEntryType;
+    suppressHmrOnFileRestore: boolean;
+}): void;
 export declare function printUndoHint(logLevel: LogLevel): void;
-export declare function pushToRedoStack({ filePath, oldContents, logLine, description, entryType, suppressHmrOnFileRestore }: {
+export declare function pushToRedoStack({ filePath, oldContents, newContents, logLine, description, entryType, suppressHmrOnFileRestore }: {
     filePath: string;
     oldContents: string;
+    newContents: string | null;
     logLine: number;
     description: UndoEntryDescription;
     entryType: UndoEntryType;
@@ -67,4 +97,5 @@ export declare function popRedo(): {
 };
 export declare function getUndoStack(): readonly UndoEntry[];
 export declare function getRedoStack(): readonly UndoEntry[];
+export declare function clearUndoStackForTests(): void;
 export {};