@remotion/cli 3.2.35 → 3.2.36

package/dist/benchmark.js

@@ -14,6 +14,7 @@ const log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
 const parse_command_line_1 = require("./parse-command-line");
 const progress_bar_1 = require("./progress-bar");
+const select_composition_1 = require("./select-composition");
 const setup_cache_1 = require("./setup-cache");
 const truthy_1 = require("./truthy");
 const DEFAULT_RUNS = 3;
@@ -85,7 +86,7 @@ const makeBenchmarkProgressBar = ({ totalRuns, run, progress, doneIn, }) => {
     ].join(' ');
 };
 const benchmarkCommand = async (remotionRoot, args) => {
-    var _a, _b;
+    var _a;
     const runs = (_a = parse_command_line_1.parsedCli.runs) !== null && _a !== void 0 ? _a : DEFAULT_RUNS;
     const filePath = args[0];
     if (!filePath) {
@@ -124,10 +125,12 @@ const benchmarkCommand = async (remotionRoot, args) => {
         port,
         puppeteerInstance,
     });
-    const ids = ((_b = args[1]) !== null && _b !== void 0 ? _b : '')
-        .split(',')
-        .map((c) => c.trim())
-        .filter(truthy_1.truthy);
+    const ids = (args[1]
+        ? args[1]
+            .split(',')
+            .map((c) => c.trim())
+            .filter(truthy_1.truthy)
+        : await (0, select_composition_1.selectCompositions)(comps));
     const compositions = ids.map((compId) => {
         const composition = comps.find((c) => c.id === compId);
         if (!composition) {

package/dist/composition-prompts.d.ts

@@ -0,0 +1,8 @@
+import type { PromptObject } from 'prompts';
+import prompts from 'prompts';
+export declare type Question<V extends string = string> = PromptObject<V> & {
+    optionsPerPage?: number;
+};
+export declare type NamelessQuestion = Omit<Question<'value'>, 'name'>;
+export default function prompt(questions: Question): Promise<prompts.Answers<string>>;
+export declare function selectAsync(question: NamelessQuestion): Promise<string | string[]>;

package/dist/composition-prompts.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectAsync = void 0;
+const prompts_1 = __importDefault(require("prompts"));
+const log_1 = require("./log");
+function prompt(questions) {
+    return (0, prompts_1.default)([questions], {
+        onCancel() {
+            log_1.Log.error('No composition selected.');
+            process.exit(1);
+        },
+    });
+}
+exports.default = prompt;
+async function selectAsync(question) {
+    const { value } = await prompt({
+        ...question,
+        name: 'value',
+        type: question.type,
+    });
+    return value !== null && value !== void 0 ? value : null;
+}
+exports.selectAsync = selectAsync;

package/dist/get-composition-id.d.ts

@@ -1 +1,6 @@
-export declare const getCompositionId: () => string;
+import type { TCompMetadata } from 'remotion';
+export declare const getCompositionId: (validCompositions: TCompMetadata[]) => Promise<{
+    compositionId: string;
+    reason: string;
+    config: TCompMetadata;
+}>;

package/dist/get-composition-id.js

@@ -3,12 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompositionId = void 0;
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
-const getCompositionId = () => {
-    if (!parse_command_line_1.parsedCli._[2]) {
-        log_1.Log.error('Composition ID not passed.');
-        log_1.Log.error('Pass an extra argument <composition-id>.');
-        process.exit(1);
+const select_composition_1 = require("./select-composition");
+const getCompositionId = async (validCompositions) => {
+    if (parse_command_line_1.parsedCli._[2]) {
+        const config = validCompositions.find((c) => c.id === parse_command_line_1.parsedCli._[2]);
+        if (!config) {
+            throw new Error(`Cannot find composition with ID "${parse_command_line_1.parsedCli._[2]}". Available composition: ${validCompositions
+                .map((c) => c.id)
+                .join(', ')}`);
+        }
+        return {
+            compositionId: parse_command_line_1.parsedCli._[2],
+            reason: 'Passed as argument',
+            config,
+        };
     }
-    return parse_command_line_1.parsedCli._[2];
+    if (!process.env.CI) {
+        const { compositionId, reason } = await (0, select_composition_1.selectComposition)(validCompositions);
+        if (compositionId && typeof compositionId === 'string') {
+            return {
+                compositionId,
+                reason,
+                config: validCompositions.find((c) => c.id === compositionId),
+            };
+        }
+    }
+    log_1.Log.error('Composition ID not passed.');
+    log_1.Log.error('Pass an extra argument <composition-id>.');
+    process.exit(1);
 };
 exports.getCompositionId = getCompositionId;

package/dist/index.d.ts

@@ -135,4 +135,8 @@ export declare const CliInternals: {
         source: string;
     };
     minimist: typeof minimist;
+    selectComposition: (validCompositions: import("remotion").TCompMetadata[]) => Promise<{
+        compositionId: string;
+        reason: string;
+    }>;
 };

package/dist/index.js

@@ -41,6 +41,7 @@ const preview_1 = require("./preview");
 const print_help_1 = require("./print-help");
 const progress_bar_1 = require("./progress-bar");
 const render_1 = require("./render");
+const select_composition_1 = require("./select-composition");
 const still_1 = require("./still");
 const upgrade_1 = require("./upgrade");
 const versions_1 = require("./versions");
@@ -129,4 +130,5 @@ exports.CliInternals = {
     getFinalCodec: get_cli_options_1.getFinalCodec,
     determineFinalImageFormat: determine_image_format_1.determineFinalImageFormat,
     minimist: minimist_1.default,
+    selectComposition: select_composition_1.selectComposition,
 };

package/dist/render.js

@@ -49,15 +49,6 @@ const render = async (remotionRoot) => {
         type: 'series',
         codec,
     });
-    const relativeOutputLocation = (0, get_filename_1.getOutputFilename)({
-        codec,
-        imageSequence: shouldOutputImageSequence,
-        compositionName: (0, get_composition_id_1.getCompositionId)(),
-        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'),
-    });
-    const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
-    const compositionId = (0, get_composition_id_1.getCompositionId)();
-    log_1.Log.info(chalk_1.chalk.gray(`Composition = ${compositionId}, Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
     const ffmpegVersion = await renderer_1.RenderInternals.getFfmpegVersion({
         ffmpegExecutable,
     });
@@ -109,16 +100,21 @@ const render = async (remotionRoot) => {
         downloadMap,
         port,
     });
-    const config = comps.find((c) => c.id === compositionId);
-    if (!config) {
-        throw new Error(`Cannot find composition with ID ${compositionId}`);
-    }
+    const { compositionId, config, reason } = await (0, get_composition_id_1.getCompositionId)(comps);
     renderer_1.RenderInternals.validateEvenDimensionsWithCodec({
         width: config.width,
         height: config.height,
         codec,
         scale,
     });
+    const relativeOutputLocation = (0, get_filename_1.getOutputFilename)({
+        codec,
+        imageSequence: shouldOutputImageSequence,
+        compositionName: compositionId,
+        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'),
+    });
+    log_1.Log.info(chalk_1.chalk.gray(`Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
+    const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
     const outputDir = shouldOutputImageSequence
         ? absoluteOutputFile
         : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));

package/dist/select-composition.d.ts

@@ -0,0 +1,7 @@
+import type { getCompositions } from '@remotion/renderer';
+export declare type Await<T> = T extends PromiseLike<infer U> ? U : T;
+export declare const selectComposition: (validCompositions: Await<ReturnType<typeof getCompositions>>) => Promise<{
+    compositionId: string;
+    reason: string;
+}>;
+export declare const selectCompositions: (validCompositions: Await<ReturnType<typeof getCompositions>>) => Promise<string[]>;

package/dist/select-composition.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectCompositions = exports.selectComposition = void 0;
+const composition_prompts_1 = require("./composition-prompts");
+const chalk_1 = require("./chalk");
+const selectComposition = async (validCompositions) => {
+    if (validCompositions.length === 1) {
+        const onlyComposition = validCompositions[0];
+        if (onlyComposition) {
+            return {
+                compositionId: onlyComposition.id,
+                reason: 'Only composition',
+            };
+        }
+    }
+    const selectedComposition = (await (0, composition_prompts_1.selectAsync)({
+        message: 'Select composition:',
+        optionsPerPage: 5,
+        type: 'select',
+        choices: validCompositions.map((comp) => {
+            return {
+                value: comp.id,
+                title: chalk_1.chalk.bold(comp.id),
+            };
+        }),
+    }));
+    return { compositionId: selectedComposition, reason: 'Selected' };
+};
+exports.selectComposition = selectComposition;
+const selectCompositions = async (validCompositions) => {
+    if (validCompositions.length === 1) {
+        const onlyComposition = validCompositions[0];
+        if (onlyComposition) {
+            return [onlyComposition.id];
+        }
+    }
+    const selectedComposition = await (0, composition_prompts_1.selectAsync)({
+        message: 'Select compositions:',
+        optionsPerPage: 5,
+        type: 'multiselect',
+        min: 1,
+        choices: validCompositions.map((comp) => {
+            return {
+                value: comp.id,
+                title: chalk_1.chalk.bold(comp.id),
+            };
+        }),
+    });
+    return selectedComposition;
+};
+exports.selectCompositions = selectCompositions;

package/dist/still.js

@@ -35,7 +35,6 @@ const still = async (remotionRoot) => {
         codec: 'h264',
     });
     log_1.Log.verbose('Browser executable: ', browserExecutable);
-    const compositionId = (0, get_composition_id_1.getCompositionId)();
     const { format: imageFormat, source } = (0, determine_image_format_1.determineFinalImageFormat)({
         cliFlag: (_a = parse_command_line_1.parsedCli['image-format']) !== null && _a !== void 0 ? _a : null,
         configImageFormat: (_b = config_1.ConfigInternals.getUserPreferredImageFormat()) !== null && _b !== void 0 ? _b : null,
@@ -43,21 +42,12 @@ const still = async (remotionRoot) => {
         outName: (0, user_passed_output_location_1.getUserPassedOutputLocation)(),
         isLambda: false,
     });
-    const relativeOutputLocation = (0, user_passed_output_location_1.getOutputLocation)({
-        compositionId,
-        defaultExtension: imageFormat,
-    });
-    const absoluteOutputLocation = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
-    log_1.Log.info(chalk_1.chalk.gray(`Output = ${relativeOutputLocation}, Format = ${imageFormat} (${source}), Composition = ${compositionId}`));
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
         chromiumOptions,
         shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         forceDeviceScaleFactor: scale,
     });
-    (0, fs_1.mkdirSync)(path_1.default.join(absoluteOutputLocation, '..'), {
-        recursive: true,
-    });
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
         'rendering',
@@ -77,10 +67,16 @@ const still = async (remotionRoot) => {
         ffprobeExecutable,
         downloadMap,
     });
-    const composition = comps.find((c) => c.id === compositionId);
-    if (!composition) {
-        throw new Error(`Cannot find composition with ID ${compositionId}`);
-    }
+    const { compositionId, config, reason } = await (0, get_composition_id_1.getCompositionId)(comps);
+    const relativeOutputLocation = (0, user_passed_output_location_1.getOutputLocation)({
+        compositionId,
+        defaultExtension: imageFormat,
+    });
+    const absoluteOutputLocation = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
+    (0, fs_1.mkdirSync)(path_1.default.join(absoluteOutputLocation, '..'), {
+        recursive: true,
+    });
+    log_1.Log.info(chalk_1.chalk.gray(`Output = ${relativeOutputLocation}, Format = ${imageFormat} (${source}), Composition = ${compositionId} (${reason})`));
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
     const renderStart = Date.now();
     const downloads = [];
@@ -117,7 +113,7 @@ const still = async (remotionRoot) => {
         };
     };
     await (0, renderer_1.renderStill)({
-        composition,
+        composition: config,
         frame: stillFrame,
         output: absoluteOutputLocation,
         serveUrl: urlOrBundle,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.2.35",
+	"version": "3.2.36",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -22,15 +22,16 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.2.35",
-		"@remotion/media-utils": "3.2.35",
-		"@remotion/player": "3.2.35",
-		"@remotion/renderer": "3.2.35",
+		"@remotion/bundler": "3.2.36",
+		"@remotion/media-utils": "3.2.36",
+		"@remotion/player": "3.2.36",
+		"@remotion/renderer": "3.2.36",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.2.35",
+		"prompts": "2.4.1",
+		"remotion": "3.2.36",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -42,6 +43,7 @@
 		"@jonny/eslint-config": "3.0.266",
 		"@types/minimist": "^1.2.2",
 		"@types/node": "^16.7.5",
+		"@types/prompts": "^2.4.1",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
 		"@types/semver": "^7.3.4",
@@ -70,5 +72,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1bf079a1df57808460b1dd87de07d698388598da"
+	"gitHead": "69d6e23f17b14509aee4d327b3481fd4e15df4a4"
 }