@remotion/studio-server 4.0.527 → 4.0.529

package/dist/preview-server/hot-middleware/index.js

@@ -49,52 +49,19 @@ const setupWebpackHmr = (compiler, logLevel, liveEventsServer) => {
 };
 exports.setupWebpackHmr = setupWebpackHmr;
 function publishStats(action, statsResult, publishHmr) {
-    const stats = statsResult.toJson({
-        all: false,
-        cached: true,
-        children: true,
-        modules: true,
-        timings: true,
-        hash: true,
-    });
-    // For multi-compiler, stats will be an object with a 'children' array of stats
-    const bundles = extractBundles(stats);
-    bundles.forEach((_stats) => {
-        let name = _stats.name || '';
-        // Fallback to compilation name in case of 1 bundle (if it exists)
-        if (bundles.length === 1 && !name && statsResult.compilation) {
-            name = statsResult.compilation.name || '';
-        }
-        publishHmr({
-            name,
-            action,
-            time: _stats.time,
-            hash: _stats.hash,
-            warnings: _stats.warnings || [],
-            errors: _stats.errors || [],
-            modules: buildModuleMap(_stats.modules),
-        });
-    });
-}
-function extractBundles(stats) {
     var _a;
-    // Stats has modules, single bundle
-    if (stats.modules)
-        return [stats];
-    // Stats has children, multiple bundles
-    if ((_a = stats.children) === null || _a === void 0 ? void 0 : _a.length)
-        return stats.children;
-    // Not sure, assume single
-    return [stats];
-}
-function buildModuleMap(modules) {
-    const map = {};
-    if (!modules) {
-        return map;
-    }
-    modules.forEach((module) => {
-        const id = module.id;
-        map[id] = module.name;
+    // Studio uses a single compiler. Child compilations must not replace the
+    // parent compilation's hash in the HMR message.
+    publishHmr({
+        name: (_a = statsResult.compilation.name) !== null && _a !== void 0 ? _a : '',
+        action,
+        time: statsResult.endTime - statsResult.startTime,
+        hash: statsResult.hash,
+        // Build diagnostics are printed by the dev middleware.
+        warnings: [],
+        errors: [],
+        // Module names only label browser console messages. The client already
+        // falls back to module IDs, which are named in development builds.
+        modules: {},
     });
-    return map;
 }

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

@@ -11,10 +11,12 @@ const undo_stack_1 = require("../undo-stack");
 const formatting_1 = require("./log-updates/formatting");
 const log_update_1 = require("./log-updates/log-update");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const { addEffect } = codemods_1.CodemodsInternals;
-const addEffectHandler = ({ input: { fileName, sequenceNodePath, effectName, effectImportPath, effectConfig, clientId, }, remotionRoot, logLevel, }) => {
+const addEffectHandler = ({ input: request, remotionRoot, logLevel }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+        var _a;
+        var _b;
         try {
+            const { fileName, sequenceNodePath, effectName, effectImportPath, effectConfig, clientId, } = request;
             renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[add-effect] Received request for fileName="${fileName}" effect="${effectName}"`);
             const { absolutePath, fileRelativeToRoot } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
                 remotionRoot,
@@ -22,13 +24,15 @@ const addEffectHandler = ({ input: { fileName, sequenceNodePath, effectName, eff
                 action: 'modify',
             });
             const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
-            const { output, formatted, effectLabel, nodeLabel, logLine } = await addEffect({
-                input: fileContents,
-                sequenceNodePath: sequenceNodePath.nodePath,
-                effectName,
-                effectImportPath,
-                effectConfig,
+            const result = await (0, codemods_1.addEffect)({
+                project: { files: { [absolutePath]: fileContents }, rootDir: remotionRoot },
+                node: { filePath: absolutePath, nodePath: sequenceNodePath.nodePath },
+                importName: effectName,
+                importPath: effectImportPath,
+                props: effectConfig,
             });
+            const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
+            const { formatted, effectLabel, nodeLabel, logLine } = result.editDetails[0];
             (0, undo_stack_1.pushToUndoStack)({
                 filePath: absolutePath,
                 oldContents: fileContents,
@@ -64,6 +68,10 @@ const addEffectHandler = ({ input: { fileName, sequenceNodePath, effectName, eff
             (0, undo_stack_1.printUndoHint)(logLevel);
             return {
                 success: true,
+                insertedEffect: {
+                    effectIndex: result.insertedEffect.effectIndex,
+                    nodePath: result.insertedEffect.nodePath,
+                },
             };
         }
         catch (err) {

package/dist/preview-server/routes/apply-codemod.d.ts

@@ -1,23 +1,4 @@
 import type { ApplyCodemodRequest, ApplyCodemodResponse } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
-export declare const formatNewCompositionFile: (codemod: {
-    type: "new-composition";
-    newId: string;
-    componentName: string;
-    componentImportPath: string;
-    folderName: string | null;
-    parentName: string | null;
-    newHeight: number;
-    newWidth: number;
-    newFps: number;
-    newDurationInFrames: number;
-    canvasCapture: {
-        readonly videoFileName: string;
-        readonly videoHeight: number;
-        readonly videoWidth: number;
-        readonly keyframeFps: number;
-        readonly data: import("@remotion/studio-shared").CanvasCaptureData;
-    } | null;
-}) => string;
 export declare const getCodemodLogMessage: (codemod: import("@remotion/studio-shared").RecastCodemod) => string;
 export declare const applyCodemodHandler: ApiHandler<ApplyCodemodRequest, ApplyCodemodResponse>;

package/dist/preview-server/routes/apply-codemod.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyCodemodHandler = exports.getCodemodLogMessage = exports.formatNewCompositionFile = void 0;
+exports.applyCodemodHandler = exports.getCodemodLogMessage = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const codemods_1 = require("@remotion/codemods");
@@ -15,9 +15,7 @@ const project_info_1 = require("../project-info");
 const undo_stack_1 = require("../undo-stack");
 const can_update_default_props_1 = require("./can-update-default-props");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const { makeNewCompositionComponentSource, simpleDiff } = codemods_1.CodemodsInternals;
-const formatNewCompositionFile = (codemod) => makeNewCompositionComponentSource(codemod);
-exports.formatNewCompositionFile = formatNewCompositionFile;
+const { simpleDiff } = codemods_1.CodemodsInternals;
 const getFolderPath = (parentName, folderName) => {
     return parentName ? `${parentName}/${folderName}` : folderName;
 };
@@ -40,12 +38,6 @@ const getCodemodLogMessage = (codemod) => {
     if (codemod.type === 'delete-composition') {
         return `Deleted composition "${codemod.idToDelete}"`;
     }
-    if (codemod.type === 'move-composition-to-folder') {
-        const destination = codemod.folderName
-            ? `into folder "${getFolderPath(codemod.parentName, codemod.folderName)}"`
-            : 'to root';
-        return `Moved composition "${codemod.idToMove}" ${destination}`;
-    }
     if (codemod.type === 'move-composition-or-folder') {
         const source = codemod.source.type === 'composition'
             ? `composition "${codemod.source.compositionId}"`
@@ -103,17 +95,6 @@ const getCodemodUndoDescription = (codemod) => {
             entryType: codemod.type,
         };
     }
-    if (codemod.type === 'move-composition-to-folder') {
-        const destination = codemod.folderName === null
-            ? 'to root'
-            : `into folder "${getFolderPath(codemod.parentName, codemod.folderName)}"`;
-        const label = `composition "${codemod.idToMove}" ${destination}`;
-        return {
-            undoMessage: `↩️  Move of ${label}`,
-            redoMessage: `↪️  Move of ${label}`,
-            entryType: codemod.type,
-        };
-    }
     if (codemod.type === 'move-composition-or-folder') {
         const label = codemod.source.type === 'composition'
             ? `composition "${codemod.source.compositionId}"`
@@ -165,9 +146,10 @@ const getCodemodUndoDescription = (codemod) => {
 };
 const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack, undoRedoNavigation }, logLevel, remotionRoot, entryPoint, }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
-        var _a;
+        var _a, _b;
+        var _c, _d, _e;
         try {
-            const logLine = (_a = symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalLineNumber) !== null && _a !== void 0 ? _a : 1;
+            const logLine = (_c = symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalLineNumber) !== null && _c !== void 0 ? _c : 1;
             const filePath = symbolicatedStack
                 ? (0, apply_codemod_to_file_1.resolveFilePathFromSymbolicatedStack)(remotionRoot, symbolicatedStack)
                 : (await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint)).rootFile;
@@ -184,15 +166,27 @@ const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack, undo
                 throw new Error(`Cannot create ${node_path_1.default.relative(remotionRoot, newCompositionComponentFilePath)} because it already exists`);
             }
             const input = (0, node_fs_1.readFileSync)(filePath, 'utf-8');
-            const formatted = await (0, apply_codemod_to_file_1.applyCodemodToFile)({
+            const result = await (0, apply_codemod_to_file_1.applyCodemodToFile)({
                 filePath,
                 codeMod: codemod,
             });
+            const formatted = (_d = (_a = result.changes.find((change) => change.filePath === filePath)) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _d !== void 0 ? _d : input;
             const diff = simpleDiff({
                 oldLines: input.split('\n'),
                 newLines: formatted.split('\n'),
             });
             if (!dryRun) {
+                if ((0, node_fs_1.readFileSync)(filePath, 'utf-8') !== input) {
+                    throw new Error(`Source changed before applying codemod: ${filePath}`);
+                }
+                for (const change of result.changes) {
+                    const currentContents = (0, node_fs_1.existsSync)(change.filePath)
+                        ? (0, node_fs_1.readFileSync)(change.filePath, 'utf-8')
+                        : null;
+                    if (currentContents !== change.previousContents) {
+                        throw new Error(`Source changed before applying codemod: ${change.filePath}`);
+                    }
+                }
                 const { entryType, undoMessage, redoMessage } = getCodemodUndoDescription(codemod);
                 const snapshots = [
                     {
@@ -210,7 +204,10 @@ const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack, undo
                     if (componentFilePath === null) {
                         throw new Error('Could not determine the new component file path');
                     }
-                    componentFileContents = await (0, exports.formatNewCompositionFile)(codemod);
+                    componentFileContents = (_e = (_b = result.changes.find((change) => change.filePath === componentFilePath)) === null || _b === void 0 ? void 0 : _b.nextContents) !== null && _e !== void 0 ? _e : null;
+                    if (componentFileContents === null) {
+                        throw new Error('Could not create the composition component');
+                    }
                     snapshots.push({
                         filePath: componentFilePath,
                         oldContents: null,

package/dist/preview-server/routes/apply-visual-control-change.js

@@ -1,44 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyVisualControlHandler = void 0;
 const node_fs_1 = require("node:fs");
 const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
-const recast = __importStar(require("recast"));
-const parse_ast_1 = require("../../codemods/parse-ast");
 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");
@@ -46,29 +11,10 @@ const live_events_1 = require("../live-events");
 const undo_stack_1 = require("../undo-stack");
 const watch_ignore_next_change_1 = require("../watch-ignore-next-change");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const { applyVisualControl } = codemods_1.CodemodsInternals;
-const getVisualControlChangeLine = (file, changeId) => {
-    let line = 1;
-    recast.types.visit(file.program, {
-        visitCallExpression(callPath) {
-            var _a;
-            var _b;
-            const { node } = callPath;
-            if (node.callee.type === 'Identifier' &&
-                node.callee.name === 'visualControl') {
-                const firstArg = node.arguments[0];
-                if ((firstArg === null || firstArg === void 0 ? void 0 : firstArg.type) === 'StringLiteral' && firstArg.value === changeId) {
-                    line = (_b = (_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line) !== null && _b !== void 0 ? _b : 1;
-                    return false;
-                }
-            }
-            this.traverse(callPath);
-        },
-    });
-    return line;
-};
 const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot, logLevel }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
+        var _a, _b;
+        var _c, _d;
         renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[apply-visual-control] Received request for ${fileName} with ${changes.length} changes`);
         const { absolutePath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
             remotionRoot,
@@ -76,16 +22,17 @@ const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot,
             action: 'apply visual control change to',
         });
         const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
-        const ast = (0, parse_ast_1.parseAst)(fileContents);
-        const logLine = changes.length > 0 ? getVisualControlChangeLine(ast, changes[0].id) : 1;
-        const { newContents: output, changesMade } = applyVisualControl({
-            input: fileContents,
-            transformation: {
-                type: 'apply-visual-control',
-                changes,
-            },
+        const result = (0, codemods_1.updateVisualControls)({
+            project: { rootDir: remotionRoot, files: { [absolutePath]: fileContents } },
+            filePath: absolutePath,
+            changes,
         });
-        if (changesMade.length === 0) {
+        const output = (_c = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _c !== void 0 ? _c : fileContents;
+        const logLine = (_d = (_b = result.updatedControls.findLast((control) => {
+            var _a;
+            return control.id === ((_a = changes[0]) === null || _a === void 0 ? void 0 : _a.id);
+        })) === null || _b === void 0 ? void 0 : _b.line) !== null && _d !== void 0 ? _d : 1;
+        if (result.updatedControls.length === 0) {
             throw new Error('No changes were made to the file');
         }
         (0, undo_stack_1.pushToUndoStack)({

package/dist/preview-server/routes/can-update-sequence-props.d.ts

@@ -2,7 +2,6 @@ import type { Expression, File, JSXElement, JSXOpeningElement } from '@babel/typ
 import type { SubscribeToSequencePropsResponse } from '@remotion/studio-shared';
 import type { CanUpdateSequencePropsResponseTrue, CanUpdateSequencePropStatus, SequenceNodePath, VideoConfigValues } from 'remotion';
 import { type VideoConfigIdentifierValues } from '../../helpers/video-config-values';
-export declare const takeCachedSequencePropsStatusAst: (fileContents: string) => File | null;
 type StaticValueOptions = {
     allowSpecialValues: boolean;
 };
@@ -41,15 +40,6 @@ export declare const resolveSequencePropsNodePathsFromFilename: ({ fileName, tar
     }[];
     remotionRoot: string;
 }) => (SequenceNodePath | null)[];
-export declare const computeSequencePropsStatusFromAst: ({ ast, nodePath, componentIdentity, keys, assetKeys, effects, videoConfigValues, }: {
-    ast: File;
-    nodePath: SequenceNodePath;
-    componentIdentity: string | null;
-    keys: string[];
-    assetKeys?: string[] | undefined;
-    effects: string[][];
-    videoConfigValues: VideoConfigValues | null;
-}) => CanUpdateSequencePropsResponseTrue;
 export declare const computeSequencePropsStatusFromContent: ({ fileContents, nodePath, componentIdentity, keys, assetKeys, effects, videoConfigValues, }: {
     fileContents: string;
     nodePath: SequenceNodePath;