@lingui/cli 3.13.3 → 3.15.0

package/api/catalog.js

@@ -326,46 +326,49 @@ var Catalog = /*#__PURE__*/function () {
       var _this2 = this;
 
       var catalogs = this.readAll();
+      var template = this.readTemplate() || {};
       return R.mapObjIndexed(function (_value, key) {
         return _this2.getTranslation(catalogs, locale, key, options);
-      }, catalogs[locale]);
+      }, _objectSpread(_objectSpread({}, template), catalogs[locale]));
     }
   }, {
     key: "getTranslation",
     value: function getTranslation(catalogs, locale, key, _ref4) {
-      var _this3 = this;
+      var _this3 = this,
+          _catalog$key;
 
       var fallbackLocales = _ref4.fallbackLocales,
           sourceLocale = _ref4.sourceLocale;
+      var catalog = catalogs[locale] || {};
 
-      if (!catalogs[locale].hasOwnProperty(key)) {
+      if (!catalog.hasOwnProperty(key)) {
         console.error("Message with key ".concat(key, " is missing in locale ").concat(locale));
       }
 
-      var getTranslation = function getTranslation(locale) {
+      var getTranslation = function getTranslation(_locale) {
         var configLocales = _this3.config.locales.join('", "');
 
-        var localeCatalog = catalogs[locale];
+        var localeCatalog = catalogs[_locale] || {};
 
         if (!localeCatalog) {
-          console.warn("\n        Catalog \"".concat(locale, "\" isn't present in locales config parameter\n        Add \"").concat(locale, "\" to your lingui.config.js:\n        {\n          locales: [\"").concat(configLocales, "\", \"").concat(locale, "\"]\n        }\n      "));
+          console.warn("\n        Catalog \"".concat(_locale, "\" isn't present in locales config parameter\n        Add \"").concat(_locale, "\" to your lingui.config.js:\n        {\n          locales: [\"").concat(configLocales, "\", \"").concat(_locale, "\"]\n        }\n      "));
           return null;
         }
 
         if (!localeCatalog.hasOwnProperty(key)) {
-          console.error("Message with key ".concat(key, " is missing in locale ").concat(locale));
+          console.error("Message with key ".concat(key, " is missing in locale ").concat(_locale));
           return null;
         }
 
-        if (catalogs[locale]) {
-          return catalogs[locale][key].translation;
+        if (catalogs[_locale]) {
+          return catalogs[_locale][key].translation;
         }
 
         return null;
       };
 
-      var getMultipleFallbacks = function getMultipleFallbacks(locale) {
-        var fL = fallbackLocales && fallbackLocales[locale]; // some probably the fallback will be undefined, so just search by locale
+      var getMultipleFallbacks = function getMultipleFallbacks(_locale) {
+        var fL = fallbackLocales && fallbackLocales[_locale]; // some probably the fallback will be undefined, so just search by locale
 
         if (!fL) return null;
 
@@ -394,9 +397,9 @@ var Catalog = /*#__PURE__*/function () {
       return (// Get translation in target locale
         getTranslation(locale) || // We search in fallbackLocales as dependent of each locale
         getMultipleFallbacks(locale) || // Get translation in fallbackLocales.default (if any)
-        fallbackLocales && fallbackLocales.default && getTranslation(fallbackLocales.default) || // Get message default
-        catalogs[locale][key].defaults || // If sourceLocale is either target locale of fallback one, use key
-        sourceLocale && sourceLocale === locale && key || sourceLocale && fallbackLocales.default && sourceLocale === fallbackLocales.default && key || // Otherwise no translation is available
+        (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) && getTranslation(fallbackLocales.default) || ( // Get message default
+        (_catalog$key = catalog[key]) === null || _catalog$key === void 0 ? void 0 : _catalog$key.defaults) || // If sourceLocale is either target locale of fallback one, use key
+        sourceLocale && sourceLocale === locale && key || sourceLocale && (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) && sourceLocale === fallbackLocales.default && key || // Otherwise no translation is available
         undefined
       );
     }

package/api/compile.js

@@ -35,11 +35,7 @@ var INVALID_OBJECT_KEY_REGEX = /^(\d+[a-zA-Z]|[a-zA-Z]+\d)(\d|[a-zA-Z])*/;
  * applying pseudolocalization where necessary.
  */
 function compileSingleKey(key, translation, shouldPseudolocalize) {
-  if (shouldPseudolocalize) {
-    translation = (0, _pseudoLocalize.default)(key);
-  }
-
-  return t.objectProperty(t.stringLiteral(key), compile(translation));
+  return t.objectProperty(t.stringLiteral(key), compile(translation, shouldPseudolocalize));
 }
 
 function createCompiledCatalog(locale, messages, options) {
@@ -107,6 +103,7 @@ function buildExportStatement(expression, namespace) {
 
 
 function compile(message) {
+  var shouldPseudolocalize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var tokens;
 
   try {
@@ -115,23 +112,29 @@ function compile(message) {
     throw new Error("Can't parse message. Please check correct syntax: \"".concat(message, "\" \n \n Messageformat-parser trace: ").concat(e.message));
   }
 
-  var ast = processTokens(tokens);
+  var ast = processTokens(tokens, shouldPseudolocalize);
   if (isString(ast)) return t.stringLiteral(ast);
   return ast;
 }
 
-function processTokens(tokens) {
+function processTokens(tokens, shouldPseudolocalize) {
   // Shortcut - if the message doesn't include any formatting,
   // simply join all string chunks into one message
   if (!tokens.filter(function (token) {
     return !isString(token);
   }).length) {
-    return tokens.join("");
+    if (shouldPseudolocalize) {
+      return tokens.map(function (token) {
+        return (0, _pseudoLocalize.default)(token);
+      }).join("");
+    } else {
+      return tokens.join("");
+    }
   }
 
   return t.arrayExpression(tokens.map(function (token) {
     if (isString(token)) {
-      return t.stringLiteral(token); // # in plural case
+      return t.stringLiteral(shouldPseudolocalize ? (0, _pseudoLocalize.default)(token) : token); // # in plural case
     } else if (token.type === "octothorpe") {
       return t.stringLiteral("#"); // simple argument
     } else if (token.type === "argument") {
@@ -155,7 +158,7 @@ function processTokens(tokens) {
     }
 
     token.cases.forEach(function (item) {
-      var inlineTokens = processTokens(item.tokens);
+      var inlineTokens = processTokens(item.tokens, shouldPseudolocalize);
       formatProps.push(t.objectProperty( // if starts with number must be wrapped with quotes
       INVALID_OBJECT_KEY_REGEX.test(item.key) ? t.stringLiteral(item.key) : t.identifier(item.key), isString(inlineTokens) ? t.stringLiteral(inlineTokens) : inlineTokens));
     });

package/api/formats/minimal.js

@@ -13,8 +13,6 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var R = _interopRequireWildcard(require("ramda"));
 
-var _utils = require("../utils");
-
 var serialize = R.map(function (message) {
   return message.translation || "";
 });
@@ -29,8 +27,23 @@ var deserialize = R.map(function (translation) {
 var minimal = {
   catalogExtension: ".json",
   write: function write(filename, catalog) {
+    var _file;
+
     var messages = serialize(catalog);
-    (0, _utils.writeFileIfChanged)(filename, JSON.stringify(messages, null, 2));
+    var file = null;
+
+    try {
+      file = _fs.default.readFileSync(filename, 'utf8');
+    } catch (error) {
+      if (error.code !== "ENOENT") {
+        throw error;
+      }
+    }
+
+    var shouldUseTrailingNewline = file === null || ((_file = file) === null || _file === void 0 ? void 0 : _file.endsWith("\n"));
+    var trailingNewLine = shouldUseTrailingNewline ? "\n" : "";
+
+    _fs.default.writeFileSync(filename, "".concat(JSON.stringify(messages, null, 2)).concat(trailingNewLine));
   },
   read: function read(filename) {
     var raw = _fs.default.readFileSync(filename).toString();

package/lingui-compile.js

@@ -57,7 +57,6 @@ function command(config, options) {
     if (locale !== config.pseudoLocale && !plurals[language]) {
       console.log(_chalk.default.red("Error: Invalid locale ".concat(_chalk.default.bold(locale), " (missing plural rules)!")));
       console.error();
-      process.exit(1);
     }
 
     catalogs.forEach(function (catalog) {

package/lingui-extract-template.js

@@ -9,8 +9,12 @@ exports.default = command;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _commander = _interopRequireDefault(require("commander"));
@@ -25,36 +29,83 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-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…");
-  var catalogs = (0, _catalog.getCatalogs)(config);
-  var catalogStats = {};
-  catalogs.forEach(function (catalog) {
-    catalog.makeTemplate(_objectSpread(_objectSpread({}, options), {}, {
-      orderBy: config.orderBy,
-      projectType: (0, _detect.detect)()
-    }));
-    catalogStats[catalog.templateFile] = Object.keys(catalog.readTemplate()).length;
-  });
-  Object.entries(catalogStats).forEach(function (_ref) {
-    var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-        key = _ref2[0],
-        value = _ref2[1];
+function command(_x, _x2) {
+  return _command.apply(this, arguments);
+}
 
-    console.log("Catalog statistics for ".concat(_chalk.default.bold(key), ": ").concat(_chalk.default.green(value), " messages"));
-    console.log();
-  });
-  return true;
+function _command() {
+  _command = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(config, options) {
+    var catalogs, catalogStats;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            // `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…");
+            catalogs = (0, _catalog.getCatalogs)(config);
+            catalogStats = {};
+            _context2.next = 7;
+            return Promise.all(catalogs.map( /*#__PURE__*/function () {
+              var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(catalog) {
+                var catalogTemplate;
+                return _regenerator.default.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return catalog.makeTemplate(_objectSpread(_objectSpread({}, options), {}, {
+                          orderBy: config.orderBy,
+                          projectType: (0, _detect.detect)()
+                        }));
+
+                      case 2:
+                        catalogTemplate = catalog.readTemplate();
+
+                        if (catalogTemplate !== null && catalogTemplate !== undefined) {
+                          catalogStats[catalog.templateFile] = Object.keys(catalogTemplate).length;
+                        }
+
+                      case 4:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x3) {
+                return _ref.apply(this, arguments);
+              };
+            }()));
+
+          case 7:
+            Object.entries(catalogStats).forEach(function (_ref2) {
+              var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+                  key = _ref3[0],
+                  value = _ref3[1];
+
+              console.log("Catalog statistics for ".concat(_chalk.default.bold(key), ": ").concat(_chalk.default.green(value), " messages"));
+              console.log();
+            });
+            return _context2.abrupt("return", true);
+
+          case 9:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _command.apply(this, arguments);
 }
 
 if (require.main === module) {
@@ -66,6 +117,7 @@ if (require.main === module) {
   var result = command(config, {
     verbose: _commander.default.verbose || false,
     configPath: _commander.default.config || process.env.LINGUI_CONFIG
+  }).then(function () {
+    if (!result) process.exit(1);
   });
-  if (!result) process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "3.13.3",
+  "version": "3.15.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -39,8 +39,8 @@
     "@babel/plugin-syntax-jsx": "^7.10.4",
     "@babel/runtime": "^7.11.2",
     "@babel/types": "^7.11.5",
-    "@lingui/babel-plugin-extract-messages": "^3.13.3",
-    "@lingui/conf": "^3.13.3",
+    "@lingui/babel-plugin-extract-messages": "^3.15.0",
+    "@lingui/conf": "^3.15.0",
     "babel-plugin-macros": "^3.0.1",
     "bcp-47": "^1.0.7",
     "chalk": "^4.1.0",
@@ -76,7 +76,7 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0",
-    "babel-plugin-macros": "2 || 3",
+    "babel-plugin-macros": "2 || 3",
     "typescript": "2 || 3 || 4"
   }
 }