@lingui/cli 6.5.0 → 6.6.0

package/dist/api/catalog/getCatalogs.js

@@ -43,13 +43,18 @@ export async function getCatalogs(config) {
         });
         candidates.forEach((catalogDir) => {
             const name = path.basename(catalogDir);
+            const globName = escapeCatalogNameForGlob(name);
             catalogs.push(new Catalog({
                 name,
                 path: normalizeRelativePath(replacePlaceholders(catalog.path, { name })),
                 include: include.map((path) => replacePlaceholders(path, { name })),
                 exclude: exclude.map((path) => replacePlaceholders(path, { name })),
                 format,
-            }, config));
+            }, config, {
+                path: replacePlaceholders(catalog.path, { name: globName }),
+                include: include.map((path) => replacePlaceholders(path, { name: globName })),
+                exclude: exclude.map((path) => replacePlaceholders(path, { name: globName })),
+            }));
         });
     });
     if (config.experimental?.extractor &&
@@ -58,6 +63,9 @@ export async function getCatalogs(config) {
     }
     return catalogs;
 }
+function escapeCatalogNameForGlob(value) {
+    return value.replace(/[[\]()]/g, "[$&]");
+}
 /**
  * Ensure that value is always array. If not, turn it into an array of one element.
  */

package/dist/api/catalog.d.ts

@@ -29,7 +29,13 @@ export type CatalogProps = {
     templatePath?: string;
     format: FormatterWrapper;
 };
