@lingui/cli 3.16.1 → 3.17.1

package/build/services/translationIO.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = syncProcess;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = require("path");
-
 var _pofile = _interopRequireDefault(require("pofile"));
-
 var _https = _interopRequireDefault(require("https"));
-
 var _glob = _interopRequireDefault(require("glob"));
-
 var _dateFns = require("date-fns");
-
 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",
@@ -26,74 +18,69 @@ const getCreateHeaders = language => ({
   "Content-Transfer-Encoding": "8bit",
   "X-Generator": "@lingui/cli",
   Language: language
-}); // Main sync method, call "Init" or "Sync" depending on the project context
-
+});
 
+// Main sync method, call "Init" or "Sync" depending on the project context
 function syncProcess(config, options) {
-  if (config.format != 'po') {
+  if (config.format != "po") {
     console.error(`\n----------\nTranslation.io service is only compatible with the "po" format. Please update your Lingui configuration accordingly.\n----------`);
     process.exit(1);
   }
-
   const successCallback = project => {
     console.log(`\n----------\nProject successfully synchronized. Please use this URL to translate: ${project.url}\n----------`);
   };
-
   const failCallback = errors => {
-    console.error(`\n----------\nSynchronization with Translation.io failed: ${errors.join(', ')}\n----------`);
+    console.error(`\n----------\nSynchronization with Translation.io failed: ${errors.join(", ")}\n----------`);
   };
-
   init(config, options, successCallback, errors => {
-    if (errors.length && errors[0] === 'This project has already been initialized.') {
+    if (errors.length && errors[0] === "This project has already been initialized.") {
       sync(config, options, successCallback, failCallback);
     } else {
       failCallback(errors);
     }
   });
-} // Initialize project with source and existing translations (only first time!)
-// Cf. https://translation.io/docs/create-library#initialization
-
+}
 
+// Initialize project with source and existing translations (only first time!)
+// Cf. https://translation.io/docs/create-library#initialization
 function init(config, options, successCallback, failCallback) {
-  const sourceLocale = config.sourceLocale || 'en';
-  const pseudoLocale = config.pseudoLocale || 'pseudo';
+  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
+  });
 
