@lingui/cli 6.0.0-next.0 → 6.0.0-next.2

package/dist/api/catalog/extractFromFiles.js

@@ -2,11 +2,20 @@ import { styleText } from "node:util";
 import path from "path";
 import extract from "../extractors/index.js";
 import { prettyOrigin } from "../utils.js";
+function compareOrigins(a, b) {
+    const byPath = a[0].localeCompare(b[0]);
+    if (byPath !== 0) {
+        return byPath;
+    }
+    const lineA = a[1] ?? 0;
+    const lineB = b[1] ?? 0;
+    return lineA - lineB;
+}
 function mergeOrigins(prev, next) {
     if (!next) {
         return prev;
     }
-    return [...prev, next].sort((a, b) => a[0].localeCompare(b[0]));
+    return [...prev, next].sort(compareOrigins);
 }
 function mergePlaceholders(prev, next) {
     const res = { ...prev };
@@ -77,8 +86,8 @@ export async function extractFromFilesWithWorkerPool(workerPool, paths, config)
     if (!resolvedConfigPath) {
         throw new Error("Multithreading is only supported when lingui config loaded from file system, not passed by API");
     }
-    await Promise.all(paths.map(async (filename) => {
-        const result = await workerPool.run(filename, resolvedConfigPath);
+    const results = await Promise.all(paths.map((filename) => workerPool.run(filename, resolvedConfigPath)));
+    results.forEach((result) => {
         if (!result.success) {
             catalogSuccess = false;
         }
@@ -87,7 +96,7 @@ export async function extractFromFilesWithWorkerPool(workerPool, paths, config)
                 mergeExtractedMessage(message, messages, config);
             });
         }
-    }));
+    });
     if (!catalogSuccess)
         return undefined;
     return messages;

package/dist/api/catalog/mergeCatalog.js

@@ -22,7 +22,7 @@ export function mergeCatalog(prevCatalog, nextCatalog, forSourceLocale, options)
             ? nextCatalog[key].message || key
             : prevCatalog[key].translation;
         const { extra } = prevCatalog[key];
-        return [key, { ...extra, ...nextCatalog[key], translation }];
+        return [key, { ...nextCatalog[key], extra, translation }];
     }));
     // Mark all remaining translations as obsolete
     // Only if *options.files* is not provided

package/dist/api/catalog.js

@@ -238,10 +238,10 @@ export async function writeCompiled(path, locale, compiledCatalog, namespace) {
     await writeFile(filename, compiledCatalog);
     return filename;
 }
