@lingui/cli 5.1.1 → 5.2.0

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

@@ -1,5 +1,3 @@
 import type { LinguiConfigNormalized } from "@lingui/conf";
 import { ExtractedCatalogType } from "../types";
-export declare function extractFromFiles(paths: string[], config: LinguiConfigNormalized): Promise<ExtractedCatalogType<{
-    [x: string]: unknown;
-}>>;
+export declare function extractFromFiles(paths: string[], config: LinguiConfigNormalized): Promise<ExtractedCatalogType>;

package/dist/api/catalog/extractFromFiles.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFromFiles = void 0;
+exports.extractFromFiles = extractFromFiles;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const extractors_1 = __importDefault(require("../extractors"));
@@ -23,7 +23,7 @@ function mergePlaceholders(prev, next) {
 async function extractFromFiles(paths, config) {
     const messages = {};
     let catalogSuccess = true;
-    for (let filename of paths) {
+    for (const filename of paths) {
         const fileSuccess = await (0, extractors_1.default)(filename, (next) => {
             var _a;
             if (!messages[next.id]) {
@@ -58,4 +58,3 @@ async function extractFromFiles(paths, config) {
         return undefined;
     return messages;
 }
-exports.extractFromFiles = extractFromFiles;

package/dist/api/catalog/getCatalogDependentFiles.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCatalogDependentFiles = void 0;
+exports.getCatalogDependentFiles = getCatalogDependentFiles;
 const getFallbackListForLocale_1 = require("./getFallbackListForLocale");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -52,4 +62,3 @@ async function getCatalogDependentFiles(catalog, locale) {
     }
     return out;
 }
-exports.getCatalogDependentFiles = getCatalogDependentFiles;

package/dist/api/catalog/getCatalogs.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCatalogForFile = exports.getCatalogForMerge = exports.getCatalogs = void 0;
+exports.getCatalogs = getCatalogs;
+exports.getCatalogForMerge = getCatalogForMerge;
+exports.getCatalogForFile = getCatalogForFile;
 const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
 const catalog_1 = require("../catalog");
@@ -65,7 +67,6 @@ async function getCatalogs(config) {
     }
     return catalogs;
 }
-exports.getCatalogs = getCatalogs;
 /**
  * Ensure that value is always array. If not, turn it into an array of one element.
  */
@@ -88,7 +89,6 @@ async function getCatalogForMerge(config) {
         format,
     }, config);
 }
-exports.getCatalogForMerge = getCatalogForMerge;
 function getCatalogForFile(file, catalogs) {
     for (const catalog of catalogs) {
         const catalogFile = `${catalog.path}${catalog.format.getCatalogExtension()}`;
@@ -104,7 +104,6 @@ function getCatalogForFile(file, catalogs) {
     }
     return null;
 }
-exports.getCatalogForFile = getCatalogForFile;
 /**
  *  Validate that `catalogPath` doesn't end with trailing slash
  */

package/dist/api/catalog/getFallbackListForLocale.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFallbackListForLocale = void 0;
+exports.getFallbackListForLocale = getFallbackListForLocale;
 function getFallbackListForLocale(fallbackLocales, locale) {
     const fL = [];
     if (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales[locale]) {
@@ -12,4 +12,3 @@ function getFallbackListForLocale(fallbackLocales, locale) {
     }
     return fL;
 }
-exports.getFallbackListForLocale = getFallbackListForLocale;

package/dist/api/catalog/getTranslationsForCatalog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTranslationsForCatalog = void 0;
+exports.getTranslationsForCatalog = getTranslationsForCatalog;
 const getFallbackListForLocale_1 = require("./getFallbackListForLocale");
 async function getTranslationsForCatalog(catalog, locale, options) {
     const [catalogs, template] = await Promise.all([
@@ -14,7 +14,6 @@ async function getTranslationsForCatalog(catalog, locale, options) {
         return acc;
     }, {});
 }
-exports.getTranslationsForCatalog = getTranslationsForCatalog;
 function sourceLocaleFallback(catalog, key) {
     if (!(catalog === null || catalog === void 0 ? void 0 : catalog[key])) {
         return null;
@@ -44,7 +43,7 @@ function getTranslation(catalogs, msg, locale, key, options) {
     // -> template message
     // ** last resort **
     // -> id
-    let translation = 
+    const translation = 
     // Get translation in target locale
     getTranslation(locale) ||
         // We search in fallbackLocales as dependent of each locale
@@ -53,11 +52,10 @@ function getTranslation(catalogs, msg, locale, key, options) {
             sourceLocale === locale &&
             sourceLocaleFallback(catalogs[sourceLocale], key));
     if (!translation) {
-        onMissing &&
-            onMissing({
-                id: key,
-                source: msg.message || sourceLocaleFallback(catalogs[sourceLocale], key),
-            });
+        onMissing === null || onMissing === void 0 ? void 0 : onMissing({
+            id: key,
+            source: msg.message || sourceLocaleFallback(catalogs[sourceLocale], key),
+        });
     }
     return (translation ||
         (sourceLocale && sourceLocaleFallback(catalogs[sourceLocale], key)) ||

package/dist/api/catalog/mergeCatalog.js

@@ -1,55 +1,44 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeCatalog = void 0;
-const R = __importStar(require("ramda"));
+exports.mergeCatalog = mergeCatalog;
 function mergeCatalog(prevCatalog, nextCatalog, forSourceLocale, options) {
     const nextKeys = Object.keys(nextCatalog);
-    const prevKeys = R.keys(prevCatalog).map(String);
-    const newKeys = R.difference(nextKeys, prevKeys);
-    const mergeKeys = R.intersection(nextKeys, prevKeys);
-    const obsoleteKeys = R.difference(prevKeys, nextKeys);
+    const prevKeys = Object.keys(prevCatalog || {});
+    const newKeys = nextKeys.filter((key) => !prevKeys.includes(key));
+    const mergeKeys = nextKeys.filter((key) => prevKeys.includes(key));
+    const obsoleteKeys = prevKeys.filter((key) => !nextKeys.includes(key));
     // Initialize new catalog with new keys
-    const newMessages = R.mapObjIndexed((message, key) => (Object.assign({ translation: forSourceLocale ? message.message || key : "" }, message)), R.pick(newKeys, nextCatalog));
+    const newMessages = Object.fromEntries(newKeys.map((key) => [
+        key,
+        Object.assign({ translation: forSourceLocale ? nextCatalog[key].message || key : "" }, nextCatalog[key]),
+    ]));
     // Merge translations from previous catalog
-    const mergedMessages = mergeKeys.map((key) => {
+    const mergedMessages = Object.fromEntries(mergeKeys.map((key) => {
         const updateFromDefaults = forSourceLocale &&
             (prevCatalog[key].translation === prevCatalog[key].message ||
                 options.overwrite);
         const translation = updateFromDefaults
             ? nextCatalog[key].message || key
             : prevCatalog[key].translation;
-        return {
-            [key]: Object.assign({ translation }, R.omit(["obsolete, translation"], nextCatalog[key])),
-        };
-    });
+        const _a = nextCatalog[key], { obsolete } = _a, rest = __rest(_a, ["obsolete"]);
+        return [key, Object.assign(Object.assign({}, rest), { translation })];
+    }));
     // Mark all remaining translations as obsolete
     // Only if *options.files* is not provided
-    const obsoleteMessages = obsoleteKeys.map((key) => ({
-        [key]: Object.assign(Object.assign({}, prevCatalog[key]), (!options.files && { obsolete: true })),
-    }));
-    return R.mergeAll([newMessages, ...mergedMessages, ...obsoleteMessages]);
+    const obsoleteMessages = Object.fromEntries(obsoleteKeys.map((key) => [
+        key,
+        Object.assign(Object.assign({}, prevCatalog[key]), (options.files ? {} : { obsolete: true })),
+    ]));
+    return Object.assign(Object.assign(Object.assign({}, newMessages), mergedMessages), obsoleteMessages);
 }
-exports.mergeCatalog = mergeCatalog;

package/dist/api/catalog.d.ts

@@ -1,11 +1,10 @@
-import * as R from "ramda";
 import { LinguiConfigNormalized, OrderBy } from "@lingui/conf";
 import { FormatterWrapper } from "./formats";
 import { CliExtractOptions } from "../lingui-extract";
 import { CliExtractTemplateOptions } from "../lingui-extract-template";
 import { CompiledCatalogNamespace } from "./compile";
 import { GetTranslationsOptions } from "./catalog/getTranslationsForCatalog";
-import { AllCatalogsType, CatalogType, ExtractedCatalogType, ExtractedMessageType } from "./types";
+import { AllCatalogsType, CatalogType, ExtractedCatalogType } from "./types";
 export type MakeOptions = CliExtractOptions & {
     orderBy?: OrderBy;
 };
@@ -42,9 +41,9 @@ export declare class Catalog {
     collect(options?: {
         files?: string[];
     }): Promise<ExtractedCatalogType | undefined>;
-    merge(prevCatalogs: AllCatalogsType, nextCatalog: ExtractedCatalogType, options: MergeOptions): Record<string, CatalogType<{
-        [x: string]: unknown;
-    }>>;
+    merge(prevCatalogs: AllCatalogsType, nextCatalog: ExtractedCatalogType, options: MergeOptions): {
+        [k: string]: CatalogType;
+    };
     getTranslations(locale: string, options: GetTranslationsOptions): Promise<{
         [id: string]: string;
     }>;
@@ -58,10 +57,6 @@ export declare class Catalog {
     get localeDir(): string;
     get locales(): string[];
 }
-export declare const cleanObsolete: <K extends ExtractedMessageType<{
-    [x: string]: unknown;
-}>[] | R.Dictionary<ExtractedMessageType<{
-    [x: string]: unknown;
-}>>>(source: K) => K extends (infer U)[] ? U[] : K extends R.Dictionary<infer U_1> ? R.Dictionary<U_1> : never;
-export declare function order<T extends ExtractedCatalogType>(by: OrderBy): (catalog: T) => T;
+export declare function cleanObsolete<T extends ExtractedCatalogType>(messages: T): T;
+export declare function order<T extends ExtractedCatalogType>(by: OrderBy, catalog: T): T;
 export declare function orderByMessage<T extends ExtractedCatalogType>(messages: T): T;

package/dist/api/catalog.js

@@ -1,35 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderByMessage = exports.order = exports.cleanObsolete = exports.Catalog = void 0;
+exports.Catalog = void 0;
+exports.cleanObsolete = cleanObsolete;
+exports.order = order;
+exports.orderByMessage = orderByMessage;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const R = __importStar(require("ramda"));
 const glob_1 = require("glob");
 const normalize_path_1 = __importDefault(require("normalize-path"));
 const getTranslationsForCatalog_1 = require("./catalog/getTranslationsForCatalog");
@@ -64,12 +43,13 @@ class Catalog {
             files: options.files,
         });
         // Map over all locales and post-process each catalog
-        const cleanAndSort = R.map(R.pipe(
-        // Clean obsolete messages
-        (options.clean ? exports.cleanObsolete : R.identity), 
-        // Sort messages
-        order(options.orderBy)));
-        const sortedCatalogs = cleanAndSort(catalogs);
+        const sortedCatalogs = Object.fromEntries(Object.entries(catalogs).map(([locale, catalog]) => {
+            if (options.clean) {
+                catalog = cleanObsolete(catalog);
+            }
+            catalog = order(options.orderBy, catalog);
+            return [locale, catalog];
+        }));
         const locales = options.locale ? options.locale : this.locales;
         await Promise.all(locales.map((locale) => this.write(locale, sortedCatalogs[locale])));
         return sortedCatalogs;
@@ -78,7 +58,7 @@ class Catalog {
         const catalog = await this.collect({ files: options.files });
         if (!catalog)
             return false;
-        const sorted = order(options.orderBy)(catalog);
+        const sorted = order(options.orderBy, catalog);
         await this.writeTemplate(sorted);
         return sorted;
     }
@@ -115,9 +95,10 @@ class Catalog {
      * - all other languages: translation is kept empty
      */
     merge(prevCatalogs, nextCatalog, options) {
-        return R.mapObjIndexed((prevCatalog, locale) => {
-            return (0, mergeCatalog_1.mergeCatalog)(prevCatalog, nextCatalog, this.config.sourceLocale === locale, options);
-        }, prevCatalogs);
+        return Object.fromEntries(Object.entries(prevCatalogs).map(([locale, prevCatalog]) => [
+            locale,
+            (0, mergeCatalog_1.mergeCatalog)(prevCatalog, nextCatalog, this.config.sourceLocale === locale, options),
+        ]));
     }
     async getTranslations(locale, options) {
         return await (0, getTranslationsForCatalog_1.getTranslationsForCatalog)(this, locale, options);
@@ -194,15 +175,16 @@ exports.Catalog = Catalog;
 function getTemplatePath(ext, path) {
     return path.replace(LOCALE_SUFFIX_RE, "messages" + ext);
 }
-exports.cleanObsolete = R.filter((message) => !message.obsolete);
-function order(by) {
+function cleanObsolete(messages) {
+    return Object.fromEntries(Object.entries(messages).filter(([, message]) => !message.obsolete));
+}
+function order(by, catalog) {
     return {
         messageId: orderByMessageId,
         message: orderByMessage,
         origin: orderByOrigin,
-    }[by];
+    }[by](catalog);
 }
-exports.order = order;
 /**
  * Object keys are in the same order as they were created
  * https://stackoverflow.com/a/31102605/1535540
@@ -263,4 +245,3 @@ function orderByMessage(messages) {
         return acc;
     }, {});
 }
-exports.orderByMessage = orderByMessage;

package/dist/api/compile.js

@@ -15,18 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compile = exports.createCompiledCatalog = void 0;
+exports.createCompiledCatalog = createCompiledCatalog;
+exports.compile = compile;
 const t = __importStar(require("@babel/types"));
 const generator_1 = __importDefault(require("@babel/generator"));
 const compileMessage_1 = require("@lingui/message-utils/compileMessage");
@@ -51,7 +62,6 @@ function createCompiledCatalog(locale, messages, options) {
         } }, compilerBabelOptions)).code;
     return "/*eslint-disable*/" + code;
 }
-exports.createCompiledCatalog = createCompiledCatalog;
 function buildExportStatement(expression, namespace) {
     if (namespace === "ts") {
         // import type { Messages } from "@lingui/core";
@@ -97,4 +107,3 @@ function buildExportStatement(expression, namespace) {
 function compile(message, shouldPseudolocalize = false) {
     return (0, compileMessage_1.compileMessage)(message, (value) => shouldPseudolocalize ? (0, pseudoLocalize_1.default)(value) : value);
 }
-exports.compile = compile;

package/dist/api/extractors/babel.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBabelParserOptions = exports.extractFromFileWithBabel = exports.babelRe = void 0;
+exports.babelRe = void 0;
+exports.extractFromFileWithBabel = extractFromFileWithBabel;
+exports.getBabelParserOptions = getBabelParserOptions;
 const core_1 = require("@babel/core");
 const babel_plugin_extract_messages_1 = __importDefault(require("@lingui/babel-plugin-extract-messages"));
 const babel_plugin_lingui_macro_1 = __importDefault(require("@lingui/babel-plugin-lingui-macro"));
@@ -12,7 +14,7 @@ exports.babelRe = new RegExp("\\.(" +
         .map((ext) => ext.slice(1))
         .join("|") +
     ")$", "i");
-const inlineSourceMapsRE = new RegExp(/\/[\/\*][#@]\s+sourceMappingURL=data:application\/json;(?:charset:utf-8;)?base64,/i);
+const inlineSourceMapsRE = new RegExp(/\/[/*][#@]\s+sourceMappingURL=data:application\/json;(?:charset:utf-8;)?base64,/i);
 /**
  * Create a source mapper which could read original positions
  * from either inline sourcemaps or from external passed as `sourceMaps` argument.
@@ -112,12 +114,11 @@ async function extractFromFileWithBabel(filename, code, onMessageExtracted, ctx,
     });
     mapper.destroy();
 }
-exports.extractFromFileWithBabel = extractFromFileWithBabel;
 function getBabelParserOptions(filename, parserOptions) {
     // https://babeljs.io/docs/en/babel-parser#latest-ecmascript-features
     const parserPlugins = [
-        "importAttributes",
-        "explicitResourceManagement",
+        "importAttributes", // stage3
+        "explicitResourceManagement", // stage3,
         "decoratorAutoAccessors", // stage3,
     ];
     if ([/\.ts$/, /\.mts$/, /\.cts$/, /\.tsx$/].some((r) => filename.match(r))) {
@@ -140,7 +141,6 @@ function getBabelParserOptions(filename, parserOptions) {
     }
     return parserPlugins;
 }
-exports.getBabelParserOptions = getBabelParserOptions;
 const extractor = {
     match(filename) {
         return exports.babelRe.test(filename);

package/dist/api/extractors/index.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = extract;
 const promises_1 = __importDefault(require("fs/promises"));
 const babel_1 = __importDefault(require("./babel"));
 const DEFAULT_EXTRACTORS = [babel_1.default];
 async function extract(filename, onMessageExtracted, linguiConfig, options) {
     var _a;
     const extractorsToExtract = (_a = options.extractors) !== null && _a !== void 0 ? _a : DEFAULT_EXTRACTORS;
-    for (let ext of extractorsToExtract) {
+    for (const ext of extractorsToExtract) {
         if (!ext.match(filename))
             continue;
         try {
@@ -27,4 +28,3 @@ async function extract(filename, onMessageExtracted, linguiConfig, options) {
     }
     return true;
 }
-exports.default = extract;

package/dist/api/formats/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormat = exports.FormatterWrapper = void 0;
+exports.FormatterWrapper = void 0;
+exports.getFormat = getFormat;
 const formatterWrapper_1 = require("./formatterWrapper");
 Object.defineProperty(exports, "FormatterWrapper", { enumerable: true, get: function () { return formatterWrapper_1.FormatterWrapper; } });
 const utils_1 = require("../utils");
@@ -44,4 +45,3 @@ async function getFormat(_format, options, sourceLocale) {
     }
     return new formatterWrapper_1.FormatterWrapper((await format())(options), sourceLocale);
 }
-exports.getFormat = getFormat;

package/dist/api/help.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.helpRun = void 0;
+exports.helpRun = helpRun;
 /**
  * Detect where is the command lingui extract or lingui compile
  * and how is being run (npm, yarn, pnpm) and construct help
@@ -29,7 +29,9 @@ function helpRun(command) {
     try {
         findRootPkgJson = require((0, path_1.resolve)((0, path_1.join)(process.cwd(), "package.json")));
     }
-    catch (error) { }
+    catch (error) {
+        // noting
+    }
     if (findRootPkgJson === null || findRootPkgJson === void 0 ? void 0 : findRootPkgJson.scripts) {
         const res = Object.entries(findRootPkgJson.scripts).find(([_, value]) => value.includes(`lingui ${command}`));
         if (res) {
@@ -39,7 +41,6 @@ function helpRun(command) {
     const runCommand = runCommandFrom(process.env.npm_config_user_agent);
     return `${runCommand} ${command}`;
 }
-exports.helpRun = helpRun;
 function runCommandFrom(userAgent) {
     const defaultRunCommand = "npm run";
     if (!userAgent) {

package/dist/api/pseudoLocalize.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ramda_1 = __importDefault(require("ramda"));
+exports.default = default_1;
 const pseudolocale_1 = __importDefault(require("pseudolocale"));
 const delimiter = "%&&&%";
 /**
@@ -40,12 +40,13 @@ function addDelimitersVariables(message) {
         return `${delimiter}${matchedString}${delimiter}`;
     });
 }
-const addDelimiters = ramda_1.default.compose(addDelimitersVariables, addDelimitersMacro, addDelimitersHTMLTags);
 function removeDelimiters(message) {
     return message.replace(new RegExp(delimiter, "g"), "");
 }
 function default_1(message) {
-    message = addDelimiters(message);
+    message = addDelimitersHTMLTags(message);
+    message = addDelimitersMacro(message);
+    message = addDelimitersVariables(message);
     message = (0, pseudolocale_1.default)(message, {
         delimiter,
         prepend: "",
@@ -53,4 +54,3 @@ function default_1(message) {
     });
     return removeDelimiters(message);
 }
-exports.default = default_1;

package/dist/api/stats.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printStats = exports.getStats = void 0;
+exports.getStats = getStats;
+exports.printStats = printStats;
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const cli_table_1 = __importDefault(require("cli-table"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -13,7 +15,6 @@ function getStats(catalog) {
         Object.keys(catalog).filter((key) => !catalog[key].translation).length,
     ];
 }
-exports.getStats = getStats;
 function printStats(config, catalogs) {
     const table = new cli_table_1.default({
         head: ["Language", "Total count", "Missing"],
@@ -40,4 +41,3 @@ function printStats(config, catalogs) {
     });
     return table;
 }
-exports.printStats = printStats;

package/dist/api/utils.js

@@ -3,7 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makePathRegexSafe = exports.normalizeRelativePath = exports.makeInstall = exports.hasYarn = exports.writeFileIfChanged = exports.writeFile = exports.isDirectory = exports.readFile = exports.replacePlaceholders = exports.prettyOrigin = exports.PATHSEP = void 0;
+exports.PATHSEP = void 0;
+exports.prettyOrigin = prettyOrigin;
+exports.replacePlaceholders = replacePlaceholders;
+exports.readFile = readFile;
+exports.isDirectory = isDirectory;
+exports.writeFile = writeFile;
+exports.writeFileIfChanged = writeFileIfChanged;
+exports.hasYarn = hasYarn;
+exports.makeInstall = makeInstall;
+exports.normalizeRelativePath = normalizeRelativePath;
+exports.makePathRegexSafe = makePathRegexSafe;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const normalize_path_1 = __importDefault(require("normalize-path"));
@@ -16,14 +26,12 @@ function prettyOrigin(origins) {
         return "";
     }
 }
-exports.prettyOrigin = prettyOrigin;
 function replacePlaceholders(input, values) {
     return input.replace(/\{([^}]+)}/g, (m, placeholder) => {
         var _a;
         return (_a = values[placeholder]) !== null && _a !== void 0 ? _a : m;
     });
 }
-exports.replacePlaceholders = replacePlaceholders;
 async function readFile(fileName) {
     try {
         return (await fs_1.default.promises.readFile(fileName, "utf-8")).toString();
@@ -34,7 +42,6 @@ async function readFile(fileName) {
         }
     }
 }
-exports.readFile = readFile;
 async function mkdirp(dir) {
     try {
         await fs_1.default.promises.mkdir(dir, {
@@ -57,12 +64,10 @@ function isDirectory(filePath) {
         }
     }
 }
-exports.isDirectory = isDirectory;
 async function writeFile(fileName, content) {
     await mkdirp(path_1.default.dirname(fileName));
     await fs_1.default.promises.writeFile(fileName, content, "utf-8");
 }
-exports.writeFile = writeFile;
 async function writeFileIfChanged(filename, newContent) {
     const raw = await readFile(filename);
     if (raw) {
@@ -74,18 +79,15 @@ async function writeFileIfChanged(filename, newContent) {
         await writeFile(filename, newContent);
     }
 }
-exports.writeFileIfChanged = writeFileIfChanged;
 function hasYarn() {
     return fs_1.default.existsSync(path_1.default.resolve("yarn.lock"));
 }
-exports.hasYarn = hasYarn;
 function makeInstall(packageName, dev = false) {
     const withYarn = hasYarn();
     return withYarn
         ? `yarn add ${dev ? "--dev " : ""}${packageName}`
         : `npm install ${dev ? "--save-dev" : "--save"} ${packageName}`;
 }
-exports.makeInstall = makeInstall;
 /**
  * Remove ./ at the beginning: ./relative  => relative
  *                             relative    => relative
@@ -102,11 +104,9 @@ function normalizeRelativePath(sourcePath) {
     return ((0, normalize_path_1.default)(path_1.default.relative(process.cwd(), sourcePath), false) +
         (isDir ? "/" : ""));
 }
-exports.normalizeRelativePath = normalizeRelativePath;
 /**
  * Escape special regex characters used in file-based routing systems
  */
 function makePathRegexSafe(path) {
     return path.replace(/[(){}[\]^$+]/g, "\\$&");
 }
-exports.makePathRegexSafe = makePathRegexSafe;

package/dist/extract-experimental/bundleSource.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleSource = void 0;
+exports.bundleSource = bundleSource;
 const linguiEsbuildPlugin_1 = require("./linguiEsbuildPlugin");
 function createExtRegExp(extensions) {
     return new RegExp("\\.(?:" + extensions.join("|") + ")(?:\\?.*)?$");
@@ -59,4 +59,3 @@ async function bundleSource(linguiConfig, entryPoints, outDir, rootDir) {
         ? config.resolveEsbuildOptions(esbuildOptions)
         : esbuildOptions);
 }
-exports.bundleSource = bundleSource;

package/dist/extract-experimental/getEntryPoints.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEntryPoints = void 0;
+exports.getEntryPoints = getEntryPoints;
 const glob_1 = require("glob");
 function getEntryPoints(entries) {
     return (0, glob_1.globSync)(entries, { mark: true });
 }
-exports.getEntryPoints = getEntryPoints;

package/dist/extract-experimental/getExperimentalCatalogs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExperimentalCatalogs = void 0;
+exports.getExperimentalCatalogs = getExperimentalCatalogs;
 const getEntryPoints_1 = require("./getEntryPoints");
 const resolveCatalogPath_1 = require("./resolveCatalogPath");
 const catalog_1 = require("../api/catalog");
@@ -23,4 +23,3 @@ async function getExperimentalCatalogs(linguiConfig) {
         }, linguiConfig);
     });
 }
-exports.getExperimentalCatalogs = getExperimentalCatalogs;

package/dist/extract-experimental/resolveCatalogPath.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEntryName = exports.resolveCatalogPath = void 0;
+exports.resolveCatalogPath = resolveCatalogPath;
+exports.getEntryName = getEntryName;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../api/utils");
 function resolveCatalogPath(configOutput, entryPath, rootDir, locale, extension) {
@@ -15,9 +16,7 @@ function resolveCatalogPath(configOutput, entryPath, rootDir, locale, extension)
         locale,
     }) + extension);
 }
-exports.resolveCatalogPath = resolveCatalogPath;
 function getEntryName(entryPath) {
     const parsedPath = path_1.default.parse(entryPath);
     return parsedPath.name.replace(parsedPath.ext, "");
 }
-exports.getEntryName = getEntryName;

package/dist/extract-experimental/resolveTemplatePath.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveTemplatePath = void 0;
+exports.resolveTemplatePath = resolveTemplatePath;
 const resolveCatalogPath_1 = require("./resolveCatalogPath");
 const constants_1 = require("./constants");
 function resolveTemplatePath(entryPoint, output, rootDir, catalogExtension) {
@@ -13,4 +13,3 @@ function resolveTemplatePath(entryPoint, output, rootDir, catalogExtension) {
     }
     return (0, resolveCatalogPath_1.resolveCatalogPath)(output, entryPoint, rootDir, templateName, catalogExtension);
 }
-exports.resolveTemplatePath = resolveTemplatePath;

package/dist/extract-experimental/writeCatalogs.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTemplate = exports.writeCatalogs = void 0;
+exports.writeCatalogs = writeCatalogs;
+exports.writeTemplate = writeTemplate;
 const resolveTemplatePath_1 = require("./resolveTemplatePath");
 const chalk_1 = __importDefault(require("chalk"));
 const resolveCatalogPath_1 = require("./resolveCatalogPath");
@@ -14,7 +15,7 @@ function cleanAndSort(catalog, clean, orderBy) {
     if (clean) {
         catalog = (0, catalog_1.cleanObsolete)(catalog);
     }
-    return (0, catalog_1.order)(orderBy)(catalog);
+    return (0, catalog_1.order)(orderBy, catalog);
 }
 async function writeCatalogs(params) {
     const { entryPoint, outputPattern, linguiConfig, locales, overwrite, format, clean, messages, } = params;
@@ -29,7 +30,6 @@ async function writeCatalogs(params) {
         statMessage: (0, stats_1.printStats)(linguiConfig, stat).toString(),
     };
 }
-exports.writeCatalogs = writeCatalogs;
 async function writeTemplate(params) {
     const { entryPoint, outputPattern, linguiConfig, format, clean, messages } = params;
     const catalogOutput = (0, resolveTemplatePath_1.resolveTemplatePath)(entryPoint, outputPattern, linguiConfig.rootDir, format.getTemplateExtension());
@@ -38,4 +38,3 @@ async function writeTemplate(params) {
         statMessage: `${chalk_1.default.bold(Object.keys(messages).length)} message(s) extracted`,
     };
 }
-exports.writeTemplate = writeTemplate;

package/dist/lingui-compile.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
+exports.command = command;
 const chalk_1 = __importDefault(require("chalk"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const commander_1 = require("commander");
@@ -30,7 +30,9 @@ async function command(config, options) {
                     missingMessages.push(missing);
                 },
             });
-            if (!options.allowEmpty && missingMessages.length > 0) {
+            if (!options.allowEmpty &&
+                locale !== config.pseudoLocale &&
+                missingMessages.length > 0) {
                 console.error(chalk_1.default.red(`Error: Failed to compile catalog for locale ${chalk_1.default.bold(locale)}!`));
                 if (options.verbose) {
                     console.error(chalk_1.default.red("Missing translations:"));
@@ -82,7 +84,6 @@ async function command(config, options) {
     }
     return true;
 }
-exports.command = command;
 if (require.main === module) {
     commander_1.program
         .description("Add compile message catalogs and add language data (plurals) to compiled bundle.")

package/dist/lingui-extract-experimental.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = command;
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
 const path_1 = __importDefault(require("path"));
@@ -98,7 +99,6 @@ async function command(linguiConfig, options) {
     });
     return commandSuccess;
 }
-exports.default = command;
 if (require.main === module) {
     commander_1.program
         .option("--config <path>", "Path to the config file")

package/dist/lingui-extract-template.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = command;
 const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
@@ -27,7 +28,6 @@ async function command(config, options) {
     });
     return commandSuccess;
 }
-exports.default = command;
 if (require.main === module) {
     commander_1.program
         .option("--config <path>", "Path to the config file")

package/dist/lingui-extract.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = command;
 const chalk_1 = __importDefault(require("chalk"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const commander_1 = require("commander");
@@ -19,7 +20,7 @@ async function command(config, options) {
     const catalogStats = {};
     let commandSuccess = true;
     const spinner = (0, ora_1.default)().start();
-    for (let catalog of catalogs) {
+    for (const catalog of catalogs) {
         const result = await catalog.make(Object.assign(Object.assign({}, options), { orderBy: config.orderBy }));
         catalogStats[(0, normalize_path_1.default)(path_1.default.relative(config.rootDir, catalog.path))] = result || {};
         commandSuccess && (commandSuccess = Boolean(result));
@@ -57,7 +58,6 @@ async function command(config, options) {
     }
     return commandSuccess;
 }
-exports.default = command;
 if (require.main === module) {
     commander_1.program
         .option("--config <path>", "Path to the config file")
@@ -135,8 +135,8 @@ if (require.main === module) {
         console.info(chalk_1.default.bold("Initializing Watch Mode..."));
         (async function initWatch() {
             const catalogs = await (0, api_1.getCatalogs)(config);
-            let paths = [];
-            let ignored = [];
+            const paths = [];
+            const ignored = [];
             catalogs.forEach((catalog) => {
                 paths.push(...catalog.include);
                 ignored.push(...catalog.exclude);

package/dist/services/translationIO.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = syncProcess;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const pofile_1 = __importDefault(require("pofile"));
@@ -48,7 +49,6 @@ async function syncProcess(config, options) {
         });
     });
 }
-exports.default = syncProcess;
 // Initialize project with source and existing translations (only first time!)
 // Cf. https://translation.io/docs/create-library#initialization
 function init(config, options, successCallback, failCallback) {
@@ -146,7 +146,7 @@ function createSegmentFromPoItem(item) {
     const itemHasExplicitId = item.extractedComments.includes(EXPLICIT_ID_FLAG);
     const itemHasContext = item.msgctxt != null;
     const segment = {
-        type: "source",
+        type: "source", // No way to edit text for source language (inside code), so not using "key" here
         source: "",
         context: "",
         references: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -57,12 +57,12 @@
     "@babel/parser": "^7.22.0",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "5.1.1",
-    "@lingui/babel-plugin-lingui-macro": "5.1.1",
-    "@lingui/conf": "5.1.1",
-    "@lingui/core": "5.1.1",
-    "@lingui/format-po": "5.1.1",
-    "@lingui/message-utils": "5.1.1",
+    "@lingui/babel-plugin-extract-messages": "5.2.0",
+    "@lingui/babel-plugin-lingui-macro": "5.2.0",
+    "@lingui/conf": "5.2.0",
+    "@lingui/core": "5.2.0",
+    "@lingui/format-po": "5.2.0",
+    "@lingui/message-utils": "5.2.0",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -80,7 +80,6 @@
     "pkg-up": "^3.1.0",
     "pofile": "^1.1.4",
     "pseudolocale": "^2.0.0",
-    "ramda": "^0.27.1",
     "source-map": "^0.8.0-beta.0"
   },
   "devDependencies": {
@@ -91,5 +90,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "de0517677882f1900a052018e396b94f406963d6"
+  "gitHead": "9c50b4877ca8b134d0d96c09a8055221ca70b095"
 }