@remotion/studio-server 4.0.526 → 4.0.528

package/dist/preview-server/routes/{delete-jsx-node.js → delete-jsx-nodes.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteJsxNodeHandler = void 0;
+exports.deleteJsxNodesHandler = void 0;
 const node_fs_1 = require("node:fs");
+const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
-const delete_jsx_node_1 = require("../../codemods/delete-jsx-node");
 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");
@@ -17,19 +17,19 @@ const getDeletedNodeDescription = (nodeLabels) => {
     }
     return `${nodeLabels.length} JSX nodes`;
 };
-const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
+const deleteJsxNodesHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
         var _a;
         try {
             (0, hmr_timing_1.logHmrTiming)({
                 detail: null,
                 logLevel,
-                stage: 'delete-jsx-node-request-start',
+                stage: 'delete-jsx-nodes-request-start',
             });
             if (nodes.length === 0) {
                 throw new Error('No JSX nodes were specified for deletion');
             }
-            renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[delete-jsx-node] Received request to delete ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`);
+            renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[delete-jsx-nodes] Received request to delete ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`);
             const itemsByFileName = new Map();
             for (const item of nodes) {
                 const fileItems = (_a = itemsByFileName.get(item.fileName)) !== null && _a !== void 0 ? _a : [];
@@ -37,16 +37,27 @@ const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
                 itemsByFileName.set(item.fileName, fileItems);
             }
             const updates = await Promise.all([...itemsByFileName.entries()].map(async ([fileName, fileItems]) => {
+                var _a;
+                var _b;
                 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, nodeLabels, logLines, nodePathRemappings } = await (0, delete_jsx_node_1.deleteJsxNodes)({
-                    input: fileContents,
-                    nodePaths: fileItems.map((item) => item.nodePath),
+                const result = await (0, codemods_1.deleteJsxNodes)({
+                    project: {
+                        files: { [absolutePath]: fileContents },
+                        rootDir: remotionRoot,
+                    },
+                    nodes: fileItems.map((item) => ({
+                        filePath: absolutePath,
+                        nodePath: item.nodePath,
+                    })),
                 });
+                const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
+                const { nodeLabels, logLines } = result.editDetails[0];
+                const nodePathRemappings = result.nodePathRemappings.map(({ oldNodePath, newNodePath }) => ({ oldNodePath, newNodePath }));
                 return {
                     absolutePath,
                     fileRelativeToRoot,
@@ -60,7 +71,7 @@ const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
             (0, hmr_timing_1.logHmrTiming)({
                 detail: `files=${updates.length}`,
                 logLevel,
-                stage: 'delete-jsx-node-codemod-complete',
+                stage: 'delete-jsx-nodes-codemod-complete',
             });
             const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)(updates.map((update) => ({
                 absolutePath: update.absolutePath,
@@ -79,7 +90,7 @@ const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
                         undoMessage: `↩️  Deletion of ${deletedNodeDescription}`,
                         redoMessage: `↪️  Deletion of ${deletedNodeDescription}`,
                     },
-                    entryType: 'delete-jsx-node',
+                    entryType: 'delete-jsx-nodes',
                     suppressHmrOnFileRestore: false,
                     nodePathRemappings: update.nodePathRemappings,
                 });
@@ -106,7 +117,7 @@ const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
                     line: update.logLine,
                 });
                 renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Deleted ${deletedNodeDescription}`);
-                renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[delete-jsx-node] Wrote ${update.fileRelativeToRoot}`);
+                renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[delete-jsx-nodes] Wrote ${update.fileRelativeToRoot}`);
             }
             (0, undo_stack_1.printUndoHint)(logLevel);
             return {
@@ -123,4 +134,4 @@ const deleteJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
         }
     });
 };
-exports.deleteJsxNodeHandler = deleteJsxNodeHandler;
+exports.deleteJsxNodesHandler = deleteJsxNodesHandler;

package/dist/preview-server/routes/download-remote-asset.d.ts

@@ -1,4 +1,9 @@
 import { getRemoteAssetFilename, type DownloadRemoteAssetRequest, type DownloadRemoteAssetResponse } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
 export { getRemoteAssetFilename };
+export declare const downloadRemoteAssetBytes: ({ acceptHeader, maxSize, url, }: {
+    acceptHeader: string | null;
+    maxSize: number;
+    url: URL;
+}) => Promise<Uint8Array<ArrayBuffer>>;
 export declare const downloadRemoteAssetHandler: ApiHandler<DownloadRemoteAssetRequest, DownloadRemoteAssetResponse>;

package/dist/preview-server/routes/download-remote-asset.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.downloadRemoteAssetHandler = exports.getRemoteAssetFilename = void 0;
+exports.downloadRemoteAssetHandler = exports.downloadRemoteAssetBytes = exports.getRemoteAssetFilename = void 0;
 const promises_1 = require("node:dns/promises");
 const node_fs_1 = require("node:fs");
 const node_net_1 = require("node:net");
@@ -75,15 +75,13 @@ const ensureRemoteUrlIsAllowed = async (url) => {
         }
     }
 };
-const fetchRemoteAsset = async ({ signal, url, }) => {
+const fetchRemoteAsset = async ({ acceptHeader, signal, url, }) => {
     var _a;
     let currentUrl = url;
     for (let redirects = 0; redirects <= maxRemoteAssetRedirects; redirects++) {
         await ensureRemoteUrlIsAllowed(currentUrl);
         const response = await fetch(currentUrl, {
-            headers: {
-                accept: studio_shared_1.remoteAssetAcceptHeader,
-            },
+            headers: acceptHeader === null ? undefined : { accept: acceptHeader },
             redirect: 'manual',
             signal,
         });
@@ -102,15 +100,15 @@ const fetchRemoteAsset = async ({ signal, url, }) => {
     }
     throw new Error('Remote asset redirected too many times');
 };
-const readRemoteAsset = async ({ response, abort, }) => {
+const readRemoteAsset = async ({ response, abort, maxSize, }) => {
     const contentLength = response.headers.get('content-length');
-    if (contentLength !== null && Number(contentLength) > studio_shared_1.maxRemoteAssetSize) {
+    if (contentLength !== null && Number(contentLength) > maxSize) {
         abort();
         throw new Error('Remote asset exceeds the 50MB size limit');
     }
     if (!response.body) {
         const buffer = await response.arrayBuffer();
-        if (buffer.byteLength > studio_shared_1.maxRemoteAssetSize) {
+        if (buffer.byteLength > maxSize) {
             throw new Error('Remote asset exceeds the 50MB size limit');
         }
         return new Uint8Array(buffer);
@@ -127,7 +125,7 @@ const readRemoteAsset = async ({ response, abort, }) => {
             continue;
         }
         size += value.byteLength;
-        if (size > studio_shared_1.maxRemoteAssetSize) {
+        if (size > maxSize) {
             abort();
             await reader.cancel();
             throw new Error('Remote asset exceeds the 50MB size limit');
@@ -142,31 +140,25 @@ const readRemoteAsset = async ({ response, abort, }) => {
     }
     return result;
 };
-const downloadRemoteAssetHandler = async ({ input, publicDir, request }) => {
-    (0, validate_same_origin_1.validateSameOrigin)(request);
-    if (typeof input.url !== 'string') {
-        throw new Error('No `url` provided');
-    }
+const downloadRemoteAssetBytes = async ({ acceptHeader, maxSize, url, }) => {
     if (typeof fetch !== 'function') {
         throw new Error('Downloading remote assets requires Node.js 18 or newer. Drag a local file instead.');
     }
-    const url = new URL(input.url);
     const controller = new AbortController();
-    const timeout = setTimeout(() => {
-        controller.abort();
-    }, studio_shared_1.remoteAssetDownloadTimeout);
-    let contents;
+    const timeout = setTimeout(() => controller.abort(), studio_shared_1.remoteAssetDownloadTimeout);
     try {
         const response = await fetchRemoteAsset({
+            acceptHeader,
             signal: controller.signal,
             url,
         });
         if (!response.ok) {
             throw new Error(`Could not download remote asset: ${response.status}`);
         }
-        contents = await readRemoteAsset({
+        return await readRemoteAsset({
             response,
             abort: () => controller.abort(),
+            maxSize,
         });
     }
     catch (err) {
@@ -178,6 +170,19 @@ const downloadRemoteAssetHandler = async ({ input, publicDir, request }) => {
     finally {
         clearTimeout(timeout);
     }
+};
+exports.downloadRemoteAssetBytes = downloadRemoteAssetBytes;
+const downloadRemoteAssetHandler = async ({ input, publicDir, request }) => {
+    (0, validate_same_origin_1.validateSameOrigin)(request);
+    if (typeof input.url !== 'string') {
+        throw new Error('No `url` provided');
+    }
+    const url = new URL(input.url);
+    const contents = await (0, exports.downloadRemoteAssetBytes)({
+        acceptHeader: studio_shared_1.remoteAssetAcceptHeader,
+        maxSize: studio_shared_1.maxRemoteAssetSize,
+        url,
+    });
     const fileType = (0, studio_shared_1.detectFileType)(contents);
     if (!(0, studio_shared_1.isImageFileType)(fileType)) {
         throw new Error('Remote asset is not a supported image');

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.duplicateEffectHandler = void 0;
 const node_fs_1 = require("node:fs");
+const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
-const duplicate_effect_1 = require("../../codemods/duplicate-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");
@@ -32,19 +32,27 @@ const duplicateEffectHandler = ({ input: effects, remotionRoot, logLevel }) => {
                 itemsByFileName.set(item.fileName, fileItems);
             }
             const updates = await Promise.all([...itemsByFileName.entries()].map(async ([fileName, fileItems]) => {
+                var _a;
+                var _b;
                 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, effectLabels, logLines } = await (0, duplicate_effect_1.duplicateEffects)({
-                    input: fileContents,
+                const result = await (0, codemods_1.duplicateEffects)({
+                    project: {
+                        files: { [absolutePath]: fileContents },
+                        rootDir: remotionRoot,
+                    },
                     effects: fileItems.map((item) => ({
-                        sequenceNodePath: item.sequenceNodePath.nodePath,
+                        filePath: absolutePath,
+                        nodePath: item.sequenceNodePath.nodePath,
                         effectIndex: item.effectIndex,
                     })),
                 });
+                const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
+                const { formatted, effectLabels, logLines } = result.editDetails[0];
                 return {
                     absolutePath,
                     fileRelativeToRoot,

package/dist/preview-server/routes/duplicate-jsx-node.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.duplicateJsxNodeHandler = void 0;
 const node_fs_1 = require("node:fs");
+const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
-const studio_codemods_1 = require("@remotion/studio-codemods");
 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");
@@ -25,16 +25,27 @@ const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) =
                 itemsByFileName.set(item.fileName, fileItems);
             }
             const updates = await Promise.all([...itemsByFileName.entries()].map(async ([fileName, fileItems]) => {
+                var _a;
+                var _b;
                 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, nodeLabels, logLines, nodePathRemappings } = await (0, studio_codemods_1.duplicateJsxNodes)({
-                    input: fileContents,
-                    nodePaths: fileItems.map((item) => item.nodePath),
+                const result = await (0, codemods_1.duplicateJsxNodes)({
+                    project: {
+                        files: { [absolutePath]: fileContents },
+                        rootDir: remotionRoot,
+                    },
+                    nodes: fileItems.map((item) => ({
+                        filePath: absolutePath,
+                        nodePath: item.nodePath,
+                    })),
                 });
+                const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
+                const { nodeLabels, logLines } = result.editDetails[0];
+                const nodePathRemappings = result.nodePathRemappings.map(({ oldNodePath, newNodePath }) => ({ oldNodePath, newNodePath }));
                 return {
                     absolutePath,
                     fileRelativeToRoot,

package/dist/preview-server/routes/element-install-plan.d.ts

@@ -18,7 +18,7 @@ export declare const getElementInstallPlan: ({ destination, element, installatio
     expectedFileState: ElementInstallExpectedFileState;
     filePath: string;
     importPath: string;
-    location: import("@remotion/studio-codemods").ResolvedCompositionComponentWithFile | null;
+    location: import("@remotion/codemods").ResolvedCompositionComponentWithFile | null;
     safePaths: {
         compositionFileName: string;
         elementFileName: string;

package/dist/preview-server/routes/find-in-file.d.ts

@@ -1,4 +1,12 @@
 import type { FindInFileRequest, FindInFileResponse } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
-export { findSearchPosition } from '@remotion/studio-codemods';
+export declare const findSearchPosition: ({ contents, lineNumber, columnNumber, search, }: {
+    contents: string;
+    lineNumber: number;
+    columnNumber: number;
+    search: string;
+}) => {
+    lineNumber: number;
+    columnNumber: number;
+};
 export declare const findInFileHandler: ApiHandler<FindInFileRequest, FindInFileResponse>;

package/dist/preview-server/routes/find-in-file.js

@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findInFileHandler = exports.findSearchPosition = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const studio_codemods_1 = require("@remotion/studio-codemods");
-const studio_codemods_2 = require("@remotion/studio-codemods");
-Object.defineProperty(exports, "findSearchPosition", { enumerable: true, get: function () { return studio_codemods_2.findSearchPosition; } });
+const codemods_1 = require("@remotion/codemods");
+({ findSearchPosition: exports.findSearchPosition } = codemods_1.CodemodsInternals);
 const findInFileHandler = async ({ input, remotionRoot }) => {
     const { fileName, lineNumber, columnNumber, search } = input;
     const contents = await node_fs_1.default.promises.readFile(node_path_1.default.resolve(remotionRoot, fileName), 'utf-8');
-    return (0, studio_codemods_1.findSearchPosition)({
+    return (0, exports.findSearchPosition)({
         contents,
         lineNumber,
         columnNumber,

package/dist/preview-server/routes/insert-basic-captions.d.ts

@@ -0,0 +1,3 @@
+import type { InsertBasicCaptionsRequest, InsertBasicCaptionsResponse } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const insertBasicCaptionsHandler: ApiHandler<InsertBasicCaptionsRequest, InsertBasicCaptionsResponse>;

package/dist/preview-server/routes/insert-basic-captions.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.insertBasicCaptionsHandler = void 0;
+const node_fs_1 = require("node:fs");
+const codemods_1 = require("@remotion/codemods");
+const renderer_1 = require("@remotion/renderer");
+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 sequence_node_path_mutation_1 = require("../sequence-node-path-mutation");
+const undo_stack_1 = require("../undo-stack");
+const source_file_write_queue_1 = require("./source-file-write-queue");
+const { basicCaptionsElementSource, getBasicCaptionsElementFile, insertBasicCaptions, } = codemods_1.CodemodsInternals;
+const insertBasicCaptionsHandler = ({ input: { fileName, nodePath, captions, durationInFrames }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
+    var _a;
+    try {
+        const { absolutePath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName,
+            action: 'modify',
+        });
+        const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
+        const elementFile = getBasicCaptionsElementFile({
+            fileName: absolutePath,
+            readFileContents: (candidate) => {
+                const { absolutePath: elementPath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+                    remotionRoot,
+                    fileName: candidate,
+                    action: 'create',
+                });
+                let stat;
+                try {
+                    stat = (0, node_fs_1.lstatSync)(elementPath);
+                }
+                catch (error) {
+                    if (error.code === 'ENOENT') {
+                        return null;
+                    }
+                    throw error;
+                }
+                if (!stat.isFile()) {
+                    throw new Error(`Cannot use ${elementPath} for Basic captions`);
+                }
+                return (0, node_fs_1.readFileSync)(elementPath, 'utf-8');
+            },
+        });
+        const { output, logLine, nodePathRemappings } = insertBasicCaptions({
+            input: fileContents,
+            nodePath,
+            captions,
+            durationInFrames,
+            importPath: elementFile.importPath,
+        });
+        const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([{ absolutePath, remappings: nodePathRemappings }], null);
+        (0, undo_stack_1.pushTransactionToUndoStack)({
+            snapshots: [
+                ...(elementFile.shouldWrite
+                    ? [
+                        {
+                            filePath: elementFile.fileName,
+                            oldContents: null,
+                            newContents: basicCaptionsElementSource,
+                            logLine: 1,
+                            nodePathRemappings: null,
+                        },
+                    ]
+                    : []),
+                {
+                    filePath: absolutePath,
+                    oldContents: fileContents,
+                    newContents: output,
+                    logLine,
+                    nodePathRemappings,
+                },
+            ],
+            logLevel,
+            remotionRoot,
+            description: {
+                undoMessage: '↩️  Insertion of Basic captions',
+                redoMessage: '↪️  Insertion of Basic captions',
+            },
+            entryType: 'insert-basic-captions',
+            suppressHmrOnFileRestore: false,
+            undoRedoNavigation: null,
+        });
+        if (elementFile.shouldWrite) {
+            (0, undo_stack_1.suppressUndoStackInvalidation)(elementFile.fileName);
+            (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
+                file: elementFile.fileName,
+                content: basicCaptionsElementSource,
+                originatorClientId: undefined,
+                metadata: null,
+            });
+        }
+        (0, undo_stack_1.suppressUndoStackInvalidation)(absolutePath);
+        (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
+            file: absolutePath,
+            content: output,
+            originatorClientId: undefined,
+            metadata: { skipSequencePropsUpdate: true },
+        });
+        const locationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
+            remotionRoot,
+            absolutePath,
+            line: logLine,
+        });
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(locationLabel)} Inserted Basic captions`);
+        (0, undo_stack_1.printUndoHint)(logLevel);
+        return Promise.resolve({ success: true, nodePathMutation });
+    }
+    catch (error) {
+        return Promise.resolve({
+            success: false,
+            reason: error.message,
+            stack: (_a = error.stack) !== null && _a !== void 0 ? _a : '',
+        });
+    }
+});
+exports.insertBasicCaptionsHandler = insertBasicCaptionsHandler;