@lingui/cli 4.0.0-next.5 → 4.0.0-next.6

package/dist/lingui-compile.js

@@ -1,154 +1,166 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "command", {
-    enumerable: true,
-    get: ()=>command
-});
-const _chalk = /*#__PURE__*/ _interopRequireDefault(require("chalk"));
-const _chokidar = /*#__PURE__*/ _interopRequireDefault(require("chokidar"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _commander = require("commander");
-const _conf = require("@lingui/conf");
-const _compile = require("./api/compile");
-const _help = require("./api/help");
-const _api = require("./api");
-const _getCatalogs = require("./api/catalog/getCatalogs");
-const _utils = require("./api/utils");
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const chokidar_1 = __importDefault(require("chokidar"));
+const fs_1 = __importDefault(require("fs"));
+const commander_1 = require("commander");
+const conf_1 = require("@lingui/conf");
+const compile_1 = require("./api/compile");
+const help_1 = require("./api/help");
+const api_1 = require("./api");
+const getCatalogs_1 = require("./api/catalog/getCatalogs");
+const utils_1 = require("./api/utils");
+const path_1 = __importDefault(require("path"));
 async function command(config, options) {
-    const catalogs = await (0, _api.getCatalogs)(config);
+    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){
+    for (const locale of config.locales) {
+        for (const catalog of catalogs) {
             const missingMessages = [];
             const messages = await catalog.getTranslations(locale, {
                 fallbackLocales: config.fallbackLocales,
                 sourceLocale: config.sourceLocale,
-                onMissing: (missing)=>{
+                onMissing: (missing) => {
                     missingMessages.push(missing);
-                }
+                },
             });
             if (!options.allowEmpty && missingMessages.length > 0) {
-                console.error(_chalk.default.red(`Error: Failed to compile catalog for locale ${_chalk.default.bold(locale)}!`));
+                console.error(chalk_1.default.red(`Error: Failed to compile catalog for locale ${chalk_1.default.bold(locale)}!`));
                 if (options.verbose) {
-                    console.error(_chalk.default.red("Missing translations:"));
-                    missingMessages.forEach((missing)=>{
-                        const source = missing.source || missing.source === missing.id ? `: (${missing.source})` : "";
+                    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.default.red(`Missing ${missingMessages.length} translation(s)`));
+                }
+                else {
+                    console.error(chalk_1.default.red(`Missing ${missingMessages.length} translation(s)`));
                 }
                 console.error();
                 return false;
             }
             if (doMerge) {
-                mergedCatalogs = {
-                    ...mergedCatalogs,
-                    ...messages
-                };
-            } else {
-                const namespace = options.typescript ? "ts" : options.namespace || config.compileNamespace;
-                const compiledCatalog = (0, _compile.createCompiledCatalog)(locale, messages, {
+                mergedCatalogs = Object.assign(Object.assign({}, mergedCatalogs), messages);
+            }
+            else {
+                const namespace = options.typescript
+                    ? "ts"
+                    : options.namespace || config.compileNamespace;
+                const compiledCatalog = (0, compile_1.createCompiledCatalog)(locale, messages, {
                     strict: false,
                     namespace,
                     pseudoLocale: config.pseudoLocale,
-                    compilerBabelOptions: config.compilerBabelOptions
+                    compilerBabelOptions: config.compilerBabelOptions,
                 });
                 let compiledPath = await catalog.writeCompiled(locale, compiledCatalog, namespace);
                 if (options.typescript) {
                     const typescriptPath = compiledPath.replace(/\.ts?$/, "") + ".d.ts";
-                    _fs.default.writeFileSync(typescriptPath, `import { Messages } from '@lingui/core';
+                    fs_1.default.writeFileSync(typescriptPath, `import { Messages } from '@lingui/core';
           declare const messages: Messages;
           export { messages };
           `);
                 }
-                compiledPath = (0, _utils.normalizeSlashes)(_path.default.relative(config.rootDir, compiledPath));
-                options.verbose && console.error(_chalk.default.green(`${locale} ⇒ ${compiledPath}`));
+                compiledPath = (0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, compiledPath));
+                options.verbose &&
+                    console.error(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));
             }
         }
         if (doMerge) {
-            const compileCatalog = await (0, _getCatalogs.getCatalogForMerge)(config);
+            const compileCatalog = await (0, getCatalogs_1.getCatalogForMerge)(config);
             const namespace = options.namespace || config.compileNamespace;
-            const compiledCatalog = (0, _compile.createCompiledCatalog)(locale, mergedCatalogs, {
+            const compiledCatalog = (0, compile_1.createCompiledCatalog)(locale, mergedCatalogs, {
                 strict: false,
                 namespace: namespace,
                 pseudoLocale: config.pseudoLocale,
-                compilerBabelOptions: config.compilerBabelOptions
+                compilerBabelOptions: config.compilerBabelOptions,
             });
             let compiledPath = await compileCatalog.writeCompiled(locale, compiledCatalog, namespace);
-            compiledPath = (0, _utils.normalizeSlashes)(_path.default.relative(config.rootDir, compiledPath));
-            options.verbose && console.log(_chalk.default.green(`${locale} ⇒ ${compiledPath}`));
+            compiledPath = (0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, compiledPath));
+            options.verbose && console.log(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));
         }
     }
     return true;
 }
+exports.command = command;
 if (require.main === module) {
-    _commander.program.description("Add compile message catalogs and add language data (plurals) to compiled bundle.").option("--config <path>", "Path to the config file").option("--strict", "Disable defaults for missing translations").option("--verbose", "Verbose output").option("--typescript", "Create Typescript definition for compiled bundle").option("--namespace <namespace>", "Specify namespace for compiled bundle. Ex: cjs(default) -> module.exports, es -> export, window.test -> window.test").option("--watch", "Enables Watch Mode").option("--debounce <delay>", "Debounces compilation for given amount of milliseconds").on("--help", function() {
+    commander_1.program
+        .description("Add compile message catalogs and add language data (plurals) to compiled bundle.")
+        .option("--config <path>", "Path to the config file")
+        .option("--strict", "Disable defaults for missing translations")
+        .option("--verbose", "Verbose output")
+        .option("--typescript", "Create Typescript definition for compiled bundle")
+        .option("--namespace <namespace>", "Specify namespace for compiled bundle. Ex: cjs(default) -> module.exports, es -> export, window.test -> window.test")
+        .option("--watch", "Enables Watch Mode")
+        .option("--debounce <delay>", "Debounces compilation for given amount of milliseconds")
+        .on("--help", function () {
         console.log("\n  Examples:\n");
         console.log("    # Compile translations and use defaults or message IDs for missing translations");
-        console.log(`    $ ${(0, _help.helpRun)("compile")}`);
+        console.log(`    $ ${(0, help_1.helpRun)("compile")}`);
         console.log("");
         console.log("    # Compile translations but fail when there are missing");
         console.log("    # translations (don't replace missing translations with");
         console.log("    # default messages or message IDs)");
-        console.log(`    $ ${(0, _help.helpRun)("compile --strict")}`);
-    }).parse(process.argv);
-    const options = _commander.program.opts();
-    const config = (0, _conf.getConfig)({
-        configPath: options.config
-    });
+        console.log(`    $ ${(0, help_1.helpRun)("compile --strict")}`);
+    })
+        .parse(process.argv);
+    const options = commander_1.program.opts();
+    const config = (0, conf_1.getConfig)({ configPath: options.config });
     let previousRun = Promise.resolve(true);
-    const compile = ()=>{
-        previousRun = previousRun.then(()=>command(config, {
-                verbose: options.watch || options.verbose || false,
-                allowEmpty: !options.strict,
-                typescript: options.typescript || config.compileNamespace === "ts" || false,
-                namespace: options.namespace
-            }));
+    const compile = () => {
+        previousRun = previousRun.then(() => command(config, {
+            verbose: options.watch || options.verbose || false,
+            allowEmpty: !options.strict,
+            typescript: options.typescript || config.compileNamespace === "ts" || false,
+            namespace: options.namespace, // we want this to be undefined if user does not specify so default can be used
+        }));
         return previousRun;
     };
     let debounceTimer;
-    const dispatchCompile = ()=>{
+    const dispatchCompile = () => {
         // Skip debouncing if not enabled
-        if (!options.debounce) compile();
+        if (!options.debounce)
+            compile();
         // CLear the previous timer if there is any, and schedule the next
         debounceTimer && clearTimeout(debounceTimer);
-        debounceTimer = setTimeout(()=>compile(), options.debounce);
+        debounceTimer = setTimeout(() => compile(), options.debounce);
     };
     // Check if Watch Mode is enabled
     if (options.watch) {
-        console.info(_chalk.default.bold("Initializing Watch Mode..."));
+        console.info(chalk_1.default.bold("Initializing Watch Mode..."));
         (async function initWatch() {
-            const format = await (0, _api.getFormat)(config.format, config.formatOptions, config.sourceLocale);
-            const catalogs = await (0, _api.getCatalogs)(config);
+            const format = await (0, api_1.getFormat)(config.format, config.formatOptions, config.sourceLocale);
+            const catalogs = await (0, api_1.getCatalogs)(config);
             const paths = [];
-            config.locales.forEach((locale)=>{
-                catalogs.forEach((catalog)=>{
-                    paths.push(`${catalog.path.replace(/{locale}/g, locale).replace(/{name}/g, "*")}${format.getCatalogExtension()}`);
+            config.locales.forEach((locale) => {
+                catalogs.forEach((catalog) => {
+                    paths.push(`${catalog.path
+                        .replace(/{locale}/g, locale)
+                        .replace(/{name}/g, "*")}${format.getCatalogExtension()}`);
                 });
             });
-            const watcher = _chokidar.default.watch(paths, {
-                persistent: true
+            const watcher = chokidar_1.default.watch(paths, {
+                persistent: true,
             });
-            const onReady = ()=>{
-                console.info(_chalk.default.green.bold("Watcher is ready!"));
-                watcher.on("add", ()=>dispatchCompile()).on("change", ()=>dispatchCompile());
+            const onReady = () => {
+                console.info(chalk_1.default.green.bold("Watcher is ready!"));
+                watcher
+                    .on("add", () => dispatchCompile())
+                    .on("change", () => dispatchCompile());
             };
-            watcher.on("ready", ()=>onReady());
+            watcher.on("ready", () => onReady());
         })();
-    } else {
-        compile().then((results)=>{
+    }
+    else {
+        compile().then((results) => {
             if (!results) {
                 process.exit(1);
             }

package/dist/lingui-extract-experimental.d.ts

@@ -0,0 +1,10 @@
+import { LinguiConfigNormalized } from "@lingui/conf";
+export type CliExtractTemplateOptions = {
+    verbose: boolean;
+    files?: string[];
+    template?: boolean;
+    locales?: string[];
+    overwrite?: boolean;
+    clean?: boolean;
+};
+export default function command(linguiConfig: LinguiConfigNormalized, options: Partial<CliExtractTemplateOptions>): Promise<boolean>;

package/dist/lingui-extract-experimental.js

@@ -1,70 +1,60 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>command
-});
-const _commander = require("commander");
-const _conf = require("@lingui/conf");
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _os = /*#__PURE__*/ _interopRequireDefault(require("os"));
-const _formats = require("./api/formats");
-const _promises = /*#__PURE__*/ _interopRequireDefault(require("fs/promises"));
-const _extractFromFiles = require("./api/catalog/extractFromFiles");
-const _utils = require("./api/utils");
-const _bundleSource = require("./extract-experimental/bundleSource");
-const _writeCatalogs = require("./extract-experimental/writeCatalogs");
-const _getEntryPoints = require("./extract-experimental/getEntryPoints");
-const _chalk = /*#__PURE__*/ _interopRequireDefault(require("chalk"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = require("commander");
+const conf_1 = require("@lingui/conf");
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const formats_1 = require("./api/formats");
+const promises_1 = __importDefault(require("fs/promises"));
+const extractFromFiles_1 = require("./api/catalog/extractFromFiles");
+const utils_1 = require("./api/utils");
+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"));
 async function command(linguiConfig, options) {
-    var _linguiConfig_experimental;
+    var _a;
     options.verbose && console.log("Extracting messages from source files…");
-    const config = (_linguiConfig_experimental = linguiConfig.experimental) === null || _linguiConfig_experimental === void 0 ? void 0 : _linguiConfig_experimental.extractor;
+    const config = (_a = linguiConfig.experimental) === null || _a === void 0 ? void 0 : _a.extractor;
     if (!config) {
         throw new Error("The configuration for experimental extractor is empty. Please read the docs.");
     }
-    console.log(_chalk.default.yellow([
+    console.log(chalk_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.",
-        ""
+        "Experimental features are not covered by semver, and may cause unexpected or broken application behavior." +
+            " Use at your own risk.",
+        "",
     ].join("\n")));
-    const tempDir = await _promises.default.mkdtemp(_path.default.join(_os.default.tmpdir(), "js-lingui-extract-"));
-    await _promises.default.rm(tempDir, {
-        recursive: true,
-        force: true
-    });
-    const bundleResult = await (0, _bundleSource.bundleSource)(config, (0, _getEntryPoints.getEntryPoints)(config.entries), tempDir, linguiConfig.rootDir);
+    const tempDir = await promises_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), "js-lingui-extract-"));
+    await promises_1.default.rm(tempDir, { recursive: true, force: true });
+    const bundleResult = await (0, bundleSource_1.bundleSource)(config, (0, getEntryPoints_1.getEntryPoints)(config.entries), tempDir, linguiConfig.rootDir);
     const stats = [];
     let commandSuccess = true;
-    const format = await (0, _formats.getFormat)(linguiConfig.format, linguiConfig.formatOptions, linguiConfig.sourceLocale);
-    for (const outFile of Object.keys(bundleResult.metafile.outputs)){
-        const messages = await (0, _extractFromFiles.extractFromFiles)([
-            outFile
-        ], linguiConfig);
-        const { entryPoint  } = bundleResult.metafile.outputs[outFile];
+    const format = await (0, formats_1.getFormat)(linguiConfig.format, linguiConfig.formatOptions, linguiConfig.sourceLocale);
+    for (const outFile of Object.keys(bundleResult.metafile.outputs)) {
+        const messages = await (0, extractFromFiles_1.extractFromFiles)([outFile], linguiConfig);
+        const { entryPoint } = bundleResult.metafile.outputs[outFile];
         let output;
         if (!messages) {
             commandSuccess = false;
             continue;
         }
         if (options.template) {
-            output = (await (0, _writeCatalogs.writeTemplate)({
+            output = (await (0, writeCatalogs_1.writeTemplate)({
                 linguiConfig,
                 clean: options.clean,
                 format,
                 messages,
                 entryPoint,
-                outputPattern: config.output
+                outputPattern: config.output,
             })).statMessage;
-        } else {
-            output = (await (0, _writeCatalogs.writeCatalogs)({
+        }
+        else {
+            output = (await (0, writeCatalogs_1.writeCatalogs)({
                 locales: options.locales || linguiConfig.locales,
                 linguiConfig,
                 clean: options.clean,
@@ -72,42 +62,43 @@ async function command(linguiConfig, options) {
                 messages,
                 entryPoint,
                 overwrite: options.overwrite,
-                outputPattern: config.output
+                outputPattern: config.output,
             })).statMessage;
         }
         stats.push({
-            entry: (0, _utils.normalizeSlashes)(_path.default.relative(linguiConfig.rootDir, entryPoint)),
-            content: output
+            entry: (0, utils_1.normalizeSlashes)(path_1.default.relative(linguiConfig.rootDir, entryPoint)),
+            content: output,
         });
     }
     // cleanup temp directory
-    await _promises.default.rm(tempDir, {
-        recursive: true,
-        force: true
-    });
-    stats.forEach(({ entry , content  })=>{
-        console.log([
-            `Catalog statistics for ${entry}:`,
-            content,
-            ""
-        ].join("\n"));
+    await promises_1.default.rm(tempDir, { recursive: true, force: true });
+    stats.forEach(({ entry, content }) => {
+        console.log([`Catalog statistics for ${entry}:`, content, ""].join("\n"));
     });
     return commandSuccess;
 }
+exports.default = command;
 if (require.main === module) {
-    var _options_locale;
-    _commander.program.option("--config <path>", "Path to the config file").option("--template", "Extract to template").option("--overwrite", "Overwrite translations for source locale").option("--clean", "Remove obsolete translations").option("--locale <locale, [...]>", "Only extract the specified locales").option("--verbose", "Verbose output").parse(process.argv);
-    const options = _commander.program.opts();
-    const config = (0, _conf.getConfig)({
-        configPath: options.config
+    commander_1.program
+        .option("--config <path>", "Path to the config file")
+        .option("--template", "Extract to template")
+        .option("--overwrite", "Overwrite translations for source locale")
+        .option("--clean", "Remove obsolete translations")
+        .option("--locale <locale, [...]>", "Only extract the specified locales")
+        .option("--verbose", "Verbose output")
+        .parse(process.argv);
+    const options = commander_1.program.opts();
+    const config = (0, conf_1.getConfig)({
+        configPath: options.config,
     });
     const result = command(config, {
         verbose: options.verbose || false,
         template: options.template,
-        locales: (_options_locale = options.locale) === null || _options_locale === void 0 ? void 0 : _options_locale.split(","),
+        locales: (_a = options.locale) === null || _a === void 0 ? void 0 : _a.split(","),
         overwrite: options.overwrite,
-        clean: options.clean
-    }).then(()=>{
-        if (!result) process.exit(1);
+        clean: options.clean,
+    }).then(() => {
+        if (!result)
+            process.exit(1);
     });
 }

package/dist/lingui-extract-template.d.ts

@@ -0,0 +1,6 @@
+import { LinguiConfigNormalized } from "@lingui/conf";
+export type CliExtractTemplateOptions = {
+    verbose: boolean;
+    files?: string[];
+};
+export default function command(config: LinguiConfigNormalized, options: Partial<CliExtractTemplateOptions>): Promise<boolean>;

package/dist/lingui-extract-template.js

@@ -1,52 +1,46 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>command
-});
-const _chalk = /*#__PURE__*/ _interopRequireDefault(require("chalk"));
-const _commander = require("commander");
-const _conf = require("@lingui/conf");
-const _api = require("./api");
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _utils = require("./api/utils");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const commander_1 = require("commander");
+const conf_1 = require("@lingui/conf");
+const api_1 = require("./api");
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("./api/utils");
 async function command(config, options) {
     options.verbose && console.log("Extracting messages from source files…");
-    const catalogs = await (0, _api.getCatalogs)(config);
+    const catalogs = await (0, api_1.getCatalogs)(config);
     const catalogStats = {};
     let commandSuccess = true;
-    await Promise.all(catalogs.map(async (catalog)=>{
-        const result = await catalog.makeTemplate({
-            ...options,
-            orderBy: config.orderBy
-        });
+    await Promise.all(catalogs.map(async (catalog) => {
+        const result = await catalog.makeTemplate(Object.assign(Object.assign({}, options), { orderBy: config.orderBy }));
         if (result) {
-            catalogStats[(0, _utils.normalizeSlashes)(_path.default.relative(config.rootDir, catalog.templateFile))] = Object.keys(result).length;
+            catalogStats[(0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, catalog.templateFile))] = Object.keys(result).length;
         }
-        commandSuccess &&= Boolean(result);
+        commandSuccess && (commandSuccess = Boolean(result));
     }));
-    Object.entries(catalogStats).forEach(([key, value])=>{
-        console.log(`Catalog statistics for ${_chalk.default.bold(key)}: ${_chalk.default.green(value)} messages`);
+    Object.entries(catalogStats).forEach(([key, value]) => {
+        console.log(`Catalog statistics for ${chalk_1.default.bold(key)}: ${chalk_1.default.green(value)} messages`);
         console.log();
     });
     return commandSuccess;
 }
+exports.default = command;
 if (require.main === module) {
-    _commander.program.option("--config <path>", "Path to the config file").option("--verbose", "Verbose output").parse(process.argv);
-    const options = _commander.program.opts();
-    const config = (0, _conf.getConfig)({
-        configPath: options.config
+    commander_1.program
+        .option("--config <path>", "Path to the config file")
+        .option("--verbose", "Verbose output")
+        .parse(process.argv);
+    const options = commander_1.program.opts();
+    const config = (0, conf_1.getConfig)({
+        configPath: options.config,
     });
     const result = command(config, {
-        verbose: options.verbose || false
-    }).then(()=>{
-        if (!result) process.exit(1);
+        verbose: options.verbose || false,
+    }).then(() => {
+        if (!result)
+            process.exit(1);
     });
 }

package/dist/lingui-extract.d.ts

@@ -0,0 +1,11 @@
+import { LinguiConfigNormalized } from "@lingui/conf";
+export type CliExtractOptions = {
+    verbose: boolean;
+    files?: string[];
+    clean: boolean;
+    overwrite: boolean;
+    locale: string;
+    prevFormat: string | null;
+    watch?: boolean;
+};
+export default function command(config: LinguiConfigNormalized, options: Partial<CliExtractOptions>): Promise<boolean>;