@lingui/cli 4.6.0 → 4.7.1

package/dist/api/catalog/getCatalogs.js

@@ -93,7 +93,10 @@ function getCatalogForFile(file, catalogs) {
     for (const catalog of catalogs) {
         const catalogFile = `${catalog.path}${catalog.format.getCatalogExtension()}`;
         const catalogGlob = (0, utils_1.replacePlaceholders)(catalogFile, { locale: "*" });
-        const match = micromatch_1.default.capture((0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob)), (0, utils_1.normalizeRelativePath)(file));
+        const matchPattern = (0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob))
+            .replace("(", "\\(")
+            .replace(")", "\\)");
+        const match = micromatch_1.default.capture(matchPattern, (0, utils_1.normalizeRelativePath)(file));
         if (match) {
             return {
                 locale: match[0],

package/dist/api/compile.js

@@ -53,7 +53,20 @@ function createCompiledCatalog(locale, messages, options) {
 }
 exports.createCompiledCatalog = createCompiledCatalog;
 function buildExportStatement(expression, namespace) {
-    if (namespace === "es" || namespace === "ts") {
+    if (namespace === "ts") {
+        // import type { Messages } from "@lingui/core";
+        const importMessagesTypeDeclaration = t.importDeclaration([t.importSpecifier(t.identifier("Messages"), t.identifier("Messages"))], t.stringLiteral("@lingui/core"));
+        importMessagesTypeDeclaration.importKind = "type";
+        // Create the exported `messages` identifier with a `Messages` TS type annotation
+        const messagesIdentifier = t.identifier("messages");
+        messagesIdentifier.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier("Messages")));
+        // export const messages:Messages = { message: "Translation" }
+        const exportDeclaration = t.exportNamedDeclaration(t.variableDeclaration("const", [
+            t.variableDeclarator(messagesIdentifier, expression),
+        ]));
+        return t.program([importMessagesTypeDeclaration, exportDeclaration]);
+    }
+    else if (namespace === "es") {
         // export const messages = { message: "Translation" }
         return t.exportNamedDeclaration(t.variableDeclaration("const", [
             t.variableDeclarator(t.identifier("messages"), expression),

package/dist/api/utils.d.ts

@@ -1,8 +1,6 @@
 export declare const PATHSEP = "/";
 export declare function prettyOrigin(origins: [filename: string, line?: number][]): string;
 export declare function replacePlaceholders(input: string, values: Record<string, string>): string;
-export declare const splitOrigin: (origin: string) => [file: string, line: number];
-export declare const joinOrigin: (origin: [file: string, line?: number]) => string;
 export declare function readFile(fileName: string): Promise<string | undefined>;
 export declare function isDirectory(filePath: string): boolean;
 export declare function writeFile(fileName: string, content: string): Promise<void>;

package/dist/api/utils.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.normalizeRelativePath = exports.normalizeSlashes = exports.makeInstall = exports.hasYarn = exports.writeFileIfChanged = exports.writeFile = exports.isDirectory = exports.readFile = exports.joinOrigin = exports.splitOrigin = exports.replacePlaceholders = exports.prettyOrigin = exports.PATHSEP = void 0;
+exports.normalizeRelativePath = exports.normalizeSlashes = exports.makeInstall = exports.hasYarn = exports.writeFileIfChanged = exports.writeFile = exports.isDirectory = exports.readFile = exports.replacePlaceholders = exports.prettyOrigin = exports.PATHSEP = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const normalize_path_1 = __importDefault(require("normalize-path"));
@@ -24,16 +24,9 @@ function replacePlaceholders(input, values) {
     });
 }
 exports.replacePlaceholders = replacePlaceholders;
-const splitOrigin = (origin) => {
-    const [file, line] = origin.split(":");
-    return [file, line ? Number(line) : null];
-};
-exports.splitOrigin = splitOrigin;
-const joinOrigin = (origin) => origin.join(":");
-exports.joinOrigin = joinOrigin;
 async function readFile(fileName) {
     try {
-        return (await fs_1.default.promises.readFile(fileName)).toString();
+        return (await fs_1.default.promises.readFile(fileName, "utf-8")).toString();
     }
     catch (err) {
         if (err.code != "ENOENT") {
@@ -67,7 +60,7 @@ 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);
+    await fs_1.default.promises.writeFile(fileName, content, "utf-8");
 }
 exports.writeFile = writeFile;
 async function writeFileIfChanged(filename, newContent) {

package/dist/lingui-compile.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chokidar_1 = __importDefault(require("chokidar"));
-const fs_1 = __importDefault(require("fs"));
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
 const compile_1 = require("./api/compile");
@@ -62,13 +61,6 @@ async function command(config, options) {
                     compilerBabelOptions: config.compilerBabelOptions,
                 });
                 let compiledPath = await catalog.writeCompiled(locale, compiledCatalog, namespace);
-                if (options.typescript) {
-                    const typescriptPath = compiledPath.replace(/\.ts?$/, "") + ".d.ts";
-                    fs_1.default.writeFileSync(typescriptPath, `import type { Messages } from '@lingui/core';
-          declare const messages: Messages;
-          export { messages };
-          `);
-                }
                 compiledPath = (0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, compiledPath));
                 options.verbose &&
                     console.error(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.6.0",
+  "version": "4.7.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,11 +53,11 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "4.6.0",
-    "@lingui/conf": "4.6.0",
-    "@lingui/core": "4.6.0",
-    "@lingui/format-po": "4.6.0",
-    "@lingui/message-utils": "4.6.0",
+    "@lingui/babel-plugin-extract-messages": "4.7.1",
+    "@lingui/conf": "4.7.1",
+    "@lingui/core": "4.7.1",
+    "@lingui/format-po": "4.7.1",
+    "@lingui/message-utils": "4.7.1",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
-    "@lingui/macro": "4.6.0",
+    "@lingui/macro": "4.7.1",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
@@ -88,5 +88,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "2afa0efb2d0cd1d47adc76e1eec9f5e57e34ae18"
+  "gitHead": "49647102dbbd7046a2c318ba0525c1392e370076"
 }