+type CatalogGlobPatterns = {
+    path: string;
+    include: Array<string>;
+    exclude: Array<string>;
+};
 export declare class Catalog {
+    #private;
     config: LinguiConfigNormalized;
     name?: string;
     path: string;
@@ -37,7 +43,7 @@ export declare class Catalog {
     exclude: Array<string>;
     format: FormatterWrapper;
     templateFile: string;
-    constructor({ name, path, include, templatePath, format, exclude }: CatalogProps, config: LinguiConfigNormalized);
+    constructor({ name, path, include, templatePath, format, exclude }: CatalogProps, config: LinguiConfigNormalized, globPatterns?: CatalogGlobPatterns);
     getFilename(locale: string): string;
     make(options: MakeOptions): Promise<AllCatalogsType | false>;
     makeTemplate(options: MakeTemplateOptions): Promise<CatalogType | false>;
@@ -71,3 +77,4 @@ export declare function cleanObsolete<T extends CatalogType>(messages: T): T;
 export declare function order<T extends CatalogType>(by: OrderBy, catalog: T): T;
 export declare function writeCompiled(path: string, locale: string, compiledCatalog: string, namespace?: CompiledCatalogNamespace): Promise<string>;
 export declare const orderByMessage: OrderByFn;
+export {};

package/dist/api/catalog.js

@@ -17,12 +17,19 @@ export class Catalog {
     exclude;
     format;
     templateFile;
-    constructor({ name, path, include, templatePath, format, exclude = [] }, config) {
+    #includePatterns;
+    #excludePatterns;
+    constructor({ name, path, include, templatePath, format, exclude = [] }, config, globPatterns = { path, include, exclude }) {
         this.config = config;
         this.name = name;
         this.path = normalizeRelativePath(path);
         this.include = include.map(normalizeRelativePath);
         this.exclude = [this.localeDir, ...exclude.map(normalizeRelativePath)];
+        this.#includePatterns = createCatalogPatterns(this.include, globPatterns.include.map(normalizeRelativePath));
+        this.#excludePatterns = createCatalogPatterns(this.exclude, [
+            getLocaleDir(normalizeRelativePath(globPatterns.path)),
+            ...globPatterns.exclude.map(normalizeRelativePath),
+        ]);
         this.format = format;
         this.templateFile =
             templatePath ||
@@ -194,30 +201,54 @@ export class Catalog {
     async readTemplate() {
         return await this.format.read(this.templateFile, undefined);
     }
+    /** @internal */
+    get sourcePatterns() {
+        return {
+            include: resolveCatalogPatterns(this.include, this.#includePatterns),
+            exclude: resolveCatalogPatterns(this.exclude, this.#excludePatterns),
+        };
+    }
     get sourcePaths() {
-        const includeGlobs = this.include.map((includePath) => {
+        const sourcePatterns = this.sourcePatterns;
+        const includeGlobs = this.include.map((includePath, index) => {
+            const includeGlob = sourcePatterns.include[index];
             const isDir = isDirectory(includePath);
             /**
              * glob library results from absolute patterns such as /foo/* are mounted onto the root setting using path.join.
              * On windows, this will by default result in /foo/* matching C:\foo\bar.txt.
              */
             return isDir
-                ? normalize(path.resolve(process.cwd(), includePath === "/" ? "" : includePath, "**/*.*"))
-                : includePath;
+                ? normalize(path.resolve(process.cwd(), includePath === "/" ? "" : includeGlob, "**/*.*"))
+                : includeGlob;
         });
-        return globSync(includeGlobs, { exclude: this.exclude });
+        return globSync(includeGlobs, { exclude: sourcePatterns.exclude });
     }
     get localeDir() {
-        const localePatternIndex = this.path.indexOf(LOCALE);
-        if (localePatternIndex === -1) {
-            throw Error(`Invalid catalog path: ${LOCALE} variable is missing`);
-        }
-        return this.path.substring(0, localePatternIndex);
+        return getLocaleDir(this.path);
     }
     get locales() {
         return this.config.locales;
     }
 }
+function createCatalogPatterns(values, globs) {
+    return values.map((value, index) => ({
+        value,
+        glob: globs[index] ?? value,
+    }));
+}
+function resolveCatalogPatterns(values, patterns) {
+    return values.map((value, index) => {
+        const pattern = patterns[index];
+        return pattern?.value === value ? pattern.glob : value;
+    });
+}
+function getLocaleDir(catalogPath) {
+    const localePatternIndex = catalogPath.indexOf(LOCALE);
+    if (localePatternIndex === -1) {
+        throw Error(`Invalid catalog path: ${LOCALE} variable is missing`);
+    }
+    return catalogPath.substring(0, localePatternIndex);
+}
 function getTemplatePath(ext, path) {
     return path.replace(LOCALE_SUFFIX_RE, "messages" + ext);
 }

package/dist/api/getPathsForExtractWatcher.js

@@ -7,8 +7,9 @@ export async function getPathsForExtractWatcher(config) {
     const paths = [];
     const ignored = [];
     catalogs.forEach((catalog) => {
-        paths.push(...catalog.include);
-        ignored.push(...catalog.exclude);
+        const sourcePatterns = catalog.sourcePatterns;
+        paths.push(...sourcePatterns.include);
+        ignored.push(...sourcePatterns.exclude);
     });
     return { paths, ignored };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "Lingui CLI to extract messages, compile catalogs, and manage translation workflows",
   "type": "module",
   "keywords": [
@@ -54,12 +54,12 @@
     "@babel/generator": "^7.28.5",
     "@babel/parser": "^7.22.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "6.5.0",
-    "@lingui/babel-plugin-lingui-macro": "6.5.0",
-    "@lingui/conf": "6.5.0",
-    "@lingui/core": "6.5.0",
-    "@lingui/format-po": "6.5.0",
-    "@lingui/message-utils": "6.5.0",
+    "@lingui/babel-plugin-extract-messages": "6.6.0",
+    "@lingui/babel-plugin-lingui-macro": "6.6.0",
+    "@lingui/conf": "6.6.0",
+    "@lingui/core": "6.6.0",
+    "@lingui/format-po": "6.6.0",
+    "@lingui/message-utils": "6.6.0",
     "chokidar": "5.0.0",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
@@ -97,5 +97,5 @@
     "rolldown": "^1.1.1",
     "vitest": "catalog:"
   },
-  "gitHead": "9687149054666bbaf89196573ba597d0d6fd09e4"
+  "gitHead": "665a19815378dedd89346bb7707bdb0e28df79e7"
 }