@lingui/cli 4.11.2 → 5.0.0-next.0

package/dist/api/catalog/extractFromFiles.js

@@ -8,6 +8,18 @@ const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const extractors_1 = __importDefault(require("../extractors"));
 const utils_1 = require("../utils");
+function mergePlaceholders(prev, next) {
+    const res = Object.assign({}, prev);
+    Object.entries(next).forEach(([key, value]) => {
+        if (!res[key]) {
+            res[key] = [];
+        }
+        if (!res[key].includes(value)) {
+            res[key].push(value);
+        }
+    });
+    return res;
+}
 async function extractFromFiles(paths, config) {
     const messages = {};
     let catalogSuccess = true;
@@ -18,6 +30,7 @@ async function extractFromFiles(paths, config) {
                 messages[next.id] = {
                     message: next.message,
                     context: next.context,
+                    placeholders: {},
                     comments: [],
                     origin: [],
                 };
@@ -35,7 +48,7 @@ async function extractFromFiles(paths, config) {
             }
             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]]] });
+                    : prev.comments, origin: [...prev.origin, [filename, next.origin[1]]], placeholders: mergePlaceholders(prev.placeholders, next.placeholders) });
         }, config, {
             extractors: config.extractors,
         });

package/dist/api/catalog.js

@@ -70,7 +70,7 @@ class Catalog {
         // Sort messages
         order(options.orderBy)));
         const sortedCatalogs = cleanAndSort(catalogs);
-        const locales = options.locale ? [options.locale] : this.locales;
+        const locales = options.locale ? options.locale : this.locales;
         await Promise.all(locales.map((locale) => this.write(locale, sortedCatalogs[locale])));
         return sortedCatalogs;
     }

package/dist/api/extractors/babel.d.ts

@@ -1,6 +1,6 @@
 import { ParserOptions } from "@babel/core";
-import type { ExtractorType } from "@lingui/conf";
-import { ExtractedMessage, ExtractorCtx } from "@lingui/conf";
+import { ExtractorType, LinguiConfig, ExtractedMessage, ExtractorCtx } from "@lingui/conf";
+export declare const babelRe: RegExp;
 /**
  * @public
  *
@@ -26,6 +26,7 @@ import { ExtractedMessage, ExtractorCtx } from "@lingui/conf";
  * }
  * ```
  */
-export declare function extractFromFileWithBabel(filename: string, code: string, onMessageExtracted: (msg: ExtractedMessage) => void, ctx: ExtractorCtx, parserOpts: ParserOptions): Promise<void>;
+export declare function extractFromFileWithBabel(filename: string, code: string, onMessageExtracted: (msg: ExtractedMessage) => void, ctx: ExtractorCtx, parserOpts: ParserOptions, skipMacroPlugin?: boolean): Promise<void>;
+export declare function getBabelParserOptions(filename: string, parserOptions: LinguiConfig["extractorParserOptions"]): (import("@babel/parser").ParserPluginWithOptions | ("decimal" | "placeholders" | "asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decorators-legacy" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "jsx" | "logicalAssignment" | "importAssertions" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "privateIn" | "regexpUnicodeSets" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "moduleAttributes" | "pipelineOperator" | "recordAndTuple" | "typescript"))[];
 declare const extractor: ExtractorType;
 export default extractor;

package/dist/api/extractors/babel.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFromFileWithBabel = void 0;
+exports.getBabelParserOptions = exports.extractFromFileWithBabel = exports.babelRe = void 0;
 const core_1 = require("@babel/core");
 const babel_plugin_extract_messages_1 = __importDefault(require("@lingui/babel-plugin-extract-messages"));
