@remotion/cli 3.0.25 → 3.0.26

package/dist/download-progress.d.ts

@@ -1,2 +1,3 @@
 import type { DownloadProgress } from './progress-bar';
+export declare const getFileSizeDownloadBar: (downloaded: number) => string;
 export declare const makeMultiDownloadProgress: (progresses: DownloadProgress[]) => string | null;

package/dist/download-progress.js

@@ -1,25 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMultiDownloadProgress = void 0;
+exports.makeMultiDownloadProgress = exports.getFileSizeDownloadBar = void 0;
+const format_bytes_1 = require("./format-bytes");
 const make_progress_bar_1 = require("./make-progress-bar");
+const getFileSizeDownloadBar = (downloaded) => {
+    const desiredLength = (0, make_progress_bar_1.makeProgressBar)(0).length;
+    return `[${(0, format_bytes_1.formatBytes)(downloaded).padEnd(desiredLength - 2, ' ')}]`;
+};
+exports.getFileSizeDownloadBar = getFileSizeDownloadBar;
 const makeMultiDownloadProgress = (progresses) => {
     if (progresses.length === 0) {
         return null;
     }
     if (progresses.length === 1) {
         const [progress] = progresses;
-        const truncatedFileName = progress.name.length >= 100
-            ? progress.name.substring(0, 97) + '...'
+        const truncatedFileName = progress.name.length >= 60
+            ? progress.name.substring(0, 57) + '...'
             : progress.name;
         return [
             `    +`,
-            (0, make_progress_bar_1.makeProgressBar)(progress.progress),
+            progress.progress
+                ? (0, make_progress_bar_1.makeProgressBar)(progress.progress)
+                : (0, exports.getFileSizeDownloadBar)(progress.downloaded),
             `Downloading ${truncatedFileName}`,
         ].join(' ');
     }
+    const everyFileHasContentLength = progresses.every((p) => p.totalBytes !== null);
     return [
         `    +`,
-        (0, make_progress_bar_1.makeProgressBar)(progresses.reduce((a, b) => a + b.progress, 0) / progresses.length),
+        everyFileHasContentLength
+            ? (0, make_progress_bar_1.makeProgressBar)(progresses.reduce((a, b) => a + b.progress, 0) /
+                progresses.length)
+            : (0, exports.getFileSizeDownloadBar)(progresses.reduce((a, b) => a + b.downloaded, 0)),
         `Downloading ${progresses.length} files`,
     ].join(' ');
 };

package/dist/format-bytes.d.ts

@@ -0,0 +1,6 @@
+export declare const formatBytes: (number: number, options?: Intl.NumberFormatOptions & {
+    locale: string;
+    bits?: boolean;
+    binary?: boolean;
+    signed: boolean;
+}) => string;

package/dist/format-bytes.js

@@ -0,0 +1,103 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatBytes = void 0;
+const BYTE_UNITS = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+const BIBYTE_UNITS = [
+    'B',
+    'kiB',
+    'MiB',
+    'GiB',
+    'TiB',
+    'PiB',
+    'EiB',
+    'ZiB',
+    'YiB',
+];
+const BIT_UNITS = [
+    'b',
+    'kbit',
+    'Mbit',
+    'Gbit',
+    'Tbit',
+    'Pbit',
+    'Ebit',
+    'Zbit',
+    'Ybit',
+];
+const BIBIT_UNITS = [
+    'b',
+    'kibit',
+    'Mibit',
+    'Gibit',
+    'Tibit',
+    'Pibit',
+    'Eibit',
+    'Zibit',
+    'Yibit',
+];
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/
+const toLocaleString = (number, locale, options) => {
+    if (typeof locale === 'string' || Array.isArray(locale)) {
+        return number.toLocaleString(locale, options);
+    }
+    if (locale === true || options !== undefined) {
+        return number.toLocaleString(undefined, options);
+    }
+    return String(number);
+};
+const formatBytes = (number, options = {
+    locale: 'en-US',
+    signed: false,
+    maximumFractionDigits: 1,
+}) => {
+    if (!Number.isFinite(number)) {
+        throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+    }
+    options = { bits: false, binary: false, ...options };
+    const UNITS = options.bits
+        ? options.binary
+            ? BIBIT_UNITS
+            : BIT_UNITS
+        : options.binary
+            ? BIBYTE_UNITS
+            : BYTE_UNITS;
+    if (options.signed && number === 0) {
+        return `0 $ {
+            UNITS[0]
+        }`;
+    }
+    const isNegative = number < 0;
+    const prefix = isNegative ? '-' : options.signed ? '+' : '';
+    if (isNegative) {
+        number = -number;
+    }
+    let localeOptions;
+    if (options.minimumFractionDigits !== undefined) {
+        localeOptions = {
+            minimumFractionDigits: options.minimumFractionDigits,
+        };
+    }
+    if (options.maximumFractionDigits !== undefined) {
+        localeOptions = {
+            maximumFractionDigits: options.maximumFractionDigits,
+            ...localeOptions,
+        };
+    }
+    if (number < 1) {
+        const numString = toLocaleString(number, options.locale, localeOptions);
+        return prefix + numString + ' ' + UNITS[0];
+    }
+    const exponent = Math.min(Math.floor(options.binary
+        ? Math.log(number) / Math.log(1024)
+        : Math.log10(number) / 3), UNITS.length - 1);
+    number /= (options.binary ? 1024 : 1000) ** exponent;
+    const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+    const unit = UNITS[exponent];
+    return prefix + numberString + ' ' + unit;
+};
+exports.formatBytes = formatBytes;

