@lingui/cli 6.2.0 → 6.4.0

package/dist/api/catalog/extractFromFiles.d.ts

@@ -1,6 +1,6 @@
 import type { ExtractedMessage, LinguiConfigNormalized } from "@lingui/conf";
 import { ExtractedCatalogType } from "../types.js";
-import { ExtractWorkerPool } from "../workerPools.js";
-export declare function extractFromFiles(paths: string[], config: LinguiConfigNormalized): Promise<ExtractedCatalogType | undefined>;
+import type { ExtractWorkerPool } from "../workerPools.js";
+export declare function extractFromFiles(paths: string[], onMessageExtracted: (msg: ExtractedMessage) => void, config: LinguiConfigNormalized): Promise<boolean>;
 export declare function mergeExtractedMessage(next: ExtractedMessage, messages: ExtractedCatalogType, config: LinguiConfigNormalized): void;
-export declare function extractFromFilesWithWorkerPool(workerPool: ExtractWorkerPool, paths: string[], config: LinguiConfigNormalized): Promise<ExtractedCatalogType | undefined>;
+export declare function extractFromFilesWithWorkerPool(workerPool: ExtractWorkerPool, paths: string[], onMessageExtracted: (msg: ExtractedMessage) => void, config: LinguiConfigNormalized): Promise<boolean>;

package/dist/api/catalog/extractFromFiles.js

@@ -33,18 +33,13 @@ function mergePlaceholders(prev, next) {
     });
     return res;
 }
