@lingui/cli 3.15.0 → 3.16.1

package/{services → build/services}/translationIO.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -19,33 +17,33 @@ var _glob = _interopRequireDefault(require("glob"));
 
 var _dateFns = require("date-fns");
 
-var getCreateHeaders = function getCreateHeaders(language) {
-  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
-  };
-}; // Main sync method, call "Init" or "Sync" depending on the project context
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const getCreateHeaders = language => ({
+  "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
+}); // Main sync method, call "Init" or "Sync" depending on the project context
 
 
 function syncProcess(config, options) {
   if (config.format != 'po') {
-    console.error("\n----------\nTranslation.io service is only compatible with the \"po\" format. Please update your Lingui configuration accordingly.\n----------");
+    console.error(`\n----------\nTranslation.io service is only compatible with the "po" format. Please update your Lingui configuration accordingly.\n----------`);
     process.exit(1);
   }
 
-  var successCallback = function successCallback(project) {
-    console.log("\n----------\nProject successfully synchronized. Please use this URL to translate: ".concat(project.url, "\n----------"));
+  const successCallback = project => {
+    console.log(`\n----------\nProject successfully synchronized. Please use this URL to translate: ${project.url}\n----------`);
   };
 
-  var failCallback = function failCallback(errors) {
-    console.error("\n----------\nSynchronization with Translation.io failed: ".concat(errors.join(', '), "\n----------"));
+  const failCallback = errors => {
+    console.error(`\n----------\nSynchronization with Translation.io failed: ${errors.join(', ')}\n----------`);
   };
 
-  init(config, options, successCallback, function (errors) {
+  init(config, options, successCallback, errors => {
     if (errors.length && errors[0] === 'This project has already been initialized.') {
       sync(config, options, successCallback, failCallback);
     } else {
@@ -57,87 +55,77 @@ function syncProcess(config, options) {
 
 
 function init(config, options, successCallback, failCallback) {
-  var sourceLocale = config.sourceLocale || 'en';
-  var pseudoLocale = config.pseudoLocale || 'pseudo';
-  var targetLocales = config.locales.filter(function (value) {
-    return value != sourceLocale && value != pseudoLocale;
-  });
-  var paths = poPathsPerLocale(config);
-  var segments = {};
-  targetLocales.forEach(function (targetLocale) {
+  const sourceLocale = config.sourceLocale || 'en';
+  const pseudoLocale = config.pseudoLocale || 'pseudo';
+  const targetLocales = config.locales.filter(value => value != sourceLocale && value != pseudoLocale);
+  const paths = poPathsPerLocale(config);
+  let segments = {};
+  targetLocales.forEach(targetLocale => {
     segments[targetLocale] = [];
   }); // Create segments from source locale PO items
 
-  paths[sourceLocale].forEach(function (path) {
-    var raw = _fs.default.readFileSync(path).toString();
+  paths[sourceLocale].forEach(path => {
+    let raw = _fs.default.readFileSync(path).toString();
 
-    var po = _pofile.default.parse(raw);
+    let po = _pofile.default.parse(raw);
 
-    po.items.filter(function (item) {
-      return !item['obsolete'];
-    }).forEach(function (item) {
-      targetLocales.forEach(function (targetLocale) {
-        var newSegment = createSegmentFromPoItem(item);
+    po.items.filter(item => !item['obsolete']).forEach(item => {
+      targetLocales.forEach(targetLocale => {
+        let newSegment = createSegmentFromPoItem(item);
         segments[targetLocale].push(newSegment);
       });
     });
   }); // Add translations to segments from target locale PO items
 
-  targetLocales.forEach(function (targetLocale) {
-    paths[targetLocale].forEach(function (path) {
-      var raw = _fs.default.readFileSync(path).toString();
+  targetLocales.forEach(targetLocale => {
+    paths[targetLocale].forEach(path => {
+      let raw = _fs.default.readFileSync(path).toString();
 
-      var po = _pofile.default.parse(raw);
+      let po = _pofile.default.parse(raw);
 
-      po.items.filter(function (item) {
-        return !item['obsolete'];
-      }).forEach(function (item, index) {
+      po.items.filter(item => !item['obsolete']).forEach((item, index) => {
         segments[targetLocale][index].target = item.msgstr[0];
       });
     });
   });
-  var request = {
+  let request = {
     "client": "lingui",
     "version": require('@lingui/core/package.json').version,
     "source_language": sourceLocale,
     "target_languages": targetLocales,
     "segments": segments
   };
-  postTio("init", request, config.service.apiKey, function (response) {
+  postTio("init", request, config.service.apiKey, response => {
     if (response.errors) {
       failCallback(response.errors);
     } else {
       saveSegmentsToTargetPos(config, paths, response.segments);
       successCallback(response.project);
     }
-  }, function (error) {
-    console.error("\n----------\nSynchronization with Translation.io failed: ".concat(error, "\n----------"));
+  }, error => {
+    console.error(`\n----------\nSynchronization with Translation.io failed: ${error}\n----------`);
   });
 } // Send all source text from PO to Translation.io and create new PO based on received translations
 // Cf. https://translation.io/docs/create-library#synchronization
 
 
 function sync(config, options, successCallback, failCallback) {
-  var sourceLocale = config.sourceLocale || 'en';
-  var targetLocales = config.locales.filter(function (value) {
-    return value != sourceLocale;
-  });
-  var paths = poPathsPerLocale(config);
-  var segments = []; // Create segments with correct source
+  const sourceLocale = config.sourceLocale || 'en';
+  const targetLocales = config.locales.filter(value => value != sourceLocale);
+  const paths = poPathsPerLocale(config);
+  let segments = []; // Create segments with correct source
 
-  paths[sourceLocale].forEach(function (path) {
-    var raw = _fs.default.readFileSync(path).toString();
+  paths[sourceLocale].forEach(path => {
+    let raw = _fs.default.readFileSync(path).toString();
 
-    var po = _pofile.default.parse(raw);
+    let po = _pofile.default.parse(raw);
 
-    po.items.filter(function (item) {
-      return !item['obsolete'];
-    }).forEach(function (item) {
-      var newSegment = createSegmentFromPoItem(item);
+    po.items.filter(item => !item['obsolete']).forEach(item => {
+      let newSegment = createSegmentFromPoItem(item);
       segments.push(newSegment);
     });
   });
-  var request = {
+  let request = {
     "client": "lingui",
     "version": require('@lingui/core/package.json').version,
     "source_language": sourceLocale,
@@ -149,21 +137,21 @@ function sync(config, options, successCallback, failCallback) {
     request['purge'] = true;
   }
 
-  postTio("sync", request, config.service.apiKey, function (response) {
+  postTio("sync", request, config.service.apiKey, response => {
     if (response.errors) {
       failCallback(response.errors);
     } else {
       saveSegmentsToTargetPos(config, paths, response.segments);
       successCallback(response.project);
     }
-  }, function (error) {
-    console.error("\n----------\nSynchronization with Translation.io failed: ".concat(error, "\n----------"));
+  }, error => {
+    console.error(`\n----------\nSynchronization with Translation.io failed: ${error}\n----------`);
   });
 }
 
 function createSegmentFromPoItem(item) {
-  var itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
-  var segment = {
+  let itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
+  let segment = {
     type: 'source',
     // No way to edit text for source language (inside code), so not using "key" here
     source: itemHasId ? item.msgstr[0] : item.msgid,
@@ -189,7 +177,7 @@ function createSegmentFromPoItem(item) {
 }
 
 function createPoItemFromSegment(segment) {
-  var item = new _pofile.default.Item();
+  let item = new _pofile.default.Item();
   item.msgid = segment.context ? segment.context : segment.source;
   item.msgstr = [segment.target];
   item.references = segment.references && segment.references.length ? segment.references : [];
@@ -198,13 +186,11 @@ function createPoItemFromSegment(segment) {
 }
 
 function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
-  var NAME = "{name}";
-  var LOCALE = "{locale}";
-  Object.keys(segmentsPerLocale).forEach(function (targetLocale) {
+  Object.keys(segmentsPerLocale).forEach(targetLocale => {
     // Remove existing target POs and JS for this target locale
-    paths[targetLocale].forEach(function (path) {
-      var jsPath = path.replace(/\.po?$/, "") + ".js";
-      var dirPath = (0, _path.dirname)(path); // Remove PO, JS and empty dir
+    paths[targetLocale].forEach(path => {
+      const jsPath = path.replace(/\.po?$/, "") + ".js";
+      const dirPath = (0, _path.dirname)(path); // Remove PO, JS and empty dir
 
       if (_fs.default.existsSync(path)) {
         _fs.default.unlinkSync(path);
@@ -219,17 +205,17 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
       }
     }); // Find target path (ignoring {name})
 
-    var localePath = "".concat(config.catalogs[0].path.replace(LOCALE, targetLocale).replace(NAME, ''), ".po");
-    var segments = segmentsPerLocale[targetLocale];
-    var po = new _pofile.default();
+    const localePath = "".concat(config.catalogs[0].path.replace(/{locale}/g, targetLocale).replace(/{name}/g, ""), ".po");
+    const segments = segmentsPerLocale[targetLocale];
+    let po = new _pofile.default();
     po.headers = getCreateHeaders(targetLocale);
-    var items = [];
-    segments.forEach(function (segment) {
-      var item = createPoItemFromSegment(segment);
+    let items = [];
+    segments.forEach(segment => {
+      let item = createPoItemFromSegment(segment);
       items.push(item);
     }); // Sort items by messageId
 
-    po.items = items.sort(function (a, b) {
+    po.items = items.sort((a, b) => {
       if (a.msgid < b.msgid) {
         return -1;
       }
@@ -243,8 +229,8 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
 
     _fs.default.promises.mkdir((0, _path.dirname)(localePath), {
       recursive: true
-    }).then(function () {
-      po.save(localePath, function (err) {
+    }).then(() => {
+      po.save(localePath, err => {
         if (err) {
           console.error('Error while saving target PO files:');
           console.error(err);
@@ -256,13 +242,11 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
 }
 
 function poPathsPerLocale(config) {
-  var NAME = "{name}";
-  var LOCALE = "{locale}";
-  var paths = [];
-  config.locales.forEach(function (locale) {
+  const paths = [];
+  config.locales.forEach(locale => {
     paths[locale] = [];
-    config.catalogs.forEach(function (catalog) {
-      var path = "".concat(catalog.path.replace(LOCALE, locale).replace(NAME, "*"), ".po"); // If {name} is present (replaced by *), list all the existing POs
+    config.catalogs.forEach(catalog => {
+      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.default.sync(path));
@@ -275,8 +259,8 @@ function poPathsPerLocale(config) {
 }
 
 function postTio(action, request, apiKey, successCallback, failCallback) {
-  var jsonRequest = JSON.stringify(request);
-  var options = {
+  let jsonRequest = JSON.stringify(request);
+  let options = {
     hostname: 'translation.io',
     path: '/api/v1/segments/' + action + '.json?api_key=' + apiKey,
     method: 'POST',
@@ -285,19 +269,19 @@ function postTio(action, request, apiKey, successCallback, failCallback) {
     }
   };
 
-  var req = _https.default.request(options, function (res) {
+  let req = _https.default.request(options, res => {
     res.setEncoding('utf8');
-    var body = "";
-    res.on('data', function (chunk) {
+    let body = "";
+    res.on('data', chunk => {
       body = body.concat(chunk);
     });
-    res.on('end', function () {
-      var response = JSON.parse(body);
+    res.on('end', () => {
+      let response = JSON.parse(body);
       successCallback(response);
     });
   });
 
-  req.on('error', function (e) {
+  req.on('error', e => {
     failCallback(e);
   });
   req.write(jsonRequest);

package/build/tests.js

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.copyFixture = copyFixture;
+exports.makePrevMessage = makePrevMessage;
+exports.makeNextMessage = makeNextMessage;
+exports.makeCatalog = exports.defaultMergeOptions = exports.defaultMakeTemplateOptions = exports.defaultMakeOptions = void 0;
+
+var _os = _interopRequireDefault(require("os"));
+
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _jestMocks = require("@lingui/jest-mocks");
+
+var _catalog = require("./api/catalog");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function copyFixture(fixtureDir) {
+  const tmpDir = _fsExtra.default.mkdtempSync(_path.default.join(_os.default.tmpdir(), `lingui-test-${process.pid}`));
+
+  if (_fsExtra.default.existsSync(fixtureDir)) {
+    _fsExtra.default.copySync(fixtureDir, tmpDir);
+  }
+
+  return tmpDir;
+}
+
+const defaultMakeOptions = {
+  verbose: false,
+  clean: false,
+  overwrite: false,
+  locale: null,
+  prevFormat: null,
+  configPath: null,
+  orderBy: "messageId"
+};
+exports.defaultMakeOptions = defaultMakeOptions;
+const defaultMakeTemplateOptions = {
+  verbose: false,
+  configPath: null,
+  orderBy: "messageId"
+};
+exports.defaultMakeTemplateOptions = defaultMakeTemplateOptions;
+const defaultMergeOptions = {
+  overwrite: false
+};
+exports.defaultMergeOptions = defaultMergeOptions;
+
+const makeCatalog = (config = {}) => {
+  return new _catalog.Catalog({
+    name: "messages",
+    path: "{locale}/messages",
+    include: [],
+    exclude: []
+  }, (0, _jestMocks.mockConfig)(config));
+};
+
+exports.makeCatalog = makeCatalog;
+
+function makePrevMessage(message = {}) {
+  return {
+    translation: "",
+    ...makeNextMessage(message)
+  };
+}
+
+function makeNextMessage(message = {}) {
+  return {
+    origin: [["catalog.test.ts", 1]],
+    obsolete: false,
+    ...message
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "3.15.0",
+  "version": "3.16.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -18,20 +18,31 @@
     "name": "Tomáš Ehrlich",
     "email": "tomas.ehrlich@gmail.com"
   },
-  "main": "index.js",
+  "main": "./build/lingui.js",
   "bin": {
-    "lingui": "./lingui.js"
+    "lingui": "./build/lingui.js"
+  },
+  "exports": {
+    ".": {
+      "require": "./build/lingui.js"
+    },
+    "./api": {
+      "require": "./build/api/index.js"
+    },
+    "./api/extractors/babel": {
+      "require": "./build/api/extractors/babel.js"
+    },
+    "./api/extractors/typescript": {
+      "require": "./build/api/extractors/typescript.js"
+    }
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "LICENSE",
     "README.md",
-    "api",
-    "services",
-    "lingui.js",
-    "lingui-*.js"
+    "build/"
   ],
   "dependencies": {
     "@babel/generator": "^7.11.6",
@@ -39,8 +50,9 @@
     "@babel/plugin-syntax-jsx": "^7.10.4",
     "@babel/runtime": "^7.11.2",
     "@babel/types": "^7.11.5",
-    "@lingui/babel-plugin-extract-messages": "^3.15.0",
-    "@lingui/conf": "^3.15.0",
+    "@lingui/babel-plugin-extract-messages": "3.16.1",
+    "@lingui/conf": "3.16.1",
+    "@lingui/core": "3.16.1",
     "babel-plugin-macros": "^3.0.1",
     "bcp-47": "^1.0.7",
     "chalk": "^4.1.0",
@@ -53,7 +65,6 @@
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
     "make-plural": "^6.2.2",
-    "messageformat-parser": "^4.1.3",
     "micromatch": "4.0.2",
     "mkdirp": "^1.0.4",
     "node-gettext": "^3.0.0",
@@ -78,5 +89,6 @@
     "@babel/core": "^7.0.0",
     "babel-plugin-macros": "2 || 3",
     "typescript": "2 || 3 || 4"
-  }
+  },
+  "gitHead": "bae762a1ef15d0a4d883bc8c1837603b4e79175e"
 }