@lingui/cli 4.7.0 → 4.7.2

package/README.md

@@ -60,7 +60,7 @@ node_modules/.bin/lingui compile
 
 ## Usage
 
-See the [tutorial][tutorial] or [reference][reference] documentation.
+See the [reference][reference] documentation.
 
 ## License
 
@@ -69,7 +69,6 @@ This package is licensed under [MIT][license] license.
 [license]: https://github.com/lingui/js-lingui/blob/main/LICENSE
 [linguijs]: https://github.com/lingui/js-lingui
 [documentation]: https://lingui.dev
-[tutorial]: https://lingui.dev/tutorials/cli
 [reference]: https://lingui.dev/ref/cli
 [package]: https://www.npmjs.com/package/@lingui/cli
 [badge-downloads]: https://img.shields.io/npm/dw/@lingui/cli.svg

package/dist/api/catalog/getCatalogs.js

@@ -95,7 +95,9 @@ function getCatalogForFile(file, catalogs) {
         const catalogGlob = (0, utils_1.replacePlaceholders)(catalogFile, { locale: "*" });
         const matchPattern = (0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob))
             .replace("(", "\\(")
-            .replace(")", "\\)");
+            .replace(")", "\\)")
+            .replace("[", "\\[")
+            .replace("]", "\\]");
         const match = micromatch_1.default.capture(matchPattern, (0, utils_1.normalizeRelativePath)(file));
         if (match) {
             return {

package/dist/api/catalog.js

@@ -134,14 +134,16 @@ class Catalog {
     }
     async writeCompiled(locale, compiledCatalog, namespace) {
         let ext;
-        if (namespace === "es") {
-            ext = "mjs";
-        }
-        else if (namespace === "ts") {
-            ext = "ts";
-        }
-        else {
-            ext = "js";
+        switch (namespace) {
+            case "es":
+                ext = "mjs";
+                break;
+            case "ts":
+            case "json":
+                ext = namespace;
+                break;
+            default:
+                ext = "js";
         }
         const filename = `${(0, utils_1.replacePlaceholders)(this.path, { locale })}.${ext}`;
         await (0, utils_1.writeFile)(filename, compiledCatalog);

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/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.7.0",
+  "version": "4.7.2",
   "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.7.0",
-    "@lingui/conf": "4.7.0",
-    "@lingui/core": "4.7.0",
-    "@lingui/format-po": "4.7.0",
-    "@lingui/message-utils": "4.7.0",
+    "@lingui/babel-plugin-extract-messages": "4.7.2",
+    "@lingui/conf": "4.7.2",
+    "@lingui/core": "4.7.2",
+    "@lingui/format-po": "4.7.2",
+    "@lingui/message-utils": "4.7.2",
     "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.7.0",
+    "@lingui/macro": "4.7.2",
     "@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": "ebb6353aef59d1b1a29a10ba6ffe94eb42c51a77"
+  "gitHead": "f15ce1520efcf33fefc160f6f59fa86ead3183a3"
 }