+// hardcoded en-US locale to have consistent sorting
+// @see https://github.com/lingui/js-lingui/pull/1808
+const collator = new Intl.Collator("en-US");
 export const orderByMessage = (a, b) => {
-    // hardcoded en-US locale to have consistent sorting
-    // @see https://github.com/lingui/js-lingui/pull/1808
-    const collator = new Intl.Collator("en-US");
     const aMsg = a.entry.message || "";
     const bMsg = b.entry.message || "";
     const aCtxt = a.entry.context || "";

package/dist/api/compile.js

@@ -58,7 +58,7 @@ function buildExportStatement(expression, namespace) {
         ]));
     }
     else {
-        let exportExpression = null;
+        let exportExpression;
         const matches = namespace.match(/^(window|global)\.([^.\s]+)$/);
         if (namespace === "cjs") {
             // module.exports.messages = { message: "Translation" }

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

@@ -1,5 +1,5 @@
 import { ParserOptions } from "@babel/core";
-import { ExtractorType, LinguiConfigNormalized, ExtractedMessage, ExtractorCtx } from "@lingui/conf";
+import { ExtractorType, ExtractedMessage, ExtractorCtx } from "@lingui/conf";
 export declare const babelRe: RegExp;
 /**
  * @public
@@ -27,6 +27,22 @@ export declare const babelRe: RegExp;
  * ```
  */
 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: LinguiConfigNormalized["extractorParserOptions"]): (import("@babel/parser").ParserPluginWithOptions | ("decimal" | "asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decorators-legacy" | "deferredImportEvaluation" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "jsx" | "logicalAssignment" | "importAssertions" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "sourcePhaseImports" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "importAttributes" | "moduleAttributes" | "optionalChainingAssign" | "pipelineOperator" | "recordAndTuple" | "typescript"))[];
-declare const extractor: ExtractorType;
-export default extractor;
+export declare function getBabelParserOptions(filename: string, parserOptions: BabelExtractorOptions["parserOptions"]): (import("@babel/parser").ParserPluginWithOptions | ("decimal" | "asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decorators-legacy" | "deferredImportEvaluation" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "jsx" | "logicalAssignment" | "importAssertions" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "sourcePhaseImports" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "importAttributes" | "moduleAttributes" | "optionalChainingAssign" | "pipelineOperator" | "recordAndTuple" | "typescript"))[];
+export type BabelExtractorOptions = {
+    parserOptions?: {
+        /**
+         * default false
+         *
+         * By default, standard decorators (Stage3) are applied for TS files
+         * Enable this if you want to use TypesScript's experimental decorators.
+         */
+        tsExperimentalDecorators?: boolean;
+        /**
+         * Enable if you use flow. This will apply Flow syntax to js files
+         */
+        flow?: boolean;
+    };
+};
+export declare function createBabelExtractor(options?: BabelExtractorOptions): ExtractorType;
+export declare const babelExtractor: ExtractorType;
+export default babelExtractor;

package/dist/api/extractors/babel.js

@@ -131,7 +131,7 @@ export function getBabelParserOptions(filename, parserOptions) {
     ];
     if ([/\.ts$/, /\.mts$/, /\.cts$/, /\.tsx$/].some((r) => filename.match(r))) {
         parserPlugins.push("typescript");
-        if (parserOptions.tsExperimentalDecorators) {
+        if (parserOptions?.tsExperimentalDecorators) {
             parserPlugins.push("decorators-legacy");
         }
         else {
@@ -149,15 +149,18 @@ export function getBabelParserOptions(filename, parserOptions) {
     }
     return parserPlugins;
 }
-const extractor = {
-    match(filename) {
-        return babelRe.test(filename);
-    },
-    async extract(filename, code, onMessageExtracted, ctx) {
-        const parserOptions = ctx.linguiConfig.extractorParserOptions;
-        return extractFromFileWithBabel(filename, code, onMessageExtracted, ctx, {
-            plugins: getBabelParserOptions(filename, parserOptions),
-        });
-    },
-};
-export default extractor;
+export function createBabelExtractor(options) {
+    return {
+        match(filename) {
+            return babelRe.test(filename);
+        },
+        async extract(filename, code, onMessageExtracted, ctx) {
+            const parserOptions = options?.parserOptions ?? ctx.linguiConfig.extractorParserOptions;
+            return extractFromFileWithBabel(filename, code, onMessageExtracted, ctx, {
+                plugins: getBabelParserOptions(filename, parserOptions),
+            });
+        },
+    };
+}
+export const babelExtractor = createBabelExtractor();
+export default babelExtractor;

package/dist/api/extractors/index.js

@@ -1,8 +1,18 @@
 import fs from "fs/promises";
-import babel from "./babel.js";
-const DEFAULT_EXTRACTORS = [babel];
+import { createBabelExtractor } from "./babel.js";
+let defaultExtractor;
+function createDefaultExtractor(linguiConfig) {
+    if (!defaultExtractor) {
+        defaultExtractor = createBabelExtractor({
+            parserOptions: linguiConfig.extractorParserOptions,
+        });
+    }
+    return defaultExtractor;
+}
 export default async function extract(filename, onMessageExtracted, linguiConfig) {
-    const extractorsToExtract = linguiConfig.extractors ?? DEFAULT_EXTRACTORS;
+    const extractorsToExtract = linguiConfig.extractors ?? [
+        createDefaultExtractor(linguiConfig),
+    ];
     for (const ext of extractorsToExtract) {
         if (!ext.match(filename))
             continue;

package/dist/api/typedPool.js

@@ -1,4 +1,4 @@
-import Tinypool from "tinypool";
+import { Tinypool } from "tinypool";
 const createTypedPool = (options) => {
     const pool = new Tinypool(options);
     return {

package/dist/extract-experimental/extractFromBundleAndWrite.js

@@ -1,20 +1,13 @@
 import { mergeExtractedMessage } from "../api/catalog/extractFromFiles.js";
 import { writeCatalogs, writeTemplate } from "./writeCatalogs.js";
-import fs from "fs/promises";
-import { extractFromFileWithBabel, getBabelParserOptions, } from "../api/extractors/babel.js";
+import extract from "../api/extractors/index.js";
 async function extractFromBundle(filename, linguiConfig) {
     const messages = {};
     let success;
     try {
-        const file = await fs.readFile(filename);
-        const parserOptions = linguiConfig.extractorParserOptions;
-        await extractFromFileWithBabel(filename, file.toString(), (msg) => {
+        await extract(filename, (msg) => {
             mergeExtractedMessage(msg, messages, linguiConfig);
-        }, {
-            linguiConfig,
-        }, {
-            plugins: getBabelParserOptions(filename, parserOptions),
-        }, true);
+        }, linguiConfig);
         success = true;
     }
     catch (e) {

package/dist/extract-experimental/linguiEsbuildPlugin.js

@@ -20,7 +20,7 @@ export const pluginLinguiMacro = (options) => ({
                 filename: filename,
                 sourceMaps: "inline",
                 parserOpts: {
-                    plugins: getBabelParserOptions(filename, options.linguiConfig.extractorParserOptions),
+                    plugins: getBabelParserOptions(filename, {}),
                 },
                 plugins: [
                     [

package/dist/lingui-compile.js

@@ -1,5 +1,5 @@
 import { styleText } from "node:util";
-import chokidar from "chokidar";
+import { watch } from "chokidar";
 import { program } from "commander";
 import { getConfig } from "@lingui/conf";
 import { helpRun } from "./api/help.js";
@@ -116,7 +116,7 @@ if (import.meta.main) {
         console.info(styleText("bold", "Initializing Watch Mode..."));
         (async function initWatch() {
             const { paths } = await getPathsForCompileWatcher(config);
-            const watcher = chokidar.watch(paths, {
+            const watcher = watch(paths, {
                 persistent: true,
             });
             const onReady = () => {

package/dist/lingui-extract.js

@@ -1,5 +1,5 @@
 import { styleText } from "node:util";
-import chokidar from "chokidar";
+import { watch } from "chokidar";
 import { program } from "commander";
 import nodepath from "path";
 import { getConfig } from "@lingui/conf";
@@ -69,13 +69,14 @@ export default async function command(config, options) {
     if (config.service?.name?.length) {
         const moduleName = config.service.name.charAt(0).toLowerCase() + config.service.name.slice(1);
         const services = {
-            translationIO: () => import(`./services/translationIO.js`),
+            translationIO: () => import("./services/translationIO.js"),
         };
         if (!services[moduleName]) {
             console.error(`Can't load service module ${moduleName}`);
+            return false;
         }
         try {
-            const module = services[moduleName]();
+            const module = await services[moduleName]();
             await module
                 .default(config, options, extractionResult)
                 .then(console.log)
@@ -157,7 +158,7 @@ if (import.meta.main) {
             for await (const path of glob(paths)) {
                 matchedPaths.push(path);
             }
-            const watcher = chokidar.watch(matchedPaths, {
+            const watcher = watch(matchedPaths, {
                 ignored: [
                     "/(^|[/\\])../",
                     (path) => micromatch.any(path, ignored),

package/dist/services/translationIO.js

@@ -3,6 +3,8 @@ import { dirname } from "path";
 import { tioInit, tioSync, } from "./translationIO/translationio-api.js";
 import { order } from "../api/catalog.js";
 import { createLinguiItemFromSegment, createSegmentFromLinguiItem, } from "./translationIO/segment-converters.js";
+import { readFileSync } from "node:fs";
+import path from "node:path";
 const getTargetLocales = (config) => {
     const sourceLocale = config.sourceLocale || "en";
     const pseudoLocale = config.pseudoLocale || "pseudo";
@@ -29,6 +31,10 @@ export default async function syncProcess(config, options, extractionResult) {
     }
     return reportError(errors);
 }
+function getLinguiVersion() {
+    const packageJson = JSON.parse(readFileSync(path.resolve(import.meta.dirname, "../../package.json"), "utf8"));
+    return packageJson.version;
+}
 // Initialize project with source and existing translations (only first time!)
 // Cf. https://translation.io/docs/create-library#initialization
 export async function init(config, extractionResult) {
@@ -62,7 +68,7 @@ export async function init(config, extractionResult) {
     }
     const { data, error } = await tioInit({
         client: "lingui",
-        version: require("@lingui/core/package.json").version,
+        version: getLinguiVersion(),
         source_language: sourceLocale,
         target_languages: targetLocales,
         segments: segments,
@@ -93,7 +99,7 @@ export async function sync(config, options, extractionResult) {
     }
     const { data, error } = await tioSync({
         client: "lingui",
-        version: require("@lingui/core/package.json").version,
+        version: getLinguiVersion(),
         source_language: sourceLocale,
         target_languages: targetLocales,
         segments: segments,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "6.0.0-next.0",
+  "version": "6.0.0-next.2",
   "description": "CLI for working wit message catalogs",
   "type": "module",
   "keywords": [
@@ -50,12 +50,12 @@
     "@babel/generator": "^7.28.5",
     "@babel/parser": "^7.22.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "6.0.0-next.0",
-    "@lingui/babel-plugin-lingui-macro": "6.0.0-next.0",
-    "@lingui/conf": "6.0.0-next.0",
-    "@lingui/core": "6.0.0-next.0",
-    "@lingui/format-po": "6.0.0-next.0",
-    "@lingui/message-utils": "6.0.0-next.0",
+    "@lingui/babel-plugin-extract-messages": "6.0.0-next.2",
+    "@lingui/babel-plugin-lingui-macro": "6.0.0-next.2",
+    "@lingui/conf": "6.0.0-next.2",
+    "@lingui/core": "6.0.0-next.2",
+    "@lingui/format-po": "6.0.0-next.2",
+    "@lingui/message-utils": "6.0.0-next.2",
     "chokidar": "5.0.0",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
@@ -79,5 +79,5 @@
     "msw": "^2.12.7",
     "vitest": "4.0.18"
   },
-  "gitHead": "a9576050487a4f7dfbc88db20814d5a1bb861c8c"
+  "gitHead": "f4bcdd555ceef0bed58b2f3075096efd4daaeec2"
 }