@lingui/cli 5.0.0-next.0 → 5.0.0-next.1

package/dist/api/catalog/getCatalogs.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCatalogForFile = exports.getCatalogForMerge = exports.getCatalogs = void 0;
-const glob_1 = __importDefault(require("glob"));
+const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
 const catalog_1 = require("../catalog");
 const utils_1 = require("../utils");
@@ -45,7 +45,7 @@ async function getCatalogs(config) {
             return;
         }
         const patterns = include.map((path) => (0, utils_1.replacePlaceholders)(path, { name: "*" }));
-        const candidates = glob_1.default.sync(patterns.length > 1 ? `{${patterns.join(",")}}` : patterns[0], {
+        const candidates = (0, glob_1.globSync)(patterns, {
             ignore: exclude,
             mark: true,
         });
@@ -93,11 +93,7 @@ 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 matchPattern = (0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob))
-            .replace("(", "\\(")
-            .replace(")", "\\)")
-            .replace("[", "\\[")
-            .replace("]", "\\]");
+        const matchPattern = (0, utils_1.normalizeRelativePath)(path_1.default.relative(catalog.config.rootDir, catalogGlob)).replace(/(\(|\)|\[|\])/g, "\\$1");
         const match = micromatch_1.default.capture(matchPattern, (0, utils_1.normalizeRelativePath)(file));
         if (match) {
             return {

package/dist/api/catalog.js

@@ -30,7 +30,7 @@ exports.orderByMessage = exports.order = exports.cleanObsolete = exports.Catalog
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const R = __importStar(require("ramda"));
-const glob_1 = __importDefault(require("glob"));
+const glob_1 = require("glob");
 const normalize_path_1 = __importDefault(require("normalize-path"));
 const getTranslationsForCatalog_1 = require("./catalog/getTranslationsForCatalog");
 const mergeCatalog_1 = require("./catalog/mergeCatalog");
@@ -88,9 +88,9 @@ class Catalog {
     async collect(options = {}) {
         let paths = this.sourcePaths;
         if (options.files) {
-            options.files = options.files.map((p) => (0, normalize_path_1.default)(p, false));
+            options.files = options.files.map((p) => (0, utils_1.makePathRegexSafe)((0, normalize_path_1.default)(p, false)));
             const regex = new RegExp(options.files.join("|"), "i");
-            paths = paths.filter((path) => regex.test(path));
+            paths = paths.filter((path) => regex.test((0, normalize_path_1.default)(path)));
         }
         return await (0, extractFromFiles_1.extractFromFiles)(paths, this.config);
     }
@@ -177,15 +177,14 @@ class Catalog {
                 ? (0, normalize_path_1.default)(path_1.default.resolve(process.cwd(), includePath === "/" ? "" : includePath, "**/*.*"))
                 : includePath;
         });
-        const patterns = includeGlobs.length > 1 ? `{${includeGlobs.join(",")}}` : includeGlobs[0];
-        return glob_1.default.sync(patterns, { ignore: this.exclude, mark: true });
+        return (0, glob_1.globSync)(includeGlobs, { ignore: this.exclude, mark: true });
     }
     get localeDir() {
         const localePatternIndex = this.path.indexOf(LOCALE);
         if (localePatternIndex === -1) {
             throw Error(`Invalid catalog path: ${LOCALE} variable is missing`);
         }
-        return this.path.substr(0, localePatternIndex);
+        return this.path.substring(0, localePatternIndex);
     }
     get locales() {
         return this.config.locales;

package/dist/api/extractors/babel.js

@@ -31,7 +31,8 @@ async function createSourceMapper(code, sourceMaps) {
     else if (code.search(inlineSourceMapsRE) != -1) {
         const { SourceMapConsumer } = await import("source-map");
         const { fromSource } = await import("convert-source-map");
-        sourceMapsConsumer = await new SourceMapConsumer(fromSource(code).toObject());
+        const t = fromSource(code).toObject();
+        sourceMapsConsumer = await new SourceMapConsumer(t);
     }
     return {
         destroy: () => {

package/dist/api/help.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.helpRun = void 0;
 /**
- * Detect where's is the command lingui extract or lingui compile
- * and how is being run (npm, yarn) and construct help
+ * Detect where is the command lingui extract or lingui compile
+ * and how is being run (npm, yarn, pnpm) and construct help
  * for follow-up commands based on that.
  *
  * Example:
@@ -15,6 +15,10 @@ exports.helpRun = void 0;
  * ...
  * (use "yarn lingui compile" to compile catalogs for production)
  *
+ * $ pnpm run extract
+ * ...
+ * (use "pnpm run compile" to compile catalogs for production)
+ *
  * $ npm run extract
  * ...
  * (use "npm run compile" to compile catalogs for production)
@@ -32,9 +36,20 @@ function helpRun(command) {
             command = res[0];
         }
     }
-    const isYarn = process.env.npm_config_user_agent &&
-        process.env.npm_config_user_agent.includes("yarn");
-    const runCommand = isYarn ? "yarn" : "npm run";
+    const runCommand = runCommandFrom(process.env.npm_config_user_agent);
     return `${runCommand} ${command}`;
 }
 exports.helpRun = helpRun;
+function runCommandFrom(userAgent) {
+    const defaultRunCommand = "npm run";
+    if (!userAgent) {
+        return defaultRunCommand;
+    }
+    if (userAgent.includes("yarn")) {
+        return "yarn";
+    }
+    if (userAgent.includes("pnpm")) {
+        return "pnpm run";
+    }
+    return defaultRunCommand;
+}

package/dist/api/utils.d.ts

@@ -7,10 +7,6 @@ export declare function writeFile(fileName: string, content: string): Promise<vo
 export declare function writeFileIfChanged(filename: string, newContent: string): Promise<void>;
 export declare function hasYarn(): boolean;
 export declare function makeInstall(packageName: string, dev?: boolean): string;
-/**
- * Normalize Windows backslashes in path so they look always as posix
- */
-export declare function normalizeSlashes(path: string): string;
 /**
  * Remove ./ at the beginning: ./relative  => relative
  *                             relative    => relative
@@ -18,3 +14,7 @@ export declare function normalizeSlashes(path: string): string;
  * Preserve absolute paths:    /absolute/path => /absolute/path
  */
 export declare function normalizeRelativePath(sourcePath: string): string;
+/**
+ * Escape special regex characters used in file-based routing systems
+ */
+export declare function makePathRegexSafe(path: string): string;

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.replacePlaceholders = exports.prettyOrigin = exports.PATHSEP = void 0;
+exports.makePathRegexSafe = exports.normalizeRelativePath = 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"));
@@ -86,13 +86,6 @@ function makeInstall(packageName, dev = false) {
         : `npm install ${dev ? "--save-dev" : "--save"} ${packageName}`;
 }
 exports.makeInstall = makeInstall;
-/**
- * Normalize Windows backslashes in path so they look always as posix
- */
-function normalizeSlashes(path) {
-    return path.replace("\\", "/");
-}
-exports.normalizeSlashes = normalizeSlashes;
 /**
  * Remove ./ at the beginning: ./relative  => relative
  *                             relative    => relative
@@ -110,3 +103,10 @@ function normalizeRelativePath(sourcePath) {
         (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

@@ -42,7 +42,6 @@ async function bundleSource(linguiConfig, entryPoints, outDir, rootDir) {
         sourceRoot: outDir,
         sourcesContent: false,
         packages: "external",
-        outbase: rootDir,
         metafile: true,
         plugins: [
             (0, linguiEsbuildPlugin_1.pluginLinguiMacro)({ linguiConfig }),

package/dist/extract-experimental/getEntryPoints.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEntryPoints = void 0;
-const glob_1 = __importDefault(require("glob"));
+const glob_1 = require("glob");
 function getEntryPoints(entries) {
-    const patterns = entries.length > 1 ? `{${entries.join(",")}}` : entries[0];
-    return glob_1.default.sync(patterns, { mark: true });
+    return (0, glob_1.globSync)(entries, { mark: true });
 }
 exports.getEntryPoints = getEntryPoints;

package/dist/extract-experimental/linguiEsbuildPlugin.js

@@ -38,7 +38,7 @@ const pluginLinguiMacro = (options) => ({
                     ],
                 ],
             });
-            return { contents: result.code, loader: "jsx" };
+            return { contents: result.code, loader: "tsx" };
         });
     },
 });

package/dist/lingui-compile.js

@@ -12,7 +12,7 @@ const compile_1 = require("./api/compile");
 const help_1 = require("./api/help");
 const api_1 = require("./api");
 const getCatalogs_1 = require("./api/catalog/getCatalogs");
-const utils_1 = require("./api/utils");
+const normalize_path_1 = __importDefault(require("normalize-path"));
 const path_1 = __importDefault(require("path"));
 async function command(config, options) {
     const catalogs = await (0, api_1.getCatalogs)(config);
@@ -61,7 +61,7 @@ async function command(config, options) {
                     compilerBabelOptions: config.compilerBabelOptions,
                 });
                 let compiledPath = await catalog.writeCompiled(locale, compiledCatalog, namespace);
-                compiledPath = (0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, compiledPath));
+                compiledPath = (0, normalize_path_1.default)(path_1.default.relative(config.rootDir, compiledPath));
                 options.verbose &&
                     console.error(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));
             }
@@ -76,7 +76,7 @@ async function command(config, options) {
                 compilerBabelOptions: config.compilerBabelOptions,
             });
             let compiledPath = await compileCatalog.writeCompiled(locale, compiledCatalog, namespace);
-            compiledPath = (0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, compiledPath));
+            compiledPath = (0, normalize_path_1.default)(path_1.default.relative(config.rootDir, compiledPath));
             options.verbose && console.log(chalk_1.default.green(`${locale} ⇒ ${compiledPath}`));
         }
     }

package/dist/lingui-extract-experimental.js

@@ -7,11 +7,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
 const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
 const formats_1 = require("./api/formats");
 const promises_1 = __importDefault(require("fs/promises"));
 const extractFromFiles_1 = require("./api/catalog/extractFromFiles");
-const utils_1 = require("./api/utils");
+const normalize_path_1 = __importDefault(require("normalize-path"));
 const bundleSource_1 = require("./extract-experimental/bundleSource");
 const writeCatalogs_1 = require("./extract-experimental/writeCatalogs");
 const getEntryPoints_1 = require("./extract-experimental/getEntryPoints");
@@ -30,7 +29,15 @@ async function command(linguiConfig, options) {
             " Use at your own risk.",
         "",
     ].join("\n")));
-    const tempDir = await promises_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), "js-lingui-extract-"));
+    // unfortunately we can't use os.tmpdir() in this case
+    // on windows it might create a folder on a different disk then source code is stored
+    // (tmpdir would be always on C: but code could be stored on D:)
+    // and then relative path in sourcemaps produced by esbuild will be broken.
+    // sourcemaps itself doesn't allow to have absolute windows path, because they are not URL compatible.
+    // that's why we store esbuild bundles in .lingui folder
+    const tmpPrefix = ".lingui/";
+    await promises_1.default.mkdir(tmpPrefix, { recursive: true });
+    const tempDir = await promises_1.default.mkdtemp(tmpPrefix);
     await promises_1.default.rm(tempDir, { recursive: true, force: true });
     const bundleResult = await (0, bundleSource_1.bundleSource)(linguiConfig, (0, getEntryPoints_1.getEntryPoints)(config.entries), tempDir, linguiConfig.rootDir);
     const stats = [];
@@ -80,7 +87,7 @@ async function command(linguiConfig, options) {
             })).statMessage;
         }
         stats.push({
-            entry: (0, utils_1.normalizeSlashes)(path_1.default.relative(linguiConfig.rootDir, entryPoint)),
+            entry: (0, normalize_path_1.default)(path_1.default.relative(linguiConfig.rootDir, entryPoint)),
             content: output,
         });
     }

package/dist/lingui-extract-template.js

@@ -8,7 +8,7 @@ const commander_1 = require("commander");
 const conf_1 = require("@lingui/conf");
 const api_1 = require("./api");
 const path_1 = __importDefault(require("path"));
-const utils_1 = require("./api/utils");
+const normalize_path_1 = __importDefault(require("normalize-path"));
 async function command(config, options) {
     options.verbose && console.log("Extracting messages from source files…");
     const catalogs = await (0, api_1.getCatalogs)(config);
@@ -17,7 +17,7 @@ async function command(config, options) {
     await Promise.all(catalogs.map(async (catalog) => {
         const result = await catalog.makeTemplate(Object.assign(Object.assign({}, options), { orderBy: config.orderBy }));
         if (result) {
-            catalogStats[(0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, catalog.templateFile))] = Object.keys(result).length;
+            catalogStats[(0, normalize_path_1.default)(path_1.default.relative(config.rootDir, catalog.templateFile))] = Object.keys(result).length;
         }
         commandSuccess && (commandSuccess = Boolean(result));
     }));

package/dist/lingui-extract.js

@@ -12,7 +12,7 @@ const api_1 = require("./api");
 const stats_1 = require("./api/stats");
 const help_1 = require("./api/help");
 const ora_1 = __importDefault(require("ora"));
-const utils_1 = require("./api/utils");
+const normalize_path_1 = __importDefault(require("normalize-path"));
 async function command(config, options) {
     options.verbose && console.log("Extracting messages from source files…");
     const catalogs = await (0, api_1.getCatalogs)(config);
@@ -21,7 +21,7 @@ async function command(config, options) {
     const spinner = (0, ora_1.default)().start();
     for (let catalog of catalogs) {
         const result = await catalog.make(Object.assign(Object.assign({}, options), { orderBy: config.orderBy }));
-        catalogStats[(0, utils_1.normalizeSlashes)(path_1.default.relative(config.rootDir, catalog.path))] = result || {};
+        catalogStats[(0, normalize_path_1.default)(path_1.default.relative(config.rootDir, catalog.path))] = result || {};
         commandSuccess && (commandSuccess = Boolean(result));
     }
     if (commandSuccess) {

package/dist/services/translationIO.js

@@ -7,7 +7,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const pofile_1 = __importDefault(require("pofile"));
 const https_1 = __importDefault(require("https"));
-const glob_1 = __importDefault(require("glob"));
+const glob_1 = require("glob");
 const date_fns_1 = require("date-fns");
 const EXPLICIT_ID_FLAG = "js-lingui-explicit-id";
 const EXPLICIT_ID_AND_CONTEXT_FLAG = "js-lingui-explicit-id-and-context";
@@ -262,7 +262,7 @@ function poPathsPerLocale(config) {
             const path = "".concat(catalog.path.replace(/{locale}/g, locale).replace(/{name}/g, "*"), ".po");
             // If {name} is present (replaced by *), list all the existing POs
             if (path.includes("*")) {
-                paths[locale] = paths[locale].concat(glob_1.default.sync(path));
+                paths[locale] = paths[locale].concat((0, glob_1.globSync)(path));
             }
             else {
                 paths[locale].push(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "5.0.0-next.0",
+  "version": "5.0.0-next.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,23 +53,23 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "^5.0.0-next.0",
-    "@lingui/babel-plugin-lingui-macro": "^5.0.0-next.0",
-    "@lingui/conf": "^5.0.0-next.0",
-    "@lingui/core": "^5.0.0-next.0",
-    "@lingui/format-po": "^5.0.0-next.0",
-    "@lingui/message-utils": "^5.0.0-next.0",
+    "@lingui/babel-plugin-extract-messages": "^5.0.0-next.1",
+    "@lingui/babel-plugin-lingui-macro": "^5.0.0-next.1",
+    "@lingui/conf": "^5.0.0-next.1",
+    "@lingui/core": "^5.0.0-next.1",
+    "@lingui/format-po": "^5.0.0-next.1",
+    "@lingui/message-utils": "^5.0.0-next.1",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
-    "cli-table": "0.3.6",
+    "cli-table": "^0.3.11",
     "commander": "^10.0.0",
     "convert-source-map": "^2.0.0",
     "date-fns": "^3.6.0",
     "esbuild": "^0.21.5",
-    "glob": "^7.1.4",
+    "glob": "^11.0.0",
     "inquirer": "^7.3.3",
-    "micromatch": "4.0.2",
+    "micromatch": "^4.0.7",
     "normalize-path": "^3.0.0",
     "ora": "^5.1.0",
     "pathe": "^1.1.0",
@@ -82,11 +82,10 @@
   "devDependencies": {
     "@lingui/jest-mocks": "^3.0.3",
     "@types/convert-source-map": "^2.0.0",
-    "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
     "@types/normalize-path": "^3.0.0",
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "2192f8d54699a3846ff8fe6f3992697be2da68a8"
+  "gitHead": "7936155f7b29ecdc6191042a9a2e363962ab482d"
 }