-export async function extractFromFiles(paths, config) {
-    const messages = {};
+export async function extractFromFiles(paths, onMessageExtracted, config) {
     let catalogSuccess = true;
     for (const filename of paths) {
-        const fileSuccess = await extract(filename, (next) => {
-            mergeExtractedMessage(next, messages, config);
-        }, config);
+        const fileSuccess = await extract(filename, onMessageExtracted, config);
         catalogSuccess &&= fileSuccess;
     }
-    if (!catalogSuccess)
-        return undefined;
-    return messages;
+    return catalogSuccess;
 }
 export function mergeExtractedMessage(next, messages, config) {
     if (!messages[next.id]) {
@@ -79,13 +74,12 @@ export function mergeExtractedMessage(next, messages, config) {
         placeholders: mergePlaceholders(prev.placeholders, next.placeholders),
     };
 }
-export async function extractFromFilesWithWorkerPool(workerPool, paths, config) {
-    const messages = {};
-    let catalogSuccess = true;
+export async function extractFromFilesWithWorkerPool(workerPool, paths, onMessageExtracted, config) {
     const resolvedConfigPath = config.resolvedConfigPath;
     if (!resolvedConfigPath) {
         throw new Error("Multithreading is only supported when lingui config loaded from file system, not passed by API");
     }
+    let catalogSuccess = true;
     const results = await Promise.all(paths.map((filename) => workerPool.run(filename, resolvedConfigPath)));
     results.forEach((result) => {
         if (!result.success) {
@@ -93,11 +87,9 @@ export async function extractFromFilesWithWorkerPool(workerPool, paths, config)
         }
         else {
             result.messages.forEach((message) => {
-                mergeExtractedMessage(message, messages, config);
+                onMessageExtracted(message);
             });
         }
     });
-    if (!catalogSuccess)
-        return undefined;
-    return messages;
+    return catalogSuccess;
 }

package/dist/api/catalog.d.ts

@@ -48,6 +48,7 @@ export declare class Catalog {
         files?: string[];
         workerPool?: ExtractWorkerPool;
     }): Promise<ExtractedCatalogType | undefined>;
+    private collectWithExtractors;
     merge(prevCatalogs: AllCatalogsType, nextCatalog: ExtractedCatalogType, options: MergeOptions): {
         [k: string]: CatalogType;
     };

package/dist/api/catalog.js

@@ -4,8 +4,9 @@ import { globSync } from "node:fs";
 import normalize from "normalize-path";
 import { getTranslationsForCatalog, } from "./catalog/getTranslationsForCatalog.js";
 import { mergeCatalog } from "./catalog/mergeCatalog.js";
-import { extractFromFiles, extractFromFilesWithWorkerPool, } from "./catalog/extractFromFiles.js";
+import { extractFromFiles, extractFromFilesWithWorkerPool, mergeExtractedMessage, } from "./catalog/extractFromFiles.js";
 import { isDirectory, makePathRegexSafe, normalizeRelativePath, replacePlaceholders, writeFile, } from "./utils.js";
+import { getConfiguredExtractors, isBatchExtractor, } from "./extractors/index.js";
 const LOCALE = "{locale}";
 const LOCALE_SUFFIX_RE = /\{locale\}.*$/;
 export class Catalog {
@@ -75,10 +76,63 @@ export class Catalog {
             const regex = new RegExp(options.files.join("|"), "i");
             paths = paths.filter((path) => regex.test(normalize(path)));
         }
-        if (options.workerPool) {
-            return await extractFromFilesWithWorkerPool(options.workerPool, paths, this.config);
+        const messages = {};
+        const onMessageExtracted = (next) => {
+            mergeExtractedMessage(next, messages, this.config);
+        };
+        const extractors = getConfiguredExtractors(this.config);
+        // Optimized hot path: if there are no batch extractors defined, skip the more complex logic.
+        if (!extractors.some(isBatchExtractor)) {
+            const success = options.workerPool
+                ? await extractFromFilesWithWorkerPool(options.workerPool, paths, onMessageExtracted, this.config)
+                : await extractFromFiles(paths, onMessageExtracted, this.config);
+            return success ? messages : undefined;
         }
-        return await extractFromFiles(paths, this.config);
+        return await this.collectWithExtractors(extractors, paths, onMessageExtracted, messages, options);
+    }
+    async collectWithExtractors(extractors, paths, onMessageExtracted, messages, options) {
+        let remaining = paths;
+        let catalogSuccess = true;
+        for (const extractor of extractors) {
+            if (remaining.length === 0)
+                break;
+            const matched = [];
+            const unmatched = [];
+            for (const f of remaining) {
+                if (extractor.match(f)) {
+                    matched.push(f);
+                }
+                else {
+                    unmatched.push(f);
+                }
+            }
+            if (matched.length === 0)
+                continue;
+            remaining = unmatched;
+            if (isBatchExtractor(extractor)) {
+                try {
+                    await extractor.extractFromFiles(matched, onMessageExtracted, {
+                        linguiConfig: this.config,
+                    });
+                }
+                catch (e) {
+                    console.error(`Extractor failed: ${e.message}`);
+                    console.error(e.stack);
+                    catalogSuccess = false;
+                }
+            }
+            else {
+                const success = options.workerPool
+                    ? await extractFromFilesWithWorkerPool(options.workerPool, matched, onMessageExtracted, this.config)
+                    : await extractFromFiles(matched, onMessageExtracted, this.config);
+                if (!success) {
+                    catalogSuccess = false;
+                }
+            }
+        }
+        if (!catalogSuccess)
+            return undefined;
+        return messages;
     }
     /*
      *

package/dist/api/extractors/babel.js

@@ -109,6 +109,7 @@ export async function extractFromFileWithBabel(filename, code, onMessageExtracte
             [
                 linguiExtractMessages,
                 {
+                    linguiConfig: ctx.linguiConfig,
                     onMessageExtracted: (msg) => {
                         return onMessageExtracted({
                             ...msg,

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

@@ -1,2 +1,5 @@
-import { ExtractedMessage, LinguiConfigNormalized } from "@lingui/conf";
+import { Experimental__BatchExtractorType, ExtractedMessage, ExtractorType, LinguiConfigNormalized, PerFileExtractorType } from "@lingui/conf";
+export declare function isBatchExtractor(ext: ExtractorType): ext is Experimental__BatchExtractorType;
+export declare function isPerFileExtractor(ext: ExtractorType): ext is PerFileExtractorType;
+export declare const getConfiguredExtractors: (linguiConfig: LinguiConfigNormalized) => ExtractorType[];
 export default function extract(filename: string, onMessageExtracted: (msg: ExtractedMessage) => void, linguiConfig: LinguiConfigNormalized): Promise<boolean>;

package/dist/api/extractors/index.js

@@ -9,10 +9,17 @@ function createDefaultExtractor(linguiConfig) {
     }
     return defaultExtractor;
 }
+export function isBatchExtractor(ext) {
+    return "extractFromFiles" in ext && typeof ext.extractFromFiles === "function";
+}
+export function isPerFileExtractor(ext) {
+    return "extract" in ext && typeof ext.extract === "function";
+}
+export const getConfiguredExtractors = (linguiConfig) => {
+    return linguiConfig.extractors ?? [createDefaultExtractor(linguiConfig)];
+};
 export default async function extract(filename, onMessageExtracted, linguiConfig) {
-    const extractorsToExtract = linguiConfig.extractors ?? [
-        createDefaultExtractor(linguiConfig),
-    ];
+    const extractorsToExtract = getConfiguredExtractors(linguiConfig).filter(isPerFileExtractor);
     for (const ext of extractorsToExtract) {
         if (!ext.match(filename))
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "description": "Lingui CLI to extract messages, compile catalogs, and manage translation workflows",
   "type": "module",
   "keywords": [
@@ -52,12 +52,12 @@
     "@babel/generator": "^7.28.5",
     "@babel/parser": "^7.22.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "6.2.0",
-    "@lingui/babel-plugin-lingui-macro": "6.2.0",
-    "@lingui/conf": "6.2.0",
-    "@lingui/core": "6.2.0",
-    "@lingui/format-po": "6.2.0",
-    "@lingui/message-utils": "6.2.0",
+    "@lingui/babel-plugin-extract-messages": "6.4.0",
+    "@lingui/babel-plugin-lingui-macro": "6.4.0",
+    "@lingui/conf": "6.4.0",
+    "@lingui/core": "6.4.0",
+    "@lingui/format-po": "6.4.0",
+    "@lingui/message-utils": "6.4.0",
     "chokidar": "5.0.0",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
@@ -81,5 +81,5 @@
     "msw": "^2.12.7",
     "vitest": "catalog:"
   },
-  "gitHead": "9f2a37bc4a9e3de323b4b9094898e8f05cf05956"
+  "gitHead": "e8657bf8cbe6e8abc62a46a24e018ff9812918be"
 }