@lingui/cli 5.3.2 → 5.4.0

package/dist/api/catalog/extractFromFiles.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractFromFiles = extractFromFiles;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const path_1 = __importDefault(require("path"));
 const extractors_1 = __importDefault(require("../extractors"));
 const utils_1 = require("../utils");
@@ -23,7 +23,7 @@ function mergePlaceholders(prev, next) {
 async function extractFromFiles(paths, config) {
     const messages = {};
     let catalogSuccess = true;
-    for (const filename of paths) {
+    await Promise.all(paths.map(async (filename) => {
         const fileSuccess = await (0, extractors_1.default)(filename, (next) => {
             var _a;
             if (!messages[next.id]) {
@@ -42,18 +42,18 @@ async function extractFromFiles(paths, config) {
                 : "";
             const origin = [filename, next.origin[1]];
             if (prev.message && next.message && prev.message !== next.message) {
-                throw new Error(`Encountered different default translations for message ${chalk_1.default.yellow(next.id)}` +
-                    `\n${chalk_1.default.yellow((0, utils_1.prettyOrigin)(prev.origin))} ${prev.message}` +
-                    `\n${chalk_1.default.yellow((0, utils_1.prettyOrigin)([origin]))} ${next.message}`);
+                throw new Error(`Encountered different default translations for message ${picocolors_1.default.yellow(next.id)}` +
+                    `\n${picocolors_1.default.yellow((0, utils_1.prettyOrigin)(prev.origin))} ${prev.message}` +
+                    `\n${picocolors_1.default.yellow((0, utils_1.prettyOrigin)([origin]))} ${next.message}`);
             }
             messages[next.id] = Object.assign(Object.assign({}, prev), { message: (_a = prev.message) !== null && _a !== void 0 ? _a : next.message, comments: next.comment
-                    ? [...prev.comments, next.comment]
-                    : prev.comments, origin: [...prev.origin, [filename, next.origin[1]]], placeholders: mergePlaceholders(prev.placeholders, next.placeholders) });
+                    ? [...prev.comments, next.comment].sort()
+                    : prev.comments, origin: [...prev.origin, [filename, next.origin[1]]].sort((a, b) => a[0].localeCompare(b[0])), placeholders: mergePlaceholders(prev.placeholders, next.placeholders) });
         }, config, {
             extractors: config.extractors,
         });
         catalogSuccess && (catalogSuccess = fileSuccess);
-    }
+    }));
     if (!catalogSuccess)
         return undefined;
     return messages;

package/dist/api/catalog.js

@@ -34,10 +34,12 @@ class Catalog {
             this.format.getCatalogExtension());
     }
     async make(options) {
-        const nextCatalog = await this.collect({ files: options.files });
+        const [nextCatalog, prevCatalogs] = await Promise.all([
+            this.collect({ files: options.files }),
+            this.readAll(),
+        ]);
         if (!nextCatalog)
             return false;
-        const prevCatalogs = await this.readAll();
         const catalogs = this.merge(prevCatalogs, nextCatalog, {
             overwrite: options.overwrite,
             files: options.files,

package/dist/api/compile.js

@@ -46,7 +46,9 @@ function createCompiledCatalog(locale, messages, options) {
     const { strict = false, namespace = "cjs", pseudoLocale, compilerBabelOptions = {}, } = options;
     const shouldPseudolocalize = locale === pseudoLocale;
     const errors = [];
-    const compiledMessages = Object.keys(messages).reduce((obj, key) => {
+    const compiledMessages = Object.keys(messages)
+        .sort()
+        .reduce((obj, key) => {
         // Don't use `key` as a fallback translation in strict mode.
         const translation = (messages[key] || (!strict ? key : ""));
         try {

package/dist/api/messages.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMissingErrorMessage = createMissingErrorMessage;
 exports.createCompilationErrorMessage = createCompilationErrorMessage;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 function createMissingErrorMessage(locale, missingMessages, configurationMsg) {
-    let message = `Failed to compile catalog for locale ${chalk_1.default.bold(locale)}!
+    let message = `Failed to compile catalog for locale ${picocolors_1.default.bold(locale)}!
 
 Missing ${missingMessages.length} translation(s):
 \n`;
@@ -20,7 +20,7 @@ Missing ${missingMessages.length} translation(s):
     return message;
 }
 function createCompilationErrorMessage(locale, errors) {
-    let message = `Failed to compile catalog for locale ${chalk_1.default.bold(locale)}!
+    let message = `Failed to compile catalog for locale ${picocolors_1.default.bold(locale)}!
 
 Compilation error for ${errors.length} translation(s):
 \n`;

package/dist/api/stats.js

@@ -8,7 +8,7 @@ exports.printStats = printStats;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const cli_table_1 = __importDefault(require("cli-table"));
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 function getStats(catalog) {
     return [
         Object.keys(catalog).length,
@@ -33,7 +33,7 @@ function printStats(config, catalogs) {
         // was not extracted due to a `--locale` filter
         const [all, translated] = catalog ? getStats(catalog) : ["-", "-"];
         if (config.sourceLocale === locale) {
-            table.push({ [`${chalk_1.default.bold(locale)} (source)`]: [all, "-"] });
+            table.push({ [`${picocolors_1.default.bold(locale)} (source)`]: [all, "-"] });
         }
         else {
             table.push({ [locale]: [all, translated] });

package/dist/extract-experimental/writeCatalogs.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeCatalogs = writeCatalogs;
 exports.writeTemplate = writeTemplate;
 const resolveTemplatePath_1 = require("./resolveTemplatePath");
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const resolveCatalogPath_1 = require("./resolveCatalogPath");
 const mergeCatalog_1 = require("../api/catalog/mergeCatalog");
 const stats_1 = require("../api/stats");
@@ -35,6 +35,6 @@ async function writeTemplate(params) {
     const catalogOutput = (0, resolveTemplatePath_1.resolveTemplatePath)(entryPoint, outputPattern, linguiConfig.rootDir, format.getTemplateExtension());
     await format.write(catalogOutput, cleanAndSort(messages, clean, linguiConfig.orderBy), undefined);
     return {
-        statMessage: `${chalk_1.default.bold(Object.keys(messages).length)} message(s) extracted`,
+        statMessage: `${picocolors_1.default.bold(Object.keys(messages).length)} message(s) extracted`,
     };
 }

package/dist/lingui-compile.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = command;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
@@ -14,54 +14,70 @@ const api_1 = require("./api");
 const getCatalogs_1 = require("./api/catalog/getCatalogs");
 const normalize_path_1 = __importDefault(require("normalize-path"));
 const path_1 = __importDefault(require("path"));
+class ProgramExit extends Error {
+}
 async function command(config, options) {
     const catalogs = await (0, api_1.getCatalogs)(config);
     // Check config.compile.merge if catalogs for current locale are to be merged into a single compiled file
     const doMerge = !!config.catalogsMergePath;
-    let mergedCatalogs = {};
     console.log("Compiling message catalogs…");
-    for (const locale of config.locales) {
-        for (const catalog of catalogs) {
-            const { messages, missing: missingMessages } = await catalog.getTranslations(locale, {
-                fallbackLocales: config.fallbackLocales,
-                sourceLocale: config.sourceLocale,
-            });
-            if (!options.allowEmpty &&
-                locale !== config.pseudoLocale &&
-                missingMessages.length > 0) {
-                console.error(chalk_1.default.red(`Error: Failed to compile catalog for locale ${chalk_1.default.bold(locale)}!`));
-                if (options.verbose) {
-                    console.error(chalk_1.default.red("Missing translations:"));
-                    missingMessages.forEach((missing) => {
-                        const source = missing.source || missing.source === missing.id
-                            ? `: (${missing.source})`
-                            : "";
-                        console.error(`${missing.id}${source}`);
-                    });
-                }
-                else {
-                    console.error(chalk_1.default.red(`Missing ${missingMessages.length} translation(s)`));
-                }
-                console.error();
-                return false;
+    let errored = false;
+    await Promise.all(config.locales.map(async (locale) => {
+        try {
+            await compileLocale(locale, catalogs, options, config, doMerge);
+        }
+        catch (err) {
+            if (err instanceof ProgramExit) {
+                errored = true;
             }
-            if (doMerge) {
-                mergedCatalogs = Object.assign(Object.assign({}, mergedCatalogs), messages);
+            else {
+                throw err;
+            }
+        }
+    }));
+    return !errored;
+}
+async function compileLocale(locale, catalogs, options, config, doMerge) {
+    let mergedCatalogs = {};
+    await Promise.all(catalogs.map(async (catalog) => {
+        const { messages, missing: missingMessages } = await catalog.getTranslations(locale, {
+            fallbackLocales: config.fallbackLocales,
+            sourceLocale: config.sourceLocale,
+        });
+        if (!options.allowEmpty &&
+            locale !== config.pseudoLocale &&
+            missingMessages.length > 0) {
+            console.error(picocolors_1.default.red(`Error: Failed to compile catalog for locale ${picocolors_1.default.bold(locale)}!`));
+            if (options.verbose) {
+                console.error(picocolors_1.default.red("Missing translations:"));
+                missingMessages.forEach((missing) => {
+                    const source = missing.source || missing.source === missing.id
+                        ? `: (${missing.source})`
+                        : "";
+                    console.error(`${missing.id}${source}`);
+                });
             }
             else {
-                if (!(await compileAndWrite(locale, config, options, catalog, messages))) {
-                    return false;
-                }
+                console.error(picocolors_1.default.red(`Missing ${missingMessages.length} translation(s)`));
             }
+            console.error();
+            throw new ProgramExit();
         }
         if (doMerge) {
-            const result = await compileAndWrite(locale, config, options, await (0, getCatalogs_1.getCatalogForMerge)(config), mergedCatalogs);
-            if (!result) {
-                return false;
+            mergedCatalogs = Object.assign(Object.assign({}, mergedCatalogs), messages);
+        }
+        else {
+            if (!(await compileAndWrite(locale, config, options, catalog, messages))) {
+                throw new ProgramExit();
             }
         }
+    }));
+    if (doMerge) {
+        const result = await compileAndWrite(locale, config, options, await (0, getCatalogs_1.getCatalogForMerge)(config), mergedCatalogs);
+        if (!result) {
+            throw new ProgramExit();
+        }
     }
-    return true;
 }
 async function compileAndWrite(locale, config, options, catalogToWrite, messages) {
     const namespace = options.typescript
@@ -77,17 +93,17 @@ async function compileAndWrite(locale, config, options, catalogToWrite, messages
         let message = (0, api_1.createCompilationErrorMessage)(locale, errors);
         if (options.failOnCompileError) {
             message += `These errors fail command execution because \`--strict\` option passed`;
-            console.error(chalk_1.default.red(message));
+            console.error(picocolors_1.default.red(message));
             return false;
         }
         else {
             message += `You can fail command execution on these errors by passing \`--strict\` option`;
-            console.error(chalk_1.default.red(message));
+            console.error(picocolors_1.default.red(message));
         }
     }
     let compiledPath = await catalogToWrite.writeCompiled(locale, compiledCatalog, namespace);
     compiledPath = (0, normalize_path_1.default)(path_1.default.relative(config.rootDir, compiledPath));
-    options.verbose && console.error(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));
+    options.verbose && console.error(picocolors_1.default.green(`${locale} ⇒ ${compiledPath}`));
     return true;
 }
 if (require.main === module) {
@@ -135,7 +151,7 @@ if (require.main === module) {
     };
     // Check if Watch Mode is enabled
     if (options.watch) {
-        console.info(chalk_1.default.bold("Initializing Watch Mode..."));
+        console.info(picocolors_1.default.bold("Initializing Watch Mode..."));
         (async function initWatch() {
             const format = await (0, api_1.getFormat)(config.format, config.formatOptions, config.sourceLocale);
             const catalogs = await (0, api_1.getCatalogs)(config);
@@ -151,7 +167,7 @@ if (require.main === module) {
                 persistent: true,
             });
             const onReady = () => {
-                console.info(chalk_1.default.green.bold("Watcher is ready!"));
+                console.info(picocolors_1.default.green(picocolors_1.default.bold("Watcher is ready!")));
                 watcher
                     .on("add", () => dispatchCompile())
                     .on("change", () => dispatchCompile());

package/dist/lingui-extract-experimental.js

@@ -15,7 +15,7 @@ const normalize_path_1 = __importDefault(require("normalize-path"));
 const bundleSource_1 = require("./extract-experimental/bundleSource");
 const writeCatalogs_1 = require("./extract-experimental/writeCatalogs");
 const getEntryPoints_1 = require("./extract-experimental/getEntryPoints");
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const babel_1 = require("./api/extractors/babel");
 async function command(linguiConfig, options) {
     var _a;
@@ -24,7 +24,7 @@ async function command(linguiConfig, options) {
     if (!config) {
         throw new Error("The configuration for experimental extractor is empty. Please read the docs.");
     }
-    console.log(chalk_1.default.yellow([
+    console.log(picocolors_1.default.yellow([
         "You have using an experimental feature",
         "Experimental features are not covered by semver, and may cause unexpected or broken application behavior." +
             " Use at your own risk.",

package/dist/lingui-extract-template.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = command;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
 const api_1 = require("./api");
@@ -23,7 +23,7 @@ async function command(config, options) {
         commandSuccess && (commandSuccess = Boolean(result));
     }));
     Object.entries(catalogStats).forEach(([key, value]) => {
-        console.log(`Catalog statistics for ${chalk_1.default.bold(key)}: ${chalk_1.default.green(value)} messages`);
+        console.log(`Catalog statistics for ${picocolors_1.default.bold(key)}: ${picocolors_1.default.green(value)} messages`);
         console.log();
     });
     return commandSuccess;

package/dist/lingui-extract.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = command;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const commander_1 = require("commander");
 const path_1 = __importDefault(require("path"));
@@ -20,11 +20,11 @@ async function command(config, options) {
     const catalogStats = {};
     let commandSuccess = true;
     const spinner = (0, ora_1.default)().start();
-    for (const catalog of catalogs) {
+    await Promise.all(catalogs.map(async (catalog) => {
         const result = await catalog.make(Object.assign(Object.assign({}, options), { orderBy: config.orderBy }));
         catalogStats[(0, normalize_path_1.default)(path_1.default.relative(config.rootDir, catalog.path))] = result || {};
         commandSuccess && (commandSuccess = Boolean(result));
-    }
+    }));
     if (commandSuccess) {
         spinner.succeed();
     }
@@ -37,8 +37,8 @@ async function command(config, options) {
         console.log();
     });
     if (!options.watch) {
-        console.log(`(Use "${chalk_1.default.yellow((0, help_1.helpRun)("extract"))}" to update catalogs with new messages.)`);
-        console.log(`(Use "${chalk_1.default.yellow((0, help_1.helpRun)("compile"))}" to compile catalogs for production. Alternatively, use bundler plugins: https://lingui.dev/ref/cli#compiling-catalogs-in-ci)`);
+        console.log(`(Use "${picocolors_1.default.yellow((0, help_1.helpRun)("extract"))}" to update catalogs with new messages.)`);
+        console.log(`(Use "${picocolors_1.default.yellow((0, help_1.helpRun)("compile"))}" to compile catalogs for production. Alternatively, use bundler plugins: https://lingui.dev/ref/cli#compiling-catalogs-in-ci)`);
     }
     // If service key is present in configuration, synchronize with cloud translation platform
     if (typeof config.service === "object" &&
@@ -83,18 +83,18 @@ if (require.main === module) {
     if (prevFormat && config.format === prevFormat) {
         hasErrors = true;
         console.error("Trying to migrate message catalog to the same format");
-        console.error(`Set ${chalk_1.default.bold("new")} format in LinguiJS configuration\n` +
-            ` and ${chalk_1.default.bold("previous")} format using --convert-from option.`);
+        console.error(`Set ${picocolors_1.default.bold("new")} format in LinguiJS configuration\n` +
+            ` and ${picocolors_1.default.bold("previous")} format using --convert-from option.`);
         console.log();
         console.log(`Example: Convert from lingui format to minimal`);
-        console.log(chalk_1.default.yellow((0, help_1.helpRun)(`extract --convert-from lingui`)));
+        console.log(picocolors_1.default.yellow((0, help_1.helpRun)(`extract --convert-from lingui`)));
         process.exit(1);
     }
     if (options.locale) {
         const missingLocale = options.locale.find((l) => !config.locales.includes(l));
         if (missingLocale) {
             hasErrors = true;
-            console.error(`Locale ${chalk_1.default.bold(missingLocale)} does not exist.`);
+            console.error(`Locale ${picocolors_1.default.bold(missingLocale)} does not exist.`);
             console.error();
         }
     }
@@ -132,7 +132,7 @@ if (require.main === module) {
     };
     // Check if Watch Mode is enabled
     if (options.watch) {
-        console.info(chalk_1.default.bold("Initializing Watch Mode..."));
+        console.info(picocolors_1.default.bold("Initializing Watch Mode..."));
         (async function initWatch() {
             const catalogs = await (0, api_1.getCatalogs)(config);
             const paths = [];
@@ -146,7 +146,7 @@ if (require.main === module) {
                 persistent: true,
             });
             const onReady = () => {
-                console.info(chalk_1.default.green.bold("Watcher is ready!"));
+                console.info(picocolors_1.default.green(picocolors_1.default.bold("Watcher is ready!")));
                 watcher
                     .on("add", (path) => dispatchExtract([path]))
                     .on("change", (path) => dispatchExtract([path]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "5.3.2",
+  "version": "5.4.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -12,7 +12,12 @@
     "translation",
     "multilingual"
   ],
-  "repository": "lingui/js-lingui",
+  "homepage": "https://lingui.dev",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lingui/js-lingui.git",
+    "directory": "packages/cli"
+  },
   "bugs": "https://github.com/lingui/js-lingui/issues",
   "license": "MIT",
   "author": {
@@ -57,14 +62,12 @@
     "@babel/parser": "^7.22.0",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "5.3.2",
-    "@lingui/babel-plugin-lingui-macro": "5.3.2",
-    "@lingui/conf": "5.3.2",
-    "@lingui/core": "5.3.2",
-    "@lingui/format-po": "5.3.2",
-    "@lingui/message-utils": "5.3.2",
-    "babel-plugin-macros": "^3.0.1",
-    "chalk": "^4.1.0",
+    "@lingui/babel-plugin-extract-messages": "5.4.0",
+    "@lingui/babel-plugin-lingui-macro": "5.4.0",
+    "@lingui/conf": "5.4.0",
+    "@lingui/core": "5.4.0",
+    "@lingui/format-po": "5.4.0",
+    "@lingui/message-utils": "5.4.0",
     "chokidar": "3.5.1",
     "cli-table": "^0.3.11",
     "commander": "^10.0.0",
@@ -72,12 +75,10 @@
     "date-fns": "^3.6.0",
     "esbuild": "^0.25.1",
     "glob": "^11.0.0",
-    "inquirer": "^7.3.3",
     "micromatch": "^4.0.7",
     "normalize-path": "^3.0.0",
     "ora": "^5.1.0",
-    "pathe": "^1.1.0",
-    "pkg-up": "^3.1.0",
+    "picocolors": "^1.1.1",
     "pofile": "^1.1.4",
     "pseudolocale": "^2.0.0",
     "source-map": "^0.8.0-beta.0"
@@ -90,5 +91,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "37f40ec18928b357c07a228947b2bf071e92449e"
+  "gitHead": "ce0d17bd0874f5f4f01fd073749f29087835a315"
 }