@lingui/cli 4.1.0 → 4.1.1

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

@@ -0,0 +1,5 @@
+import { Catalog } from "../catalog";
+/**
+ * Return all files catalog implicitly depends on.
+ */
+export declare function getCatalogDependentFiles(catalog: Catalog, locale: string): string[];

package/dist/api/catalog/getCatalogDependentFiles.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCatalogDependentFiles = void 0;
+const getFallbackListForLocale_1 = require("./getFallbackListForLocale");
+/**
+ * Return all files catalog implicitly depends on.
+ */
+function getCatalogDependentFiles(catalog, locale) {
+    const files = new Set([catalog.templateFile]);
+    (0, getFallbackListForLocale_1.getFallbackListForLocale)(catalog.config.fallbackLocales, locale).forEach((locale) => {
+        files.add(catalog.getFilename(locale));
+    });
+    if (catalog.config.sourceLocale && locale !== catalog.config.sourceLocale) {
+        files.add(catalog.getFilename(catalog.config.sourceLocale));
+    }
+    return Array.from(files.values());
+}
+exports.getCatalogDependentFiles = getCatalogDependentFiles;

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

@@ -0,0 +1,2 @@
+import { FallbackLocales } from "@lingui/conf";
+export declare function getFallbackListForLocale(fallbackLocales: FallbackLocales, locale: string): string[];

package/dist/api/catalog/getFallbackListForLocale.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFallbackListForLocale = void 0;
+function getFallbackListForLocale(fallbackLocales, locale) {
+    const fL = [];
+    if (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales[locale]) {
+        const mapping = fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales[locale];
+        Array.isArray(mapping) ? fL.push(...mapping) : fL.push(mapping);
+    }
+    if ((fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) && locale !== (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default)) {
+        fL.push(fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default);
+    }
+    return fL;
+}
+exports.getFallbackListForLocale = getFallbackListForLocale;

