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

package/build/api/extractors/babel.js

@@ -16,8 +16,8 @@ const extractor = {
   match(filename) {
     return babelRe.test(filename);
   },
-  async extract(filename, code, onMessageExtracted, linguiConfig, ctx) {
-    const parserOptions = linguiConfig.extractorParserOptions;
+  async extract(filename, code, onMessageExtracted, ctx) {
+    const parserOptions = ctx.linguiConfig.extractorParserOptions;
     const parserPlugins = [
     // https://babeljs.io/docs/en/babel-parser#latest-ecmascript-features
     ["decorators", {
@@ -58,7 +58,7 @@ const extractor = {
         resolvePath: source => require.resolve(source),
         lingui: {
           extract: true,
-          linguiConfig
+          linguiConfig: ctx.linguiConfig
         }
       }], [_babelPluginExtractMessages.default, {
         onMessageExtracted: msg => {

package/build/api/extractors/index.js

@@ -22,7 +22,9 @@ async function extract(filename, onMessageExtracted, linguiConfig, options) {
     if (!ext.match(filename)) continue;
     try {
       const file = await _promises.default.readFile(filename);
-      await ext.extract(filename, file.toString(), onMessageExtracted, linguiConfig);
+      await ext.extract(filename, file.toString(), onMessageExtracted, {
+        linguiConfig
+      });
       return true;
     } catch (e) {
       console.error(`Cannot process file ${filename} ${e.message}`);

package/build/lingui-compile.js

@@ -8,14 +8,11 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _fs = _interopRequireDefault(require("fs"));
 var _commander = require("commander");
-var plurals = _interopRequireWildcard(require("make-plural"));
 var _conf = require("@lingui/conf");
 var _compile = require("./api/compile");
 var _help = require("./api/help");
 var _api = require("./api");
 var _getCatalogs = require("./api/catalog/getCatalogs");
-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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function command(config, options) {
   const catalogs = (0, _api.getCatalogs)(config);
@@ -25,13 +22,6 @@ function command(config, options) {
   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
-    // todo: validate locales according bcp47, instead of plurals
-    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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.0.0-next.0",
+  "version": "4.0.0-next.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -51,12 +51,11 @@
     "@babel/plugin-syntax-jsx": "^7.18.6",
     "@babel/runtime": "^7.20.13",
     "@babel/types": "^7.20.7",
-    "@lingui/babel-plugin-extract-messages": "^4.0.0-next.0",
-    "@lingui/conf": "^4.0.0-next.0",
-    "@lingui/core": "^4.0.0-next.0",
+    "@lingui/babel-plugin-extract-messages": "^4.0.0-next.1",
+    "@lingui/conf": "^4.0.0-next.1",
+    "@lingui/core": "^4.0.0-next.1",
     "@messageformat/parser": "^5.0.0",
     "babel-plugin-macros": "^3.0.1",
-    "bcp-47": "^1.0.7",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
     "cli-table": "0.3.6",
@@ -65,7 +64,6 @@
     "date-fns": "^2.16.1",
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
-    "make-plural": "^6.2.2",
     "micromatch": "4.0.2",
     "mkdirp": "^1.0.4",
     "node-gettext": "^3.0.0",
@@ -88,5 +86,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "637f5cf6beda9d4ebce4e15cd9fdaa23e404b660"
+  "gitHead": "27ee8e213ff6d0c7a0cd2b21c573d7f6da43fd85"
 }

package/build/api/locales.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isValid = isValid;
-exports.parse = parse;
-var plurals = _interopRequireWildcard(require("make-plural/plurals"));
-var _bcp = _interopRequireDefault(require("bcp-47"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-/**
- * Check that locale is valid according to BCP47 and we have plurals for it
- * @param locale: string - Locale in BCP47 format
- * @return {boolean}
- */
-function isValid(locale) {
-  const localeData = parse(locale);
-  return localeData !== null && localeData !== undefined && localeData.language in plurals;
-}
-
-/**
- * Parse locale in BCP47 format and
- * @param locale - Locale in BCP47 format
- * @return {LocaleInfo}
- */
-function parse(locale) {
-  if (typeof locale !== "string") return null;
-  const schema = _bcp.default.parse(locale.replace("_", "-"));
-  if (!schema.language) return null;
-  return {
-    locale: _bcp.default.stringify(schema),
-    language: schema.language
-  };
-}