@remotion/studio-server 4.0.471 → 4.0.473

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

@@ -1,6 +1,7 @@
-import type { JSXOpeningElement } from '@babel/types';
+import type { File, JSXOpeningElement } from '@babel/types';
 import type { CanUpdateEffectPropsResponse, SequenceNodePath, SequenceSchema } from 'remotion';
-export declare const computeEffectPropStatus: ({ jsx, effectIndex, keys, }: {
+export declare const computeEffectPropStatus: ({ ast, jsx, effectIndex, keys, }: {
+    ast: File;
     jsx: JSXOpeningElement;
     effectIndex: number;
     keys: string[];

package/dist/preview-server/routes/can-update-effect-props.js

@@ -6,6 +6,10 @@ const parse_ast_1 = require("../../codemods/parse-ast");
 const update_effect_props_1 = require("../../codemods/update-effect-props/update-effect-props");
 const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
 const can_update_sequence_props_1 = require("./can-update-sequence-props");
+const staticStatus = (codeValue) => ({
+    status: 'static',
+    codeValue,
+});
 const findEffectsAttr = (jsx) => {
     for (const attr of jsx.attributes) {
         if (attr.type !== 'JSXAttribute') {
@@ -27,7 +31,64 @@ const getEffectsArrayElements = (attr) => {
     }
     return (0, update_effect_props_1.enumerateEffectArrayElements)(expr);
 };
-const getPropsFromObjectExpression = ({ objExpr, keys, }) => {
+const getImportedName = (specifier) => {
+    var _a, _b;
+    if (!specifier.imported) {
+        return null;
+    }
+    if (specifier.imported.type === 'Identifier') {
+        return (_a = specifier.imported.name) !== null && _a !== void 0 ? _a : null;
+    }
+    return (_b = specifier.imported.value) !== null && _b !== void 0 ? _b : null;
+};
+const resolveEffectImport = ({ ast, call, fallbackCallee, }) => {
+    var _a, _b;
+    var _c;
+    const { callee } = call;
+    if (callee.type === 'Identifier') {
+        const localName = callee.name;
+        for (const node of ast.program.body) {
+            if (node.type !== 'ImportDeclaration') {
+                continue;
+            }
+            const matchingSpecifier = (_a = node.specifiers) === null || _a === void 0 ? void 0 : _a.find((specifier) => {
+                var _a;
+                return (specifier.type === 'ImportSpecifier' &&
+                    ((_a = specifier.local) === null || _a === void 0 ? void 0 : _a.name) === localName);
+            });
+            if ((matchingSpecifier === null || matchingSpecifier === void 0 ? void 0 : matchingSpecifier.type) === 'ImportSpecifier') {
+                return {
+                    callee: (_c = getImportedName(matchingSpecifier)) !== null && _c !== void 0 ? _c : fallbackCallee,
+                    importPath: String(node.source.value),
+                };
+            }
+        }
+    }
+    if (callee.type === 'MemberExpression' &&
+        callee.object.type === 'Identifier' &&
+        callee.property.type === 'Identifier' &&
+        !callee.computed) {
+        const namespaceName = callee.object.name;
+        for (const node of ast.program.body) {
+            if (node.type !== 'ImportDeclaration') {
+                continue;
+            }
+            const matchingSpecifier = (_b = node.specifiers) === null || _b === void 0 ? void 0 : _b.find((specifier) => {
+                var _a;
+                return (specifier.type === 'ImportNamespaceSpecifier' &&
+                    ((_a = specifier.local) === null || _a === void 0 ? void 0 : _a.name) === namespaceName);
+            });
+            if (matchingSpecifier) {
+                return {
+                    callee: callee.property.name,
+                    importPath: String(node.source.value),
+                };
+            }
+        }
+    }
+    return { callee: fallbackCallee, importPath: null };
+};
+const getPropsFromObjectExpression = ({ ast, objExpr, keys, }) => {
     const out = {};
     for (const key of keys) {
         const prop = objExpr.properties.find((p) => p.type === 'ObjectProperty' &&
@@ -35,22 +96,22 @@ const getPropsFromObjectExpression = ({ objExpr, keys, }) => {
                 (p.key.type === 'StringLiteral' &&
                     p.key.value === key)));
         if (!prop) {
-            out[key] = { canUpdate: true, codeValue: undefined };
+            out[key] = staticStatus(undefined);
             continue;
         }
         const valueExpr = prop.value;
         if (!(0, can_update_sequence_props_1.isStaticValue)(valueExpr)) {
-            out[key] = (0, can_update_sequence_props_1.getComputedStatus)(valueExpr);
+            out[key] = (0, can_update_sequence_props_1.getComputedStatus)(valueExpr, ast);
             continue;
         }
         out[key] = {
-            canUpdate: true,
+            status: 'static',
             codeValue: (0, can_update_sequence_props_1.extractStaticValue)(valueExpr),
         };
     }
     return out;
 };
-const computeEffectPropStatus = ({ jsx, effectIndex, keys, }) => {
+const computeEffectPropStatus = ({ ast, jsx, effectIndex, keys, }) => {
     const attr = findEffectsAttr(jsx);
     const elements = getEffectsArrayElements(attr);
     if (!elements) {
@@ -76,14 +137,20 @@ const computeEffectPropStatus = ({ jsx, effectIndex, keys, }) => {
         };
     }
     const call = target.node;
+    const effectImport = resolveEffectImport({
+        ast,
+        call,
+        fallbackCallee: target.callee,
+    });
     if (call.arguments.length === 0) {
         const emptyProps = {};
         for (const key of keys) {
-            emptyProps[key] = { canUpdate: true, codeValue: undefined };
+            emptyProps[key] = staticStatus(undefined);
         }
         return {
             canUpdate: true,
-            callee: target.callee,
+            callee: effectImport.callee,
+            importPath: effectImport.importPath,
             effectIndex,
             props: emptyProps,
         };
@@ -97,13 +164,15 @@ const computeEffectPropStatus = ({ jsx, effectIndex, keys, }) => {
         };
     }
     const resolvedProps = getPropsFromObjectExpression({
+        ast,
         objExpr: firstArg,
         keys,
     });
     return {
         canUpdate: true,
         effectIndex,
-        callee: target.callee,
+        callee: effectImport.callee,
+        importPath: effectImport.importPath,
         props: resolvedProps,
     };
 };
@@ -119,6 +188,7 @@ const computeEffectPropsStatusesFromContent = ({ fileContents, sequenceNodePath,
         }));
     }
     return effects.map((effect, effectIndex) => (0, exports.computeEffectPropStatus)({
+        ast,
         jsx,
         effectIndex,
         keys: keysFor(effect),

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

@@ -3,7 +3,7 @@ import type { SubscribeToSequencePropsResponse } from '@remotion/studio-shared';
 import type { CanUpdateSequencePropsResponseTrue, CanUpdateSequencePropStatus, SequenceNodePath } from 'remotion';
 export declare const isStaticValue: (node: Expression) => boolean;
 export declare const extractStaticValue: (node: Expression) => unknown;
-export declare const getComputedStatus: (node: Expression) => CanUpdateSequencePropStatus;
+export declare const getComputedStatus: (node: Expression, ast: File) => CanUpdateSequencePropStatus;
 export declare const findJsxElementAtNodePath: (ast: File, nodePath: SequenceNodePath) => JSXOpeningElement | null;
 export declare const findNodePathForJsxElement: (ast: File, target: JSXOpeningElement) => SequenceNodePath | null;
 export declare const lineColumnToNodePath: (ast: File, targetLine: number) => SequenceNodePath | null;

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

@@ -36,12 +36,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeSequencePropsStatusFromFilenameByLine = exports.computeSequencePropsStatus = exports.computeSequencePropsStatusFromContent = exports.lineColumnToNodePath = exports.findNodePathForJsxElement = exports.findJsxElementAtNodePath = exports.getComputedStatus = exports.extractStaticValue = exports.isStaticValue = void 0;
 const node_fs_1 = require("node:fs");
 const renderer_1 = require("@remotion/renderer");
+const studio_shared_1 = require("@remotion/studio-shared");
 const recast = __importStar(require("recast"));
 const parse_ast_1 = require("../../codemods/parse-ast");
 const get_ast_node_path_1 = require("../../helpers/get-ast-node-path");
+const import_agnostic_node_path_1 = require("../../helpers/import-agnostic-node-path");
 const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
 const jsx_element_not_found_at_location_error_1 = require("../jsx-element-not-found-at-location-error");
 const can_update_effect_props_1 = require("./can-update-effect-props");
+const staticStatus = (codeValue) => ({
+    status: 'static',
+    codeValue,
+});
+const computedStatus = () => ({
+    status: 'computed',
+});
 const isStaticValue = (node) => {
     switch (node.type) {
         case 'NumericLiteral':
@@ -296,23 +305,26 @@ const getInterpolationMetadata = (interpolationFunction, callExpression, keyfram
         posterize,
     };
 };
-const getInterpolationKeyframes = (node) => {
+const getInterpolationKeyframes = (node, ast) => {
     if (node.type === 'TSAsExpression') {
-        return getInterpolationKeyframes(node.expression);
+        return getInterpolationKeyframes(node.expression, ast);
     }
     if (node.type !== 'CallExpression') {
         return undefined;
     }
     const callExpression = node;
     if (callExpression.callee.type !== 'Identifier' ||
-        (callExpression.callee.name !== 'interpolate' &&
-            callExpression.callee.name !== 'interpolateColors')) {
+        !(0, studio_shared_1.isKeyframeInterpolationFunction)(callExpression.callee.name)) {
         return undefined;
     }
     const interpolationFunction = callExpression.callee.name;
+    const frameArg = callExpression.arguments[0];
     const inputArg = callExpression.arguments[1];
     const outputArg = callExpression.arguments[2];
-    if (!inputArg ||
+    if (!frameArg ||
+        frameArg.type === 'SpreadElement' ||
+        !isCurrentFrameIdentifier(frameArg, ast) ||
+        !inputArg ||
         !outputArg ||
         inputArg.type !== 'ArrayExpression' ||
         outputArg.type !== 'ArrayExpression') {
@@ -355,14 +367,46 @@ const getInterpolationKeyframes = (node) => {
         posterize: metadata.posterize,
     };
 };
-const getComputedStatus = (node) => {
-    const interpolation = getInterpolationKeyframes(node);
+const isUseCurrentFrameCall = (node) => {
+    return (node.type === 'CallExpression' &&
+        node.callee.type === 'Identifier' &&
+        node.callee.name === 'useCurrentFrame' &&
+        node.arguments.length === 0);
+};
+const isCurrentFrameIdentifier = (node, ast) => {
+    if (node.type === 'TSAsExpression') {
+        return isCurrentFrameIdentifier(node.expression, ast);
+    }
+    if (node.type !== 'Identifier') {
+        return false;
+    }
+    let hasUseCurrentFrameDeclaration = false;
+    let hasOtherDeclaration = false;
+    recast.types.visit(ast, {
+        visitVariableDeclarator(p) {
+            const { id, init } = p.node;
+            if (id.type !== 'Identifier' || id.name !== node.name) {
+                return this.traverse(p);
+            }
+            if (init && isUseCurrentFrameCall(init)) {
+                hasUseCurrentFrameDeclaration = true;
+            }
+            else {
+                hasOtherDeclaration = true;
+            }
+            return false;
+        },
+    });
+    return hasUseCurrentFrameDeclaration && !hasOtherDeclaration;
+};
+const getComputedStatus = (node, ast) => {
+    const interpolation = getInterpolationKeyframes(node, ast);
     if (!interpolation) {
-        return { canUpdate: false, reason: 'computed' };
+        return computedStatus();
     }
     return {
-        canUpdate: false,
-        reason: 'keyframed',
+        status: 'keyframed',
+        codeValue: undefined,
         interpolationFunction: interpolation.interpolationFunction,
         keyframes: interpolation.keyframes,
         easing: interpolation.easing,
@@ -371,7 +415,7 @@ const getComputedStatus = (node) => {
     };
 };
 exports.getComputedStatus = getComputedStatus;
-const getPropsStatus = (jsxElement) => {
+const getPropsStatus = (jsxElement, ast) => {
     const props = {};
     for (const attr of jsxElement.attributes) {
         if (attr.type === 'JSXSpreadAttribute') {
@@ -386,39 +430,33 @@ const getPropsStatus = (jsxElement) => {
         }
         const { value } = attr;
         if (!value) {
-            props[name] = { canUpdate: true, codeValue: true };
+            props[name] = staticStatus(true);
             continue;
         }
         if (value.type === 'StringLiteral') {
-            props[name] = {
-                canUpdate: true,
-                codeValue: value.value,
-            };
+            props[name] = staticStatus(value.value);
             continue;
         }
         if (value.type === 'JSXExpressionContainer') {
             const { expression } = value;
             if (expression.type === 'JSXEmptyExpression') {
-                props[name] = { canUpdate: false, reason: 'computed' };
+                props[name] = computedStatus();
                 continue;
             }
             if (!(0, exports.isStaticValue)(expression)) {
-                props[name] = (0, exports.getComputedStatus)(expression);
+                props[name] = (0, exports.getComputedStatus)(expression, ast);
                 continue;
             }
-            props[name] = {
-                canUpdate: true,
-                codeValue: (0, exports.extractStaticValue)(expression),
-            };
+            props[name] = staticStatus((0, exports.extractStaticValue)(expression));
             continue;
         }
-        props[name] = { canUpdate: false, reason: 'computed' };
+        props[name] = computedStatus();
     }
     return props;
 };
 const getNodePathForRecastPath = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-recastPath) => {
+recastPath, ast) => {
     const segments = [];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let current = recastPath;
@@ -428,9 +466,9 @@ recastPath) => {
     }
     // Recast paths start with "root" which doesn't correspond to a real AST property
     if (segments.length > 0 && segments[0] === 'root') {
-        return segments.slice(1);
+        return (0, import_agnostic_node_path_1.toImportAgnosticNodePath)({ ast, nodePath: segments.slice(1) });
     }
-    return segments;
+    return (0, import_agnostic_node_path_1.toImportAgnosticNodePath)({ ast, nodePath: segments });
 };
 const findJsxElementAtNodePath = (ast, nodePath) => {
     const current = (0, get_ast_node_path_1.getAstNodePath)(ast, nodePath);
@@ -448,7 +486,7 @@ const findNodePathForJsxElement = (ast, target) => {
     recast.types.visit(ast, {
         visitJSXOpeningElement(p) {
             if (p.node === target) {
-                foundPath = getNodePathForRecastPath(p);
+                foundPath = getNodePathForRecastPath(p, ast);
                 return false;
             }
             return this.traverse(p);
@@ -463,7 +501,7 @@ const lineColumnToNodePath = (ast, targetLine) => {
         visitJSXOpeningElement(p) {
             const { node } = p;
             if (node.loc && node.loc.start.line === targetLine) {
-                foundPath = getNodePathForRecastPath(p);
+                foundPath = getNodePathForRecastPath(p, ast);
                 return false;
             }
             return this.traverse(p);
@@ -486,22 +524,22 @@ const validateStyleValue = (childKey, value) => {
     }
     return true;
 };
-const getNestedPropStatus = (jsxElement, parentKey, childKey) => {
+const getNestedPropStatus = (jsxElement, ast, parentKey, childKey) => {
     const attr = jsxElement.attributes.find((a) => a.type !== 'JSXSpreadAttribute' &&
         a.name.type !== 'JSXNamespacedName' &&
         a.name.name === parentKey);
     if (!attr || !attr.value) {
         // Parent attribute doesn't exist, nested prop can be added
-        return { canUpdate: true, codeValue: undefined };
+        return staticStatus(undefined);
     }
     if (attr.value.type !== 'JSXExpressionContainer') {
-        return { canUpdate: false, reason: 'computed' };
+        return computedStatus();
     }
     const { expression } = attr.value;
     if (expression.type === 'JSXEmptyExpression' ||
         expression.type !== 'ObjectExpression') {
         // Parent is not an object literal (e.g. style={myStyles})
-        return { canUpdate: false, reason: 'computed' };
+        return computedStatus();
     }
     const objExpr = expression;
     const prop = objExpr.properties.find((p) => p.type === 'ObjectProperty' &&
@@ -509,38 +547,39 @@ const getNestedPropStatus = (jsxElement, parentKey, childKey) => {
             (p.key.type === 'StringLiteral' && p.key.value === childKey)));
     if (!prop) {
         // Property not set in the object, can be added
-        return { canUpdate: true, codeValue: undefined };
+        return staticStatus(undefined);
     }
     const propValue = prop.value;
     if (!(0, exports.isStaticValue)(propValue)) {
-        return (0, exports.getComputedStatus)(propValue);
+        return (0, exports.getComputedStatus)(propValue, ast);
     }
     const codeValue = (0, exports.extractStaticValue)(propValue);
     if (!validateStyleValue(childKey, codeValue)) {
-        return { canUpdate: false, reason: 'computed' };
+        return computedStatus();
     }
-    return { canUpdate: true, codeValue };
+    return staticStatus(codeValue);
 };
-const computeEffectsForJsx = ({ jsxElement, effects, }) => {
+const computeEffectsForJsx = ({ ast, jsxElement, effects, }) => {
     return effects.map((effect, effectIndex) => (0, can_update_effect_props_1.computeEffectPropStatus)({
+        ast,
         jsx: jsxElement,
         effectIndex,
         keys: effect,
     }));
 };
-const computeSequenceOnlyPropsRecord = ({ jsxElement, keys, }) => {
-    const allProps = getPropsStatus(jsxElement);
+const computeSequenceOnlyPropsRecord = ({ jsxElement, ast, keys, }) => {
+    const allProps = getPropsStatus(jsxElement, ast);
     const filteredProps = {};
     for (const key of keys) {
         const dotIndex = key.indexOf('.');
         if (dotIndex !== -1) {
-            filteredProps[key] = getNestedPropStatus(jsxElement, key.slice(0, dotIndex), key.slice(dotIndex + 1));
+            filteredProps[key] = getNestedPropStatus(jsxElement, ast, key.slice(0, dotIndex), key.slice(dotIndex + 1));
         }
         else if (key in allProps) {
             filteredProps[key] = allProps[key];
         }
         else {
-            filteredProps[key] = { canUpdate: true, codeValue: undefined };
+            filteredProps[key] = staticStatus(undefined);
         }
     }
     return filteredProps;
@@ -551,8 +590,8 @@ const computeSequencePropsStatusFromContent = ({ fileContents, nodePath, keys, e
     if (!jsxElement) {
         throw new jsx_element_not_found_at_location_error_1.JsxElementNotFoundAtLocationError();
     }
-    const filteredProps = computeSequenceOnlyPropsRecord({ jsxElement, keys });
-    const effectsStatuses = computeEffectsForJsx({ jsxElement, effects });
+    const filteredProps = computeSequenceOnlyPropsRecord({ jsxElement, ast, keys });
+    const effectsStatuses = computeEffectsForJsx({ ast, jsxElement, effects });
     return {
         canUpdate: true,
         props: filteredProps,

package/dist/preview-server/routes/delete-keyframes.js

@@ -241,6 +241,7 @@ const deleteKeyframes = async ({ sequenceKeyframes, effectKeyframes, clientId, r
             };
         }
         return (0, can_update_effect_props_1.computeEffectPropStatus)({
+            ast,
             jsx,
             effectIndex: keyframe.effectIndex,
             keys: (0, studio_shared_1.getAllSchemaKeys)(keyframe.schema),

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

@@ -0,0 +1,7 @@
+import { type DownloadRemoteAssetRequest, type DownloadRemoteAssetResponse, type ImageFileType } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const getRemoteAssetFilename: ({ fileType, url, }: {
+    fileType: ImageFileType;
+    url: URL;
+}) => string;
+export declare const downloadRemoteAssetHandler: ApiHandler<DownloadRemoteAssetRequest, DownloadRemoteAssetResponse>;