-const babelRe = new RegExp("\\.(" +
+const babel_plugin_lingui_macro_1 = __importDefault(require("@lingui/babel-plugin-lingui-macro"));
+exports.babelRe = new RegExp("\\.(" +
     [...core_1.DEFAULT_EXTENSIONS, ".ts", ".mts", ".cts", ".tsx"]
         .map((ext) => ext.slice(1))
         .join("|") +
@@ -76,7 +77,7 @@ async function createSourceMapper(code, sourceMaps) {
  * }
  * ```
  */
-async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx, parserOpts) {
+async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx, parserOpts, skipMacroPlugin = false) {
     const mapper = await createSourceMapper(code, ctx === null || ctx === void 0 ? void 0 : ctx.sourceMaps);
     await (0, core_1.transformAsync)(code, {
         // don't generate code
@@ -87,20 +88,17 @@ async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx,
         inputSourceMap: ctx === null || ctx === void 0 ? void 0 : ctx.sourceMaps,
         parserOpts,
         plugins: [
-            [
-                "macros",
-                {
-                    // macro plugin uses package `resolve` to find a path of macro file
-                    // this will not follow jest pathMapping and will resolve path from ./build
-                    // instead of ./src which makes testing & developing hard.
-                    // here we override resolve and provide correct path for testing
-                    resolvePath: (source) => require.resolve(source),
-                    lingui: {
-                        extract: true,
-                        linguiConfig: ctx.linguiConfig,
-                    },
-                },
-            ],
+            ...(!skipMacroPlugin
+                ? [
+                    [
+                        babel_plugin_lingui_macro_1.default,
+                        {
+                            extract: true,
+                            linguiConfig: ctx.linguiConfig,
+                        },
+                    ],
+                ]
+                : []),
             [
                 babel_plugin_extract_messages_1.default,
                 {
@@ -114,34 +112,38 @@ async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx,
     mapper.destroy();
 }
 exports.extractFromFileWithBabel = extractFromFileWithBabel;
-const extractor = {
-    match(filename) {
-        return babelRe.test(filename);
-    },
-    async extract(filename, code, onMessageExtracted, ctx) {
-        const parserOptions = ctx.linguiConfig.extractorParserOptions;
-        // https://babeljs.io/docs/en/babel-parser#latest-ecmascript-features
-        const parserPlugins = [];
-        if ([/\.ts$/, /\.mts$/, /\.cts$/, /\.tsx$/].some((r) => filename.match(r))) {
-            parserPlugins.push("typescript");
-            if (parserOptions.tsExperimentalDecorators) {
-                parserPlugins.push("decorators-legacy");
-            }
-            else {
-                parserPlugins.push("decorators");
-            }
+function getBabelParserOptions(filename, parserOptions) {
+    // https://babeljs.io/docs/en/babel-parser#latest-ecmascript-features
+    const parserPlugins = [];
+    if ([/\.ts$/, /\.mts$/, /\.cts$/, /\.tsx$/].some((r) => filename.match(r))) {
+        parserPlugins.push("typescript");
+        if (parserOptions.tsExperimentalDecorators) {
+            parserPlugins.push("decorators-legacy");
         }
         else {
             parserPlugins.push("decorators");
-            if (parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.flow) {
-                parserPlugins.push("flow");
-            }
         }
-        if ([/\.js$/, /\.jsx$/, /\.tsx$/].some((r) => filename.match(r))) {
-            parserPlugins.push("jsx");
+    }
+    else {
+        parserPlugins.push("decorators");
+        if (parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.flow) {
+            parserPlugins.push("flow");
         }
+    }
+    if ([/\.js$/, /\.jsx$/, /\.tsx$/].some((r) => filename.match(r))) {
+        parserPlugins.push("jsx");
+    }
+    return parserPlugins;
+}
+exports.getBabelParserOptions = getBabelParserOptions;
+const extractor = {
+    match(filename) {
+        return exports.babelRe.test(filename);
+    },
+    async extract(filename, code, onMessageExtracted, ctx) {
+        const parserOptions = ctx.linguiConfig.extractorParserOptions;
         return extractFromFileWithBabel(filename, code, onMessageExtracted, ctx, {
-            plugins: parserPlugins,
+            plugins: getBabelParserOptions(filename, parserOptions),
         });
     },
 };

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

@@ -1,2 +1,2 @@
-import { ExperimentalExtractorOptions } from "@lingui/conf";
-export declare function bundleSource(config: ExperimentalExtractorOptions, entryPoints: string[], outDir: string, rootDir: string): Promise<import("esbuild").BuildResult<any>>;
+import { LinguiConfigNormalized } from "@lingui/conf";
+export declare function bundleSource(linguiConfig: LinguiConfigNormalized, entryPoints: string[], outDir: string, rootDir: string): Promise<import("esbuild").BuildResult<any>>;

package/dist/extract-experimental/bundleSource.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundleSource = void 0;
-const buildExternalizeFilter_1 = require("./buildExternalizeFilter");
+const linguiEsbuildPlugin_1 = require("./linguiEsbuildPlugin");
 function createExtRegExp(extensions) {
     return new RegExp("\\.(?:" + extensions.join("|") + ")(?:\\?.*)?$");
 }
-async function bundleSource(config, entryPoints, outDir, rootDir) {
+async function bundleSource(linguiConfig, entryPoints, outDir, rootDir) {
     const esbuild = await import("esbuild");
+    const config = linguiConfig.experimental.extractor;
     const excludeExtensions = config.excludeExtensions || [
         "ico",
         "pot",
@@ -26,7 +27,6 @@ async function bundleSource(config, entryPoints, outDir, rootDir) {
         "less",
         "jpg",
     ];
-    const packageJson = await (0, buildExternalizeFilter_1.getPackageJson)(rootDir);
     const esbuildOptions = {
         entryPoints: entryPoints,
         outExtension: { ".js": ".jsx" },
@@ -41,27 +41,11 @@ async function bundleSource(config, entryPoints, outDir, rootDir) {
         sourcemap: "inline",
         sourceRoot: outDir,
         sourcesContent: false,
+        packages: "external",
         outbase: rootDir,
         metafile: true,
         plugins: [
-            {
-                name: "externalize-deps",
-                setup(build) {
-                    const isExternal = (0, buildExternalizeFilter_1.buildExternalizeFilter)({
-                        includeDeps: config.includeDeps || [],
-                        excludeDeps: config.excludeDeps || [],
-                        packageJson,
-                    });
-                    // externalize bare imports
-                    build.onResolve({ filter: /^[^.].*/ }, async ({ path: id }) => {
-                        if (isExternal(id)) {
-                            return {
-                                external: true,
-                            };
-                        }
-                    });
-                },
-            },
+            (0, linguiEsbuildPlugin_1.pluginLinguiMacro)({ linguiConfig }),
             {
                 name: "externalize-files",
                 setup(build) {

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

@@ -0,0 +1,5 @@
+import { Plugin } from "esbuild";
+import { LinguiConfigNormalized } from "@lingui/conf";
+export declare const pluginLinguiMacro: (options: {
+    linguiConfig: LinguiConfigNormalized;
+}) => Plugin;

package/dist/extract-experimental/linguiEsbuildPlugin.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginLinguiMacro = void 0;
+const core_1 = require("@babel/core");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const babel_1 = require("../api/extractors/babel");
+const babel_plugin_lingui_macro_1 = __importDefault(require("@lingui/babel-plugin-lingui-macro"));
+const pluginLinguiMacro = (options) => ({
+    name: "linguiMacro",
+    setup(build) {
+        build.onLoad({ filter: babel_1.babelRe, namespace: "" }, async (args) => {
+            const filename = path_1.default.relative(process.cwd(), args.path);
+            const contents = await fs_1.default.promises.readFile(args.path, "utf8");
+            const hasMacroRe = /from ["']@lingui(\/.+)?\/macro["']/g;
+            if (!hasMacroRe.test(contents)) {
+                // let esbuild process file as usual
+                return undefined;
+            }
+            const result = await (0, core_1.transformAsync)(contents, {
+                babelrc: false,
+                configFile: false,
+                filename: filename,
+                sourceMaps: "inline",
+                parserOpts: {
+                    plugins: (0, babel_1.getBabelParserOptions)(filename, options.linguiConfig.extractorParserOptions),
+                },
+                plugins: [
+                    [
+                        babel_plugin_lingui_macro_1.default,
+                        {
+                            extract: true,
+                            linguiConfig: options.linguiConfig,
+                        },
+                    ],
+                ],
+            });
+            return { contents: result.code, loader: "jsx" };
+        });
+    },
+});
+exports.pluginLinguiMacro = pluginLinguiMacro;

package/dist/lingui-extract-experimental.js

@@ -16,6 +16,7 @@ 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 babel_1 = require("./api/extractors/babel");
 async function command(linguiConfig, options) {
     var _a;
     options.verbose && console.log("Extracting messages from source files…");
@@ -31,10 +32,23 @@ async function command(linguiConfig, options) {
     ].join("\n")));
     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 bundleResult = await (0, bundleSource_1.bundleSource)(linguiConfig, (0, getEntryPoints_1.getEntryPoints)(config.entries), tempDir, linguiConfig.rootDir);
     const stats = [];
     let commandSuccess = true;
     const format = await (0, formats_1.getFormat)(linguiConfig.format, linguiConfig.formatOptions, linguiConfig.sourceLocale);
+    linguiConfig.extractors = [
+        {
+            match(_filename) {
+                return true;
+            },
+            async extract(filename, code, onMessageExtracted, ctx) {
+                const parserOptions = ctx.linguiConfig.extractorParserOptions;
+                return (0, babel_1.extractFromFileWithBabel)(filename, code, onMessageExtracted, ctx, {
+                    plugins: (0, babel_1.getBabelParserOptions)(filename, parserOptions),
+                }, true);
+            },
+        },
+    ];
     for (const outFile of Object.keys(bundleResult.metafile.outputs)) {
         const messages = await (0, extractFromFiles_1.extractFromFiles)([outFile], linguiConfig);
         const { entryPoint } = bundleResult.metafile.outputs[outFile];

package/dist/lingui-extract.d.ts

@@ -4,7 +4,7 @@ export type CliExtractOptions = {
     files?: string[];
     clean: boolean;
     overwrite: boolean;
-    locale: string;
+    locale: string[];
     prevFormat: string | null;
     watch?: boolean;
 };

package/dist/lingui-extract.js

@@ -61,7 +61,12 @@ exports.default = command;
 if (require.main === module) {
     commander_1.program
         .option("--config <path>", "Path to the config file")
-        .option("--locale <locale>", "Only extract the specified locale")
+        .option("--locale <locale, [...]>", "Only extract the specified locales", (value) => {
+        return value
+            .split(",")
+            .map((s) => s.trim())
+            .filter(Boolean);
+    })
         .option("--overwrite", "Overwrite translations for source locale")
         .option("--clean", "Remove obsolete translations")
         .option("--debounce <delay>", "Debounces extraction for given amount of milliseconds")
@@ -85,10 +90,13 @@ if (require.main === module) {
         console.log(chalk_1.default.yellow((0, help_1.helpRun)(`extract --convert-from lingui`)));
         process.exit(1);
     }
-    if (options.locale && !config.locales.includes(options.locale)) {
-        hasErrors = true;
-        console.error(`Locale ${chalk_1.default.bold(options.locale)} does not exist.`);
-        console.error();
+    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();
+        }
     }
     if (hasErrors)
         process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.11.2",
+  "version": "5.0.0-next.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,11 +53,12 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "4.11.2",
-    "@lingui/conf": "4.11.2",
-    "@lingui/core": "4.11.2",
-    "@lingui/format-po": "4.11.2",
-    "@lingui/message-utils": "4.11.2",
+    "@lingui/babel-plugin-extract-messages": "^5.0.0-next.0",
+    "@lingui/babel-plugin-lingui-macro": "^5.0.0-next.0",
+    "@lingui/conf": "^5.0.0-next.0",
+    "@lingui/core": "^5.0.0-next.0",
+    "@lingui/format-po": "^5.0.0-next.0",
+    "@lingui/message-utils": "^5.0.0-next.0",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -65,7 +66,7 @@
     "commander": "^10.0.0",
     "convert-source-map": "^2.0.0",
     "date-fns": "^3.6.0",
-    "esbuild": "^0.17.10",
+    "esbuild": "^0.21.5",
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
     "micromatch": "4.0.2",
@@ -79,8 +80,7 @@
     "source-map": "^0.8.0-beta.0"
   },
   "devDependencies": {
-    "@lingui/jest-mocks": "*",
-    "@lingui/macro": "4.11.2",
+    "@lingui/jest-mocks": "^3.0.3",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
@@ -88,5 +88,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "17e0af54b0b9d9577db2cef1be680a6d871611e7"
+  "gitHead": "2192f8d54699a3846ff8fe6f3992697be2da68a8"
 }

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

@@ -1,13 +0,0 @@
-type PackageJson = {
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-    peerDependencies?: Record<string, string>;
-    optionalDependencies?: Record<string, string>;
-};
-export declare function buildExternalizeFilter({ includeDeps, excludeDeps, packageJson, }: {
-    includeDeps: string[];
-    excludeDeps: string[];
-    packageJson: PackageJson;
-}): (id: string) => boolean;
-export declare function getPackageJson(rootDir: string): Promise<PackageJson>;
-export {};

package/dist/extract-experimental/buildExternalizeFilter.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJson = exports.buildExternalizeFilter = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-function createPackageRegExp(packageName) {
-    return new RegExp("^" + packageName + "(?:\\/.+)?");
-}
-function packages(packages, includeDeps) {
-    return Object.keys(packages || {})
-        .filter((packageName) => {
-        return !includeDeps.some((incl) => packageName.startsWith(incl));
-    })
-        .map(createPackageRegExp);
-}
-function buildExternalizeFilter({ includeDeps, excludeDeps, packageJson, }) {
-    const external = [
-        ...packages(packageJson.dependencies, includeDeps),
-        ...packages(packageJson.devDependencies, includeDeps),
-        ...packages(packageJson.peerDependencies, includeDeps),
-        ...packages(packageJson.optionalDependencies, includeDeps),
-        ...excludeDeps.map(createPackageRegExp),
-    ];
-    return (id) => external.some((regExp) => {
-        return regExp.test(id);
-    });
-}
-exports.buildExternalizeFilter = buildExternalizeFilter;
-async function getPackageJson(rootDir) {
-    const { default: pkgUp } = await import("pkg-up");
-    const packageJsonPath = await pkgUp({
-        cwd: rootDir,
-    });
-    if (!packageJsonPath) {
-        throw new Error("We could not able to find your package.json file. " +
-            "Check that `rootDir` is pointing to the folder with package.json");
-    }
-    try {
-        return JSON.parse(await node_fs_1.default.promises.readFile(packageJsonPath, "utf-8"));
-    }
-    catch (e) {
-        throw new Error(`Unable to read package.json file at path ${packageJsonPath}. \n\n Error: ${e.message}`);
-    }
-}
-exports.getPackageJson = getPackageJson;