+  // Create segments from source locale PO items
   paths[sourceLocale].forEach(path => {
     let raw = _fs.default.readFileSync(path).toString();
-
     let po = _pofile.default.parse(raw);
-
-    po.items.filter(item => !item['obsolete']).forEach(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
+  });
 
+  // Add translations to segments from target locale PO items
   targetLocales.forEach(targetLocale => {
     paths[targetLocale].forEach(path => {
       let raw = _fs.default.readFileSync(path).toString();
-
       let po = _pofile.default.parse(raw);
-
-      po.items.filter(item => !item['obsolete']).forEach((item, index) => {
+      po.items.filter(item => !item["obsolete"]).forEach((item, index) => {
         segments[targetLocale][index].target = item.msgstr[0];
       });
     });
   });
   let request = {
-    "client": "lingui",
-    "version": require('@lingui/core/package.json').version,
-    "source_language": sourceLocale,
-    "target_languages": targetLocales,
-    "segments": segments
+    client: "lingui",
+    version: require("@lingui/core/package.json").version,
+    source_language: sourceLocale,
+    target_languages: targetLocales,
+    segments: segments
   };
   postTio("init", request, config.service.apiKey, response => {
     if (response.errors) {
@@ -105,38 +92,37 @@ function init(config, options, successCallback, failCallback) {
   }, 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
-
+}
 
+// 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) {
-  const sourceLocale = config.sourceLocale || 'en';
+  const sourceLocale = config.sourceLocale || "en";
   const targetLocales = config.locales.filter(value => value != sourceLocale);
   const paths = poPathsPerLocale(config);
-  let segments = []; // Create segments with correct source
+  let segments = [];
 
+  // Create segments with correct source
   paths[sourceLocale].forEach(path => {
     let raw = _fs.default.readFileSync(path).toString();
-
     let po = _pofile.default.parse(raw);
-
-    po.items.filter(item => !item['obsolete']).forEach(item => {
+    po.items.filter(item => !item["obsolete"]).forEach(item => {
       let newSegment = createSegmentFromPoItem(item);
       segments.push(newSegment);
     });
   });
   let request = {
-    "client": "lingui",
-    "version": require('@lingui/core/package.json').version,
-    "source_language": sourceLocale,
-    "target_languages": targetLocales,
-    "segments": segments
-  }; // Sync and then remove unused segments (not present in the local application) from Translation.io
+    client: "lingui",
+    version: require("@lingui/core/package.json").version,
+    source_language: sourceLocale,
+    target_languages: targetLocales,
+    segments: segments
+  };
 
+  // Sync and then remove unused segments (not present in the local application) from Translation.io
   if (options.clean) {
-    request['purge'] = true;
+    request["purge"] = true;
   }
-
   postTio("sync", request, config.service.apiKey, response => {
     if (response.errors) {
       failCallback(response.errors);
@@ -148,63 +134,56 @@ function sync(config, options, successCallback, failCallback) {
     console.error(`\n----------\nSynchronization with Translation.io failed: ${error}\n----------`);
   });
 }
-
 function createSegmentFromPoItem(item) {
   let itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
   let segment = {
-    type: 'source',
+    type: "source",
     // No way to edit text for source language (inside code), so not using "key" here
     source: itemHasId ? item.msgstr[0] : item.msgid,
     // msgstr may be empty if --overwrite is used and no ID is used
-    context: '',
+    context: "",
     references: [],
-    comment: ''
+    comment: ""
   };
-
   if (itemHasId) {
     segment.context = item.msgid;
   }
-
   if (item.references.length) {
     segment.references = item.references;
   }
-
   if (item.extractedComments.length) {
-    segment.comment = item.extractedComments.join(' | ');
+    segment.comment = item.extractedComments.join(" | ");
   }
-
   return segment;
 }
-
 function createPoItemFromSegment(segment) {
   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 : [];
-  item.extractedComments = segment.comment ? segment.comment.split(' | ') : [];
+  item.extractedComments = segment.comment ? segment.comment.split(" | ") : [];
   return item;
 }
-
 function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
   Object.keys(segmentsPerLocale).forEach(targetLocale => {
     // Remove existing target POs and JS for this target locale
     paths[targetLocale].forEach(path => {
       const jsPath = path.replace(/\.po?$/, "") + ".js";
-      const dirPath = (0, _path.dirname)(path); // Remove PO, JS and empty dir
+      const dirPath = (0, _path.dirname)(path);
 
+      // Remove PO, JS and empty dir
       if (_fs.default.existsSync(path)) {
         _fs.default.unlinkSync(path);
       }
-
       if (_fs.default.existsSync(jsPath)) {
         _fs.default.unlinkSync(jsPath);
       }
-
       if (_fs.default.existsSync(dirPath) && _fs.default.readdirSync(dirPath).length === 0) {
         _fs.default.rmdirSync(dirPath);
       }
-    }); // Find target path (ignoring {name})
+    });
 
+    // Find target path (ignoring {name})
     const localePath = "".concat(config.catalogs[0].path.replace(/{locale}/g, targetLocale).replace(/{name}/g, ""), ".po");
     const segments = segmentsPerLocale[targetLocale];
     let po = new _pofile.default();
@@ -213,26 +192,26 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
     segments.forEach(segment => {
       let item = createPoItemFromSegment(segment);
       items.push(item);
-    }); // Sort items by messageId
+    });
 
+    // Sort items by messageId
     po.items = items.sort((a, b) => {
       if (a.msgid < b.msgid) {
         return -1;
       }
-
       if (a.msgid > b.msgid) {
         return 1;
       }
-
       return 0;
-    }); // Check that localePath directory exists and save PO file
+    });
 
+    // Check that localePath directory exists and save PO file
     _fs.default.promises.mkdir((0, _path.dirname)(localePath), {
       recursive: true
     }).then(() => {
       po.save(localePath, err => {
         if (err) {
-          console.error('Error while saving target PO files:');
+          console.error("Error while saving target PO files:");
           console.error(err);
           process.exit(1);
         }
@@ -240,15 +219,15 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
     });
   });
 }
-
 function poPathsPerLocale(config) {
   const paths = [];
   config.locales.forEach(locale => {
     paths[locale] = [];
     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
+      const path = "".concat(catalog.path.replace(/{locale}/g, locale).replace(/{name}/g, "*"), ".po");
 
-      if (path.includes('*')) {
+      // If {name} is present (replaced by *), list all the existing POs
+      if (path.includes("*")) {
         paths[locale] = paths[locale].concat(_glob.default.sync(path));
       } else {
         paths[locale].push(path);
@@ -257,31 +236,28 @@ function poPathsPerLocale(config) {
   });
   return paths;
 }
-
 function postTio(action, request, apiKey, successCallback, failCallback) {
   let jsonRequest = JSON.stringify(request);
   let options = {
-    hostname: 'translation.io',
-    path: '/api/v1/segments/' + action + '.json?api_key=' + apiKey,
-    method: 'POST',
+    hostname: "translation.io",
+    path: "/api/v1/segments/" + action + ".json?api_key=" + apiKey,
+    method: "POST",
     headers: {
-      'Content-Type': 'application/json'
+      "Content-Type": "application/json"
     }
   };
-
   let req = _https.default.request(options, res => {
-    res.setEncoding('utf8');
+    res.setEncoding("utf8");
     let body = "";
-    res.on('data', chunk => {
+    res.on("data", chunk => {
       body = body.concat(chunk);
     });
-    res.on('end', () => {
+    res.on("end", () => {
       let response = JSON.parse(body);
       successCallback(response);
     });
   });
-
-  req.on('error', e => {
+  req.on("error", e => {
     failCallback(e);
   });
   req.write(jsonRequest);

package/build/tests.js

@@ -4,32 +4,22 @@ 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;
-
+exports.makeNextMessage = makeNextMessage;
+exports.makePrevMessage = makePrevMessage;
 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,
@@ -50,7 +40,6 @@ const defaultMergeOptions = {
   overwrite: false
 };
 exports.defaultMergeOptions = defaultMergeOptions;
-
 const makeCatalog = (config = {}) => {
   return new _catalog.Catalog({
     name: "messages",
@@ -59,16 +48,13 @@ const makeCatalog = (config = {}) => {
     exclude: []
   }, (0, _jestMocks.mockConfig)(config));
 };
-
 exports.makeCatalog = makeCatalog;
-
 function makePrevMessage(message = {}) {
   return {
     translation: "",
     ...makeNextMessage(message)
   };
 }
-
 function makeNextMessage(message = {}) {
   return {
     origin: [["catalog.test.ts", 1]],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "3.16.1",
+  "version": "3.17.1",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -45,14 +45,15 @@
     "build/"
   ],
   "dependencies": {
-    "@babel/generator": "^7.11.6",
-    "@babel/parser": "^7.11.5",
-    "@babel/plugin-syntax-jsx": "^7.10.4",
-    "@babel/runtime": "^7.11.2",
-    "@babel/types": "^7.11.5",
-    "@lingui/babel-plugin-extract-messages": "3.16.1",
-    "@lingui/conf": "3.16.1",
-    "@lingui/core": "3.16.1",
+    "@babel/generator": "^7.20.14",
+    "@babel/parser": "^7.20.15",
+    "@babel/plugin-syntax-jsx": "^7.18.6",
+    "@babel/runtime": "^7.20.13",
+    "@babel/types": "^7.20.7",
+    "@lingui/babel-plugin-extract-messages": "3.17.1",
+    "@lingui/conf": "3.17.1",
+    "@lingui/core": "3.17.1",
+    "@messageformat/parser": "^5.0.0",
     "babel-plugin-macros": "^3.0.1",
     "bcp-47": "^1.0.7",
     "chalk": "^4.1.0",
@@ -83,12 +84,12 @@
     "@types/papaparse": "^5.2.3",
     "@types/plurals-cldr": "^1.0.1",
     "mockdate": "^3.0.2",
-    "typescript": "^4.0.3"
+    "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0",
     "babel-plugin-macros": "2 || 3",
     "typescript": "2 || 3 || 4"
   },
-  "gitHead": "bae762a1ef15d0a4d883bc8c1837603b4e79175e"
+  "gitHead": "76ef4e8d1c668578ce2c3829ebf35d22ca5e679c"
 }