package/dist/get-cli-options.js

@@ -31,7 +31,6 @@ const getFinalCodec = async (options) => {
             ? null
             : renderer_1.RenderInternals.getExtensionOfFilename((0, user_passed_output_location_1.getUserPassedOutputLocation)()),
         emitWarning: true,
-        isLambda: options.isLambda,
     });
     const ffmpegExecutable = remotion_1.Internals.getCustomFfmpegExecutable();
     if (codec === 'vp8' &&

package/dist/index.d.ts

@@ -101,4 +101,11 @@ export declare const CliInternals: {
     quietFlagProvided: () => boolean;
     parsedCli: import("./parse-command-line").CommandLineOptions & import("minimist").ParsedArgs;
     handleCommonError: (err: Error) => Promise<void>;
+    formatBytes: (number: number, options?: Intl.NumberFormatOptions & {
+        locale: string;
+        bits?: boolean | undefined;
+        binary?: boolean | undefined;
+        signed: boolean;
+    }) => string;
+    getFileSizeDownloadBar: (downloaded: number) => string;
 };

package/dist/index.js

@@ -15,9 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliInternals = exports.cli = void 0;
+const renderer_1 = require("@remotion/renderer");
 const chalk_1 = require("./chalk");
 const check_version_1 = require("./check-version");
 const compositions_1 = require("./compositions");
+const download_progress_1 = require("./download-progress");
+const format_bytes_1 = require("./format-bytes");
 const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
 const handle_common_errors_1 = require("./handle-common-errors");
@@ -46,6 +49,7 @@ const cli = async () => {
     if (command !== versions_1.VERSIONS_COMMAND) {
         await (0, versions_1.validateVersionsBeforeCommand)();
     }
+    const errorSymbolicationLock = renderer_1.RenderInternals.registerErrorSymbolicationLock();
     try {
         if (command === 'compositions') {
             await (0, compositions_1.listCompositionsCommand)();
@@ -83,6 +87,9 @@ const cli = async () => {
         await (0, handle_common_errors_1.handleCommonError)(err);
         process.exit(1);
     }
+    finally {
+        renderer_1.RenderInternals.unlockErrorSymbolicationLock(errorSymbolicationLock);
+    }
 };
 exports.cli = cli;
 __exportStar(require("./render"), exports);
@@ -100,4 +107,6 @@ exports.CliInternals = {
     quietFlagProvided: parse_command_line_1.quietFlagProvided,
     parsedCli: parse_command_line_1.parsedCli,
     handleCommonError: handle_common_errors_1.handleCommonError,
+    formatBytes: format_bytes_1.formatBytes,
+    getFileSizeDownloadBar: download_progress_1.getFileSizeDownloadBar,
 };

package/dist/progress-bar.d.ts

@@ -30,7 +30,9 @@ export declare const makeStitchingProgress: ({ frames, totalFrames, steps, doneI
 export declare type DownloadProgress = {
     name: string;
     id: number;
-    progress: number;
+    progress: number | null;
+    totalBytes: number | null;
+    downloaded: number;
 };
 export declare const makeRenderingAndStitchingProgress: ({ rendering, stitching, downloads, }: {
     rendering: RenderingProgressInput;

package/dist/render.js

@@ -59,11 +59,15 @@ const render = async () => {
             id,
             name: src,
             progress: 0,
+            downloaded: 0,
+            totalBytes: null,
         };
         downloads.push(download);
         updateRenderProgress();
-        return ({ percent }) => {
+        return ({ percent, downloaded, totalSize }) => {
             download.progress = percent;
+            download.totalBytes = totalSize;
+            download.downloaded = downloaded;
             updateRenderProgress();
         };
     };

package/dist/still.js

@@ -105,6 +105,8 @@ const still = async () => {
             id,
             name: src,
             progress: 0,
+            downloaded: 0,
+            totalBytes: null,
         };
         downloads.push(download);
         updateProgress();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.0.25",
+	"version": "3.0.26",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -23,15 +23,15 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.0.25",
-		"@remotion/media-utils": "3.0.25",
-		"@remotion/player": "3.0.25",
-		"@remotion/renderer": "3.0.25",
+		"@remotion/bundler": "3.0.26",
+		"@remotion/media-utils": "3.0.26",
+		"@remotion/player": "3.0.26",
+		"@remotion/renderer": "3.0.26",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.0.25",
+		"remotion": "3.0.26",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -73,5 +73,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "27ec369ebe9cf3d063095383c1e30dc83c60f010"
+	"gitHead": "790e9bb2d66f2fe97efc209237cc57d7cad2e793"
 }