@lingui/cli 3.17.2 → 4.0.0-next.1

package/build/api/formats/po.js

@@ -4,74 +4,101 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var R = _interopRequireWildcard(require("ramda"));
+exports.deserialize = deserialize;
+exports.serialize = void 0;
 var _dateFns = require("date-fns");
 var _pofile = _interopRequireDefault(require("pofile"));
 var _utils = require("../utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _generateMessageId = require("../generateMessageId");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const getCreateHeaders = (language = "no") => ({
-  "POT-Creation-Date": (0, _dateFns.format)(new Date(), "yyyy-MM-dd HH:mmxxxx"),
-  "MIME-Version": "1.0",
-  "Content-Type": "text/plain; charset=utf-8",
-  "Content-Transfer-Encoding": "8bit",
-  "X-Generator": "@lingui/cli",
-  Language: language
-});
-const serialize = (items, options) => R.compose(R.values, R.mapObjIndexed((message, key) => {
-  const item = new _pofile.default.Item();
-  item.msgid = key;
-  item.msgstr = [message.translation];
-  item.comments = message.comments || [];
-  item.extractedComments = message.extractedComments || [];
-  if (message.context) {
-    item.msgctxt = message.context;
-  }
-  if (options.origins !== false) {
-    if (message.origin && options.lineNumbers === false) {
-      item.references = message.origin.map(([path]) => path);
+function isGeneratedId(id, message) {
+  return id === (0, _generateMessageId.generateMessageId)(message.message, message.context);
+}
+function getCreateHeaders(language = "no") {
+  return {
+    "POT-Creation-Date": (0, _dateFns.format)(new Date(), "yyyy-MM-dd HH:mmxxxx"),
+    "MIME-Version": "1.0",
+    "Content-Type": "text/plain; charset=utf-8",
+    "Content-Transfer-Encoding": "8bit",
+    "X-Generator": "@lingui/cli",
+    Language: language
+  };
+}
+const EXPLICIT_ID_FLAG = "explicit-id";
+const serialize = (catalog, options, postProcessItem) => {
+  return Object.keys(catalog).map(id => {
+    const message = catalog[id];
+    const item = new _pofile.default.Item();
+
+    // The extractedComments array may be modified in this method,
+    // so create a new array with the message's elements.
+    item.extractedComments = [...(message.extractedComments || [])];
+    item.flags = (message.flags || []).reduce((acc, flag) => {
+      acc[flag] = true;
+      return acc;
+    }, {});
+    const _isGeneratedId = isGeneratedId(id, message);
+    if (_isGeneratedId) {
+      item.msgid = message.message;
+      if (!item.extractedComments.find(c => c.includes("js-lingui-id"))) {
+        item.extractedComments.push(`js-lingui-id: ${id}`);
+      }
     } else {
-      item.references = message.origin ? message.origin.map(_utils.joinOrigin) : [];
+      item.flags[EXPLICIT_ID_FLAG] = true;
+      item.msgid = id;
     }
+    if (message.context) {
+      item.msgctxt = message.context;
+    }
+    item.msgstr = [message.translation];
+    item.comments = message.comments || [];
+    if (options.origins !== false) {
+      if (message.origin && options.lineNumbers === false) {
+        item.references = message.origin.map(([path]) => path);
+      } else {
+        item.references = message.origin ? message.origin.map(_utils.joinOrigin) : [];
+      }
+    }
+    item.obsolete = message.obsolete;
+    return postProcessItem ? postProcessItem(item, message, id, _isGeneratedId) : item;
+  });
+};
+exports.serialize = serialize;
+function deserialize(items, onItem) {
+  return items.reduce((catalog, item) => {
+    onItem(item);
+    const message = {
+      translation: item.msgstr[0],
+      extractedComments: item.extractedComments || [],
+      comments: item.comments || [],
+      context: item.msgctxt ?? null,
+      obsolete: item.flags.obsolete || item.obsolete,
+      origin: (item.references || []).map(ref => (0, _utils.splitOrigin)(ref)),
+      flags: Object.keys(item.flags).map(flag => flag.trim())
+    };
+    let id = item.msgid;
+
+    // if generated id, recreate it
+    if (!item.flags[EXPLICIT_ID_FLAG]) {
+      id = (0, _generateMessageId.generateMessageId)(item.msgid, item.msgctxt);
+      message.message = item.msgid;
+    }
+    catalog[id] = message;
+    return catalog;
+  }, {});
+}
+function validateItem(item) {
+  if (item.msgstr.length > 1) {
+    console.warn(`Multiple translations for item with key ${item.msgid} is not supported and it will be ignored.`);
   }
-  // @ts-ignore: Figure out how to set this flag
-  item.obsolete = message.obsolete;
-  item.flags = message.flags ? R.fromPairs(message.flags.map(flag => [flag, true])) : {};
-  return item;
-}))(items);
-const getMessageKey = R.prop("msgid");
-const getTranslations = R.prop("msgstr");
-const getExtractedComments = R.prop("extractedComments");
-const getTranslatorComments = R.prop("comments");
-const getMessageContext = R.prop("msgctxt");
-const getOrigins = R.prop("references");
-const getFlags = R.compose(R.map(R.trim), R.keys, R.dissoc("obsolete"),
-// backward-compatibility, remove in 3.x
-R.prop("flags"));
-const isObsolete = R.either(R.path(["flags", "obsolete"]), R.prop("obsolete"));
-const deserialize = R.map(R.applySpec({
-  translation: R.compose(R.head, R.defaultTo([]), getTranslations),
-  extractedComments: R.compose(R.defaultTo([]), getExtractedComments),
-  comments: R.compose(R.defaultTo([]), getTranslatorComments),
-  context: R.compose(R.defaultTo(null), getMessageContext),
-  obsolete: isObsolete,
-  origin: R.compose(R.map(_utils.splitOrigin), R.defaultTo([]), getOrigins),
-  flags: getFlags
-}));
-const validateItems = R.forEach(item => {
-  if (R.length(getTranslations(item)) > 1) {
-    console.warn("Multiple translations for item with key %s is not supported and it will be ignored.", getMessageKey(item));
-  }
-});
-const indexItems = R.indexBy(getMessageKey);
+}
 const po = {
   catalogExtension: ".po",
+  templateExtension: ".pot",
   write(filename, catalog, options) {
     let po;
-    if (_fs.default.existsSync(filename)) {
-      const raw = _fs.default.readFileSync(filename).toString();
+    const raw = (0, _utils.readFile)(filename);
+    if (raw) {
       po = _pofile.default.parse(raw);
     } else {
       po = new _pofile.default();
@@ -79,19 +106,23 @@ const po = {
       if (options.locale === undefined) {
         delete po.headers.Language;
       }
-      po.headerOrder = R.keys(po.headers);
+      // accessing private property
+      ;
+      po.headerOrder = Object.keys(po.headers);
     }
     po.items = serialize(catalog, options);
     (0, _utils.writeFileIfChanged)(filename, po.toString());
   },
   read(filename) {
-    const raw = _fs.default.readFileSync(filename).toString();
+    const raw = (0, _utils.readFile)(filename);
+    if (!raw) {
+      return null;
+    }
     return this.parse(raw);
   },
   parse(raw) {
     const po = _pofile.default.parse(raw);
-    validateItems(po.items);
-    return deserialize(indexItems(po.items));
+    return deserialize(po.items, validateItem);
   }
 };
 var _default = po;

package/build/api/generateMessageId.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateMessageId = generateMessageId;
+var _crypto = _interopRequireDefault(require("crypto"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const UNIT_SEPARATOR = "\u001F";
+function generateMessageId(msg, context = "") {
+  return _crypto.default.createHash("sha256").update(msg + UNIT_SEPARATOR + (context || "")).digest("base64").slice(0, 6);
+}

package/build/api/help.js

@@ -36,7 +36,7 @@ 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";
   return `${runCommand} ${command}`;
-}
-const isYarn = process.env.npm_config_user_agent && process.env.npm_config_user_agent.includes("yarn");
-const runCommand = isYarn ? "yarn" : "npm run";
+}

package/build/api/index.js

@@ -3,31 +3,56 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  getFormat: true,
+  getCatalogForFile: true,
+  getCatalogs: true,
+  createCompiledCatalog: true,
+  generateMessageId: true
+};
 Object.defineProperty(exports, "createCompiledCatalog", {
   enumerable: true,
   get: function () {
     return _compile.createCompiledCatalog;
   }
 });
+Object.defineProperty(exports, "generateMessageId", {
+  enumerable: true,
+  get: function () {
+    return _generateMessageId.generateMessageId;
+  }
+});
 Object.defineProperty(exports, "getCatalogForFile", {
   enumerable: true,
   get: function () {
-    return _catalog.getCatalogForFile;
+    return _getCatalogs.getCatalogForFile;
   }
 });
 Object.defineProperty(exports, "getCatalogs", {
   enumerable: true,
   get: function () {
-    return _catalog.getCatalogs;
+    return _getCatalogs.getCatalogs;
   }
 });
 Object.defineProperty(exports, "getFormat", {
   enumerable: true,
   get: function () {
-    return _formats.default;
+    return _formats.getFormat;
   }
 });
-var _formats = _interopRequireDefault(require("./formats"));
-var _catalog = require("./catalog");
+var _formats = require("./formats");
+var _getCatalogs = require("./catalog/getCatalogs");
 var _compile = require("./compile");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _generateMessageId = require("./generateMessageId");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});

package/build/api/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/build/api/utils.js

@@ -3,38 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.PATHSEP = void 0;
 exports.hasYarn = hasYarn;
-exports.helpMisspelledCommand = helpMisspelledCommand;
+exports.isDirectory = isDirectory;
 exports.joinOrigin = void 0;
 exports.makeInstall = makeInstall;
+exports.normalizeRelativePath = normalizeRelativePath;
+exports.normalizeSlashes = normalizeSlashes;
 exports.prettyOrigin = prettyOrigin;
-exports.removeDirectory = removeDirectory;
+exports.readFile = readFile;
+exports.replacePlaceholders = replacePlaceholders;
 exports.splitOrigin = void 0;
+exports.writeFile = writeFile;
 exports.writeFileIfChanged = writeFileIfChanged;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _chalk = _interopRequireDefault(require("chalk"));
-var _fuzzaldrin = require("fuzzaldrin");
+var _normalizePath = _interopRequireDefault(require("normalize-path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function removeDirectory(dir, onlyContent = false) {
-  if (!_fs.default.existsSync(dir)) return;
-  const list = _fs.default.readdirSync(dir);
-  for (let i = 0; i < list.length; i++) {
-    const filename = _path.default.join(dir, list[i]);
-    const stat = _fs.default.statSync(filename);
-    if (filename === "." || filename === "..") {
-      // pass these files
-    } else if (stat.isDirectory()) {
-      // rmdir recursively
-      removeDirectory(filename);
-    } else {
-      _fs.default.unlinkSync(filename);
-    }
-  }
-  if (!onlyContent) {
-    _fs.default.rmdirSync(dir);
-  }
-}
+const PATHSEP = "/"; // force posix everywhere
+exports.PATHSEP = PATHSEP;
 function prettyOrigin(origins) {
   try {
     return origins.map(origin => origin.join(":")).join(", ");
@@ -42,44 +29,59 @@ function prettyOrigin(origins) {
     return "";
   }
 }
-
-/**
- * .. js:function:: helpMisspelledCommand(command [, availableCommands = []])
- *    :param: command - command passed to CLI
- *    :param: availableCommands - all commands defined in commander.js
- *
- *    If unknown commands is passed to CLI, check it agains all available commands
- *    for possible misspelled letter. Output help with suggestions to console.
- */
-function helpMisspelledCommand(command, availableCommands = []) {
-  const commandNames = availableCommands.map(command => command.name());
-
-  // if no command is supplied, then commander.js shows help automatically
-  if (!command || commandNames.includes(command)) {
-    return;
-  }
-  const suggestions = commandNames.map(name => ({
-    name,
-    score: (0, _fuzzaldrin.score)(name, command.slice(0, name.length))
-  })).filter(nameScore => nameScore.score > 0).slice(0, 3).map(commandScore => _chalk.default.inverse(commandScore.name)).join(", ");
-  console.log(`lingui: command ${command} is not a lingui command. ` + `See 'lingui --help' for the list of available commands.`);
-  if (suggestions) {
-    console.log();
-    console.log(`Did you mean: ${suggestions}?`);
-  }
+function replacePlaceholders(input, values) {
+  return input.replace(/\{([^}]+)}/g, (m, placeholder) => {
+    return values[placeholder] || m;
+  });
 }
-const splitOrigin = origin => origin.split(":");
+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;
+function readFile(fileName) {
+  try {
+    return _fs.default.readFileSync(fileName).toString();
+  } catch (err) {
+    if (err.code != "ENOENT") {
+      throw err;
+    }
+  }
+}
+function mkdirp(dir) {
+  try {
+    _fs.default.mkdirSync(dir, {
+      recursive: true
+    });
+  } catch (err) {
+    if (err.code != "EEXIST") {
+      throw err;
+    }
+  }
+}
+function isDirectory(filePath) {
+  try {
+    return _fs.default.lstatSync(filePath).isDirectory();
+  } catch (err) {
+    if (err.code != "ENOENT") {
+      throw err;
+    }
+  }
+}
+function writeFile(fileName, content) {
+  mkdirp(_path.default.dirname(fileName));
+  _fs.default.writeFileSync(fileName, content);
+}
 function writeFileIfChanged(filename, newContent) {
-  if (_fs.default.existsSync(filename)) {
-    const raw = _fs.default.readFileSync(filename).toString();
+  const raw = readFile(filename);
+  if (raw) {
     if (newContent !== raw) {
-      _fs.default.writeFileSync(filename, newContent);
+      writeFile(filename, newContent);
     }
   } else {
-    _fs.default.writeFileSync(filename, newContent);
+    writeFile(filename, newContent);
   }
 }
 function hasYarn() {
@@ -88,4 +90,26 @@ function hasYarn() {
 function makeInstall() {
   const withYarn = hasYarn();
   return (packageName, dev = false) => withYarn ? `yarn add ${dev ? "--dev " : ""}${packageName}` : `npm install ${dev ? "--save-dev" : "--save"} ${packageName}`;
+}
+
+/**
+ * Normalize Windows backslashes in path so they look always as posix
+ */
+function normalizeSlashes(path) {
+  return path.replace("\\", "/");
+}
+
+/**
+ * Remove ./ at the beginning: ./relative  => relative
+ *                             relative    => relative
+ * Preserve directories:       ./relative/ => relative/
+ * Preserve absolute paths:    /absolute/path => /absolute/path
+ */
+function normalizeRelativePath(sourcePath) {
+  if (_path.default.isAbsolute(sourcePath)) {
+    // absolute path
+    return (0, _normalizePath.default)(sourcePath, false);
+  }
+  const isDir = isDirectory(sourcePath);
+  return (0, _normalizePath.default)(_path.default.relative(process.cwd(), sourcePath), false) + (isDir ? "/" : "");
 }

package/build/lingui-compile.js

@@ -7,57 +7,43 @@ exports.command = command;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _fs = _interopRequireDefault(require("fs"));
-var R = _interopRequireWildcard(require("ramda"));
-var _commander = _interopRequireDefault(require("commander"));
-var plurals = _interopRequireWildcard(require("make-plural"));
+var _commander = require("commander");
 var _conf = require("@lingui/conf");
-var _catalog = require("./api/catalog");
 var _compile = require("./api/compile");
 var _help = require("./api/help");
 var _api = require("./api");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _getCatalogs = require("./api/catalog/getCatalogs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const noMessages = R.pipe(R.map(R.isEmpty), R.values, R.all(R.equals(true)));
 function command(config, options) {
-  const catalogs = (0, _catalog.getCatalogs)(config);
-
-  // fixme: this is definitely doesn't work
-  if (noMessages(catalogs)) {
-    console.error("Nothing to compile, message catalogs are empty!\n");
-    console.error(`(use "${_chalk.default.yellow((0, _help.helpRun)("extract"))}" to extract messages from source files)`);
-    return false;
-  }
+  const catalogs = (0, _api.getCatalogs)(config);
 
   // Check config.compile.merge if catalogs for current locale are to be merged into a single compiled file
   const doMerge = !!config.catalogsMergePath;
   let mergedCatalogs = {};
   console.log("Compiling message catalogs…");
   for (const locale of config.locales) {
-    const [language] = locale.split(/[_-]/);
-    // todo: this validation should be in @lingui/conf
-    if (locale !== config.pseudoLocale && !plurals[language]) {
-      console.error(_chalk.default.red(`Error: Invalid locale ${_chalk.default.bold(locale)} (missing plural rules)!`));
-      console.error();
-    }
     for (const catalog of catalogs) {
+      const missingMessages = [];
       const messages = catalog.getTranslations(locale, {
         fallbackLocales: config.fallbackLocales,
-        sourceLocale: config.sourceLocale
+        sourceLocale: config.sourceLocale,
+        onMissing: missing => {
+          missingMessages.push(missing);
+        }
       });
-      if (!options.allowEmpty) {
-        const missingMsgIds = R.pipe(R.pickBy(R.isNil), R.keys)(messages);
-        if (missingMsgIds.length > 0) {
-          console.error(_chalk.default.red(`Error: Failed to compile catalog for locale ${_chalk.default.bold(locale)}!`));
-          if (options.verbose) {
-            console.error(_chalk.default.red("Missing translations:"));
-            missingMsgIds.forEach(msgId => console.error(msgId));
-          } else {
-            console.error(_chalk.default.red(`Missing ${missingMsgIds.length} translation(s)`));
-          }
-          console.error();
-          return false;
+      if (!options.allowEmpty && missingMessages.length > 0) {
+        console.error(_chalk.default.red(`Error: Failed to compile catalog for locale ${_chalk.default.bold(locale)}!`));
+        if (options.verbose) {
+          console.error(_chalk.default.red("Missing translations:"));
+          missingMessages.forEach(missing => {
+            const source = missing.source || missing.source === missing.id ? `: (${missing.source})` : "";
+            console.error(`${missing.id}${source}`);
+          });
+        } else {
+          console.error(_chalk.default.red(`Missing ${missingMessages.length} translation(s)`));
         }
+        console.error();
+        return false;
       }
       if (doMerge) {
         mergedCatalogs = {
@@ -84,7 +70,7 @@ function command(config, options) {
       }
     }
     if (doMerge) {
-      const compileCatalog = (0, _catalog.getCatalogForMerge)(config);
+      const compileCatalog = (0, _getCatalogs.getCatalogForMerge)(config);
       const namespace = options.namespace || config.compileNamespace;
       const compiledCatalog = (0, _compile.createCompiledCatalog)(locale, mergedCatalogs, {
         strict: false,
@@ -99,7 +85,7 @@ function command(config, options) {
   return true;
 }
 if (require.main === module) {
-  _commander.default.description("Add compile message catalogs and add language data (plurals) to compiled bundle.").option("--config <path>", "Path to the config file").option("--strict", "Disable defaults for missing translations").option("--verbose", "Verbose output").option("--format <format>", "Format of message catalog").option("--typescript", "Create Typescript definition for compiled bundle").option("--namespace <namespace>", "Specify namespace for compiled bundle. Ex: cjs(default) -> module.exports, es -> export, window.test -> window.test").option("--watch", "Enables Watch Mode").option("--debounce <delay>", "Debounces compilation for given amount of milliseconds").on("--help", function () {
+  _commander.program.description("Add compile message catalogs and add language data (plurals) to compiled bundle.").option("--config <path>", "Path to the config file").option("--strict", "Disable defaults for missing translations").option("--verbose", "Verbose output").option("--typescript", "Create Typescript definition for compiled bundle").option("--namespace <namespace>", "Specify namespace for compiled bundle. Ex: cjs(default) -> module.exports, es -> export, window.test -> window.test").option("--watch", "Enables Watch Mode").option("--debounce <delay>", "Debounces compilation for given amount of milliseconds").on("--help", function () {
     console.log("\n  Examples:\n");
     console.log("    # Compile translations and use defaults or message IDs for missing translations");
     console.log(`    $ ${(0, _help.helpRun)("compile")}`);
@@ -109,35 +95,31 @@ if (require.main === module) {
     console.log("    # default messages or message IDs)");
     console.log(`    $ ${(0, _help.helpRun)("compile --strict")}`);
   }).parse(process.argv);
+  const options = _commander.program.opts();
   const config = (0, _conf.getConfig)({
-    configPath: _commander.default.config
+    configPath: options.config
   });
-  if (_commander.default.format) {
-    const msg = "--format option is deprecated and will be removed in @lingui/cli@3.0.0." + " Please set format in configuration https://lingui.dev/ref/conf#format";
-    console.warn(msg);
-    config.format = _commander.default.format;
-  }
   const compile = () => command(config, {
-    verbose: _commander.default.watch || _commander.default.verbose || false,
-    allowEmpty: !_commander.default.strict,
-    typescript: _commander.default.typescript || config.compileNamespace === "ts" || false,
-    namespace: _commander.default.namespace // we want this to be undefined if user does not specify so default can be used
+    verbose: options.watch || options.verbose || false,
+    allowEmpty: !options.strict,
+    typescript: options.typescript || config.compileNamespace === "ts" || false,
+    namespace: options.namespace // we want this to be undefined if user does not specify so default can be used
   });
 
   let debounceTimer;
   const dispatchCompile = () => {
     // Skip debouncing if not enabled
-    if (!_commander.default.debounce) return compile();
+    if (!options.debounce) return compile();
 
     // CLear the previous timer if there is any, and schedule the next
     debounceTimer && clearTimeout(debounceTimer);
-    debounceTimer = setTimeout(() => compile(), _commander.default.debounce);
+    debounceTimer = setTimeout(() => compile(), options.debounce);
   };
 
   // Check if Watch Mode is enabled
-  if (_commander.default.watch) {
+  if (options.watch) {
     console.info(_chalk.default.bold("Initializing Watch Mode..."));
-    const catalogs = (0, _catalog.getCatalogs)(config);
+    const catalogs = (0, _api.getCatalogs)(config);
     let paths = [];
     const catalogExtension = (0, _api.getFormat)(config.format).catalogExtension;
     config.locales.forEach(locale => {

package/build/lingui-extract-template.js

@@ -5,50 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = command;
 var _chalk = _interopRequireDefault(require("chalk"));
-var _commander = _interopRequireDefault(require("commander"));
+var _commander = require("commander");
 var _conf = require("@lingui/conf");
-var _catalog = require("./api/catalog");
-var _detect = require("./api/detect");
+var _api = require("./api");
+var _path = _interopRequireDefault(require("path"));
+var _utils = require("./api/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function command(config, options) {
-  // `react-app` babel plugin used by CRA requires either BABEL_ENV or NODE_ENV to be
-  // set. We're setting it here, because lingui macros are going to use them as well.
-  if (!process.env.BABEL_ENV && !process.env.NODE_ENV) {
-    process.env.BABEL_ENV = "development";
-  }
-
-  // We need macros to keep imports, so extract-messages plugin know what componets
-  // to collect. Users usually use both BABEN_ENV and NODE_ENV, so it's probably
-  // safer to introduce a new env variable. LINGUI_EXTRACT=1 during `lingui extract`
-  process.env.LINGUI_EXTRACT = "1";
-  options.verbose && console.error("Extracting messages from source files…");
-  const catalogs = (0, _catalog.getCatalogs)(config);
+  options.verbose && console.log("Extracting messages from source files…");
+  const catalogs = (0, _api.getCatalogs)(config);
   const catalogStats = {};
+  let commandSuccess = true;
   await Promise.all(catalogs.map(async catalog => {
-    await catalog.makeTemplate({
+    const result = await catalog.makeTemplate({
       ...options,
-      orderBy: config.orderBy,
-      projectType: (0, _detect.detect)()
+      orderBy: config.orderBy
     });
-    const catalogTemplate = catalog.readTemplate();
-    if (catalogTemplate !== null && catalogTemplate !== undefined) {
-      catalogStats[catalog.templateFile] = Object.keys(catalogTemplate).length;
+    if (result) {
+      catalogStats[(0, _utils.normalizeSlashes)(_path.default.relative(config.rootDir, catalog.templateFile))] = Object.keys(result).length;
     }
+    commandSuccess && (commandSuccess = Boolean(result));
   }));
   Object.entries(catalogStats).forEach(([key, value]) => {
     console.log(`Catalog statistics for ${_chalk.default.bold(key)}: ${_chalk.default.green(value)} messages`);
     console.log();
   });
-  return true;
+  return commandSuccess;
 }
 if (require.main === module) {
-  _commander.default.option("--config <path>", "Path to the config file").option("--verbose", "Verbose output").parse(process.argv);
+  _commander.program.option("--config <path>", "Path to the config file").option("--verbose", "Verbose output").parse(process.argv);
+  const options = _commander.program.opts();
   const config = (0, _conf.getConfig)({
-    configPath: _commander.default.config || process.env.LINGUI_CONFIG
+    configPath: options.config
   });
   const result = command(config, {
-    verbose: _commander.default.verbose || false,
-    configPath: _commander.default.config || process.env.LINGUI_CONFIG
+    verbose: options.verbose || false
   }).then(() => {
     if (!result) process.exit(1);
   });