locize-cli 7.9.0 → 7.10.1

package/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [7.10.1](https://github.com/locize/locize-cli/compare/v7.10.0...v7.10.1) - 2022-04-07
+
+- cache dns lookups
+
+## [7.10.0](https://github.com/locize/locize-cli/compare/v7.9.1...v7.10.0) - 2022-03-15
+
+- gettext_i18next: try to detect v4 format
+
+## [7.9.1](https://github.com/locize/locize-cli/compare/v7.9.0...v7.9.1) - 2022-03-02
+
+- xliff: fix combined plural keys
+
+
 ## [7.9.0](https://github.com/locize/locize-cli/compare/v7.8.2...v7.9.0) - 2022-03-01
 
 - xliff: detect i18n format and merge pluralforms if necessary

package/combineSubkeyPreprocessor.js

@@ -28,8 +28,12 @@ const uniq = (value, index, self) => self.indexOf(value) === index;
 const stringify = (o) => {
   let str = jsyaml.dump(o);
   const subKeys = Object.keys(o);
-  subKeys.forEach((sk, i) => {
-    str = str.replace(new RegExp(`^(?:${sk}: )+`, 'm'), `{${sk}}: `);
+  subKeys.forEach((sk) => {
+    if (isNaN(sk)) {
+      str = str.replace(new RegExp(`^(?:${sk}: )+`, 'm'), `{${sk}}: `);
+    } else {
+      str = str.replace(new RegExp(`^(?:'${sk}': )+`, 'm'), `{${sk}}: `);
+    }
   });
   return str;
 };
@@ -38,6 +42,11 @@ const transformKeys = (segments, baseKeys, toMerge, deli) => {
   baseKeys.forEach((bk) => {
     const asObj = toMerge[bk].reduce((mem, k) => {
       const subKey = k.substring((bk + deli).length);
+      // special handling for i18next v3
+      if (deli === delimiter.i18next && subKey === 'plural' && segments[bk]) {
+        mem['__'] = segments[bk];
+        delete segments[bk];
+      }
       mem[subKey] = segments[k];
       return mem;
     }, {});
@@ -107,7 +116,12 @@ const parse = (s) => {
   let matchArray;
   while ((matchArray = skRegex.exec(s)) !== null) {
     const [match, sk] = matchArray;
-    s = s.replace(new RegExp(`^(?:${match}: )+`, 'm'), `${sk}: `);
+    if (isNaN(sk)) {
+      s = s.replace(new RegExp(`^(?:${match}: )+`, 'm'), `${sk}: `);
+    } else {
+      const escapedMatch = match.replace('{', '\\{').replace('}', '\\}');
+      s = s.replace(new RegExp(`^(?:${escapedMatch}: )+`, 'm'), `${sk}: `);
+    }
   }
   return jsyaml.load(s);
 };
@@ -122,6 +136,10 @@ const prepareImport = (resources) => {
         Object.keys(parsed).map((sk) => {
           const skVal = parsed[sk];
           resources[`${baseKey}_${sk}`] = skVal;
+          if (sk === '__') {
+            resources[baseKey] = resources[`${baseKey}_${sk}`];
+            delete resources[`${baseKey}_${sk}`];
+          }
         });
         delete resources[k];
       }

package/convertToDesiredFormat.js

@@ -56,11 +56,13 @@ const convertToDesiredFormat = (
     }
     if (opt.format === 'po_i18next' || opt.format === 'gettext_i18next') {
       const flatData = flatten(data);
+      const compatibilityJSON = !!Object.keys(flatData).find((k) => /_(zero|one|two|few|many|other)/.test(k)) && 'v4';
       const gettextOpt = {
         project: 'locize',
         language: lng,
         potCreationDate: lastModified,
-        poRevisionDate: lastModified
+        poRevisionDate: lastModified,
+        compatibilityJSON
       };
       cb(null, i18next2po(lng, flatData, gettextOpt));
       return;

package/convertToFlatFormat.js

@@ -40,7 +40,9 @@ const convertToFlatFormat = (opt, data, lng, cb) => {
     }
     if (opt.format === 'po_i18next' || opt.format === 'gettext_i18next') {
       try {
-        const ret = po2i18next(data.toString());
+        const potxt = data.toString();
+        const compatibilityJSON = /msgctxt "(zero|one|two|few|many|other)"/.test(potxt) && 'v4';
+        const ret = po2i18next(potxt, { compatibilityJSON });
         cb(null, flatten(ret));
       } catch (err) {
         cb(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "7.9.0",
+  "version": "7.10.1",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -10,13 +10,14 @@
     "@js.properties/properties": "0.5.4",
     "android-string-resource": "2.3.4",
     "async": "3.2.3",
+    "cacheable-lookup": "6.0.4",
     "colors": "1.4.0",
     "commander": "9.0.0",
     "csvjson": "5.1.0",
     "diff": "5.0.0",
     "flat": "5.0.2",
     "fluent_conv": "3.1.0",
-    "gettext-converter": "1.2.0",
+    "gettext-converter": "1.2.2",
     "https-proxy-agent": "5.0.0",
     "ini": "2.0.0",
     "js-yaml": "4.1.0",
@@ -29,11 +30,11 @@
     "strings-file": "0.0.5",
     "tmexchange": "2.0.4",
     "xliff": "6.0.3",
-    "xlsx": "0.18.2"
+    "xlsx": "0.18.3"
   },
   "devDependencies": {
     "eslint": "7.32.0",
-    "gh-release": "6.0.1",
+    "gh-release": "6.0.2",
     "pkg": "5.5.2"
   },
   "scripts": {

package/request.js

@@ -1,10 +1,19 @@
 const package = require('./package.json');
 const fetch = require('node-fetch');
 const HttpsProxyAgent = require('https-proxy-agent');
+const https = require('https');
+const CacheableLookup = require('cacheable-lookup');
+const cacheable = new CacheableLookup();
+cacheable.install(https.globalAgent);
+
 const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY || process.env.https_proxy || process.env.HTTPS_PROXY;
 
 module.exports = (url, options, callback) => {
-  if (httpProxy) options.agent = new HttpsProxyAgent(httpProxy);
+  if (httpProxy) {
+    const httpsProxyAgent = new HttpsProxyAgent(httpProxy);
+    cacheable.install(httpsProxyAgent);
+    options.agent = httpsProxyAgent;
+  }
 
   options.headers = options.headers || {};
   options.headers['User-Agent'] = `${package.name}/v${package.version} (node/${process.version}; ${process.platform} ${process.arch})`;
@@ -23,7 +32,11 @@ module.exports = (url, options, callback) => {
       return { res };
     }
   }).then((ret) => callback(null, ret.res, ret.obj)).catch((err) => {
-    if (err && err.message && err.message.indexOf('ENOTFOUND') > -1) {
+    if (err && err.message && (
+      err.message.indexOf('ENOTFOUND') > -1 ||
+      err.message.indexOf('ENODATA') > -1 ||
+      err.message.indexOf('ENOENT') > -1 // Windows: name exists, but not this record type
+    )) {
       setTimeout(() => {
         fetch(url, options).then((res) => {
           if (res.headers.get('content-type') && res.headers.get('content-type').indexOf('json') > 0) {
@@ -32,7 +45,7 @@ module.exports = (url, options, callback) => {
             return { res };
           }
         }).then((ret) => callback(null, ret.res, ret.obj)).catch(callback);
-      }, 3000);
+      }, 5000);
       return;
     }
     callback(err);