@lingui/cli 4.5.0 → 4.7.0

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/catalog.js

@@ -247,11 +247,14 @@ function orderByOrigin(messages) {
     }, {});
 }
 function orderByMessage(messages) {
+    // hardcoded en-US locale to have consistent sorting
+    // @see https://github.com/lingui/js-lingui/pull/1808
+    const collator = new Intl.Collator("en-US");
     return Object.keys(messages)
         .sort((a, b) => {
         const aMsg = messages[a].message || "";
         const bMsg = messages[b].message || "";
-        return aMsg.localeCompare(bMsg);
+        return collator.compare(aMsg, bMsg);
     })
         .reduce((acc, key) => {
         ;

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/extract-experimental/buildExternalizeFilter.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageJson = exports.buildExternalizeFilter = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
 function createPackageRegExp(packageName) {
     return new RegExp("^" + packageName + "(?:\\/.+)?");
 }
@@ -33,6 +37,11 @@ async function getPackageJson(rootDir) {
         throw new Error("We could not able to find your package.json file. " +
             "Check that `rootDir` is pointing to the folder with package.json");
     }
-    return await import(packageJsonPath);
+    try {
+        return JSON.parse(await node_fs_1.default.promises.readFile(packageJsonPath, "utf-8"));
+    }
+    catch (e) {
+        throw new Error(`Unable to read package.json file at path ${packageJsonPath}. \n\n Error: ${e.message}`);
+    }
 }
 exports.getPackageJson = getPackageJson;

package/dist/lingui-compile.js

@@ -64,7 +64,7 @@ async function command(config, options) {
                 let compiledPath = await catalog.writeCompiled(locale, compiledCatalog, namespace);
                 if (options.typescript) {
                     const typescriptPath = compiledPath.replace(/\.ts?$/, "") + ".d.ts";
-                    fs_1.default.writeFileSync(typescriptPath, `import { Messages } from '@lingui/core';
+                    fs_1.default.writeFileSync(typescriptPath, `import type { Messages } from '@lingui/core';
           declare const messages: Messages;
           export { messages };
           `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "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.5.0",
-    "@lingui/conf": "4.5.0",
-    "@lingui/core": "4.5.0",
-    "@lingui/format-po": "4.5.0",
-    "@lingui/message-utils": "4.5.0",
+    "@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",
     "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.5.0",
+    "@lingui/macro": "4.7.0",
     "@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": "62c92d1f8c60b3890bdda870f307fa780d423080"
+  "gitHead": "ebb6353aef59d1b1a29a10ba6ffe94eb42c51a77"
 }