package/dist/api/catalog/getTranslationsForCatalog.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTranslationsForCatalog = void 0;
+const getFallbackListForLocale_1 = require("./getFallbackListForLocale");
 async function getTranslationsForCatalog(catalog, locale, options) {
     const catalogs = await catalog.readAll();
     const template = (await catalog.readTemplate()) || {};
@@ -26,20 +27,14 @@ function getTranslation(catalogs, msg, locale, key, options) {
         return (_a = localeCatalog === null || localeCatalog === void 0 ? void 0 : localeCatalog[key]) === null || _a === void 0 ? void 0 : _a.translation;
     };
     const getMultipleFallbacks = (_locale) => {
-        const fL = fallbackLocales && (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales[_locale]);
-        // some probably the fallback will be undefined, so just search by locale
-        if (!fL)
+        const fL = (0, getFallbackListForLocale_1.getFallbackListForLocale)(fallbackLocales, _locale);
+        if (!fL.length)
             return null;
-        if (Array.isArray(fL)) {
-            for (const fallbackLocale of fL) {
-                if (catalogs[fallbackLocale] && getTranslation(fallbackLocale)) {
-                    return getTranslation(fallbackLocale);
-                }
+        for (const fallbackLocale of fL) {
+            if (catalogs[fallbackLocale] && getTranslation(fallbackLocale)) {
+                return getTranslation(fallbackLocale);
             }
         }
-        else {
-            return getTranslation(fL);
-        }
     };
     // target locale -> fallback locales -> fallback locales default ->
     // ** (following fallbacks would emit `missing` warning) **
@@ -52,8 +47,6 @@ function getTranslation(catalogs, msg, locale, key, options) {
     getTranslation(locale) ||
         // We search in fallbackLocales as dependent of each locale
         getMultipleFallbacks(locale) ||
-        // Get translation in fallbackLocales.default (if any)
-        ((fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) && getTranslation(fallbackLocales.default)) ||
         (sourceLocale &&
             sourceLocale === locale &&
             sourceLocaleFallback(catalogs[sourceLocale], key));

package/dist/api/catalog.d.ts

@@ -33,6 +33,7 @@ export declare class Catalog {
     format: FormatterWrapper;
     templateFile?: string;
     constructor({ name, path, include, templatePath, format, exclude }: CatalogProps, config: LinguiConfigNormalized);
+    getFilename(locale: string): string;
     make(options: MakeOptions): Promise<AllCatalogsType | false>;
     makeTemplate(options: MakeTemplateOptions): Promise<CatalogType | false>;
     /**

package/dist/api/catalog.js

@@ -50,6 +50,10 @@ class Catalog {
             templatePath ||
                 getTemplatePath(this.format.getTemplateExtension(), this.path);
     }
+    getFilename(locale) {
+        return ((0, utils_1.replacePlaceholders)(this.path, { locale }) +
+            this.format.getCatalogExtension());
+    }
     async make(options) {
         const nextCatalog = await this.collect({ files: options.files });
         if (!nextCatalog)
@@ -119,8 +123,7 @@ class Catalog {
         return await (0, getTranslationsForCatalog_1.getTranslationsForCatalog)(this, locale, options);
     }
     async write(locale, messages) {
-        const filename = (0, utils_1.replacePlaceholders)(this.path, { locale }) +
-            this.format.getCatalogExtension();
+        const filename = this.getFilename(locale);
         const created = !fs_1.default.existsSync(filename);
         await this.format.write(filename, messages, locale);
         return [created, filename];
@@ -145,9 +148,7 @@ class Catalog {
         return filename;
     }
     async read(locale) {
-        const filename = (0, utils_1.replacePlaceholders)(this.path, { locale }) +
-            this.format.getCatalogExtension();
-        return await this.format.read(filename, locale);
+        return await this.format.read(this.getFilename(locale), locale);
     }
     async readAll() {
         const res = {};

package/dist/api/index.d.ts

@@ -2,4 +2,5 @@ export { getFormat } from "./formats";
 export { getCatalogForFile, getCatalogs } from "./catalog/getCatalogs";
 export { createCompiledCatalog } from "./compile";
 export { default as extractor } from "./extractors/babel";
+export { getCatalogDependentFiles } from "./catalog/getCatalogDependentFiles";
 export * from "./types";

package/dist/api/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractor = exports.createCompiledCatalog = exports.getCatalogs = exports.getCatalogForFile = exports.getFormat = void 0;
+exports.getCatalogDependentFiles = exports.extractor = exports.createCompiledCatalog = exports.getCatalogs = exports.getCatalogForFile = exports.getFormat = void 0;
 var formats_1 = require("./formats");
 Object.defineProperty(exports, "getFormat", { enumerable: true, get: function () { return formats_1.getFormat; } });
 var getCatalogs_1 = require("./catalog/getCatalogs");
@@ -27,4 +27,6 @@ var compile_1 = require("./compile");
 Object.defineProperty(exports, "createCompiledCatalog", { enumerable: true, get: function () { return compile_1.createCompiledCatalog; } });
 var babel_1 = require("./extractors/babel");
 Object.defineProperty(exports, "extractor", { enumerable: true, get: function () { return __importDefault(babel_1).default; } });
+var getCatalogDependentFiles_1 = require("./catalog/getCatalogDependentFiles");
+Object.defineProperty(exports, "getCatalogDependentFiles", { enumerable: true, get: function () { return getCatalogDependentFiles_1.getCatalogDependentFiles; } });
 __exportStar(require("./types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -9,7 +9,8 @@
     "i10n",
     "localization",
     "i9n",
-    "translation"
+    "translation",
+    "multilingual"
   ],
   "repository": "lingui/js-lingui",
   "bugs": "https://github.com/lingui/js-lingui/issues",
@@ -52,11 +53,11 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "4.1.0",
-    "@lingui/conf": "4.1.0",
-    "@lingui/core": "4.1.0",
-    "@lingui/format-po": "4.1.0",
-    "@lingui/message-utils": "4.1.0",
+    "@lingui/babel-plugin-extract-messages": "4.1.1",
+    "@lingui/conf": "4.1.1",
+    "@lingui/core": "4.1.1",
+    "@lingui/format-po": "4.1.1",
+    "@lingui/message-utils": "4.1.1",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -78,7 +79,7 @@
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
-    "@lingui/macro": "4.1.0",
+    "@lingui/macro": "4.1.1",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
@@ -86,5 +87,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "471813c5de9ade3acccf647e18922b570a804577"
+  "gitHead": "dad2c065901a9574bc117a8ef7ed75465ad713d0"
 }