locize-cli 7.12.12 → 7.13.1

package/CHANGELOG.md

@@ -5,6 +5,14 @@ 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.13.1](https://github.com/locize/locize-cli/compare/v7.13.0...v7.13.1) - 2022-12-08
+
+- optimize migrate command
+
+## [7.13.0](https://github.com/locize/locize-cli/compare/v7.12.12...v7.13.0) - 2022-12-08
+
+- migrate command will use missing route if replace param is false or not passed and will also automaticaly create languages (make sure to use an api key with admin permissions)
+
 ## [7.12.12](https://github.com/locize/locize-cli/compare/v7.12.11...v7.12.12) - 2022-11-24
 
 - update android-string-resource dependency to fix wrong plural unescaping

package/README.md

@@ -223,7 +223,7 @@ locize delete-namespace common --api-key my-api-key-d9de-4f55-9855-a9ef0ed44672
 
 ## Migration of existing i18next files
 We suggest to use the sync command instead of the migrate command.
-The migrate command is older and only works with json files.
+The migrate command should be used only once and only works with json files.
 
 ### Step 1: Go near to your translation files
 

package/bin/locize

@@ -79,6 +79,7 @@ program
       apiKey: apiKey,
       projectId: projectId,
       addPath: addPath,
+      apiPath: url.parse(addPath).protocol + '//' + url.parse(addPath).host,
       path: options.path,
       language: options.language || config.language || config.lng || process.env.LOCIZE_LANGUAGE || process.env.LOCIZE_LANG || process.env.LOCIZE_LNG,
       version: version,

package/migrate.js

@@ -4,6 +4,7 @@ const flatten = require('flat');
 const async = require('async');
 const colors = require('colors');
 const request = require('./request');
+const getRemoteLanguages = require('./getRemoteLanguages');
 
 const getDirectories = (srcpath) => {
   return fs.readdirSync(srcpath).filter(function(file) {
@@ -66,6 +67,8 @@ const transfer = (opt, ns, cb) => {
 
   console.log(colors.yellow(`transfering ${opt.version}/${ns.language}/${ns.namespace}...`));
 
+  if (!opt.replace) url = url.replace('/update/', '/missing/');
+
   request(url + `?replace=${!!opt.replace}`, {
     method: 'post',
     body: ns.value,
@@ -74,6 +77,11 @@ const transfer = (opt, ns, cb) => {
     }
   }, (err, res, obj) => {
     if (err || (obj && (obj.errorMessage || obj.message))) {
+      if (url.indexOf('/missing/') > -1 && res.status === 412) {
+        console.log(colors.green(`transfered ${opt.version}/${ns.language}/${ns.namespace} (but all keys already existed)...`));
+        cb(null);
+        return;
+      }
       console.log(colors.red(`transfer failed for ${opt.version}/${ns.language}/${ns.namespace}...`));
 
       if (err) return cb(err);
@@ -86,14 +94,56 @@ const transfer = (opt, ns, cb) => {
 };
 
 const upload = (opt, nss, cb) => {
+  if (!opt.referenceLanguage) {
+    async.eachLimit(
+      nss,
+      require('os').cpus().length,
+      (ns, done) => transfer(opt, ns, done),
+      cb
+    );
+    return;
+  }
+
+  const nssRefLng = nss.filter((n) => n.language === opt.referenceLanguage);
+  const nssNonRefLng = nss.filter((n) => n.language !== opt.referenceLanguage);
+
   async.eachLimit(
-    nss,
+    nssRefLng,
     require('os').cpus().length,
     (ns, done) => transfer(opt, ns, done),
-    cb
+    (err) => {
+      if (err) return cb(err);
+      async.eachLimit(
+        nssNonRefLng,
+        require('os').cpus().length,
+        (ns, done) => transfer(opt, ns, done),
+        cb
+      );
+    }
   );
 };
 
+const addLanguage = (opt, l, cb) => {
+  var url = opt.apiPath + '/language/' + opt.projectId + '/' + l;
+
+  request(url, {
+    method: 'post',
+    headers: {
+      'Authorization': opt.apiKey
+    }
+  }, (err, res, obj) => {
+    if (err || (obj && (obj.errorMessage || obj.message))) {
+      console.log(colors.red(`failed to add language ${l}...`));
+
+      if (err) return cb(err);
+      if (obj && (obj.errorMessage || obj.message)) return cb(new Error((obj.errorMessage || obj.message)));
+    }
+    if (res.status >= 300 && res.status !== 412) return cb(new Error(res.statusText + ' (' + res.status + ')'));
+    console.log(colors.green(`added language ${l}...`));
+    cb(null);
+  });
+};
+
 const migrate = (opt, cb) => {
   if (opt.format !== 'json') {
     var err = new Error(`Format ${opt.format} is not accepted!`);
@@ -102,6 +152,8 @@ const migrate = (opt, cb) => {
     return;
   }
 
+  opt.apiPath = opt.apiPath || 'https://api.locize.app';
+
   if (opt.language) {
     const files = getFiles(opt.path);
 
@@ -142,17 +194,68 @@ const migrate = (opt, cb) => {
         if (cb) cb(err);
         return;
       }
-      upload(opt, nss, (err) => {
+
+      getRemoteLanguages(opt, (err, remoteLanguages) => {
         if (err) {
-          if (!cb) {
-            console.error(colors.red(err.stack));
-            process.exit(1);
-          }
+          if (!cb) { console.error(colors.red(err.stack)); process.exit(1); }
           if (cb) cb(err);
           return;
         }
-        if (!cb) console.log(colors.green('FINISHED'));
-        if (cb) cb(null);
+
+        const localLanguages = [];
+        nss.forEach((n) => {
+          if (localLanguages.indexOf(n.language) < 0) localLanguages.push(n.language);
+        });
+
+        const notExistingLanguages = localLanguages.filter((l) => remoteLanguages.indexOf(l) < 0);
+
+        if (notExistingLanguages.length === 0) {
+          upload(opt, nss, (err) => {
+            if (err) {
+              if (!cb) {
+                console.error(colors.red(err.stack));
+                process.exit(1);
+              }
+              if (cb) cb(err);
+              return;
+            }
+            if (!cb) console.log(colors.green('FINISHED'));
+            if (cb) cb(null);
+          });
+          return;
+        }
+
+        async.eachLimit(
+          notExistingLanguages,
+          require('os').cpus().length,
+          (l, done) => addLanguage(opt, l, done),
+          (err) => {
+            if (err) {
+              if (!cb) {
+                console.error(colors.red(err.stack));
+                process.exit(1);
+              }
+              if (cb) cb(err);
+              return;
+            }
+            setTimeout(() => {
+              // wait a bit to make sure project is up-to-date also in cache
+              upload(opt, nss, (err) => {
+                if (err) {
+                  if (!cb) {
+                    console.error(colors.red(err.stack));
+                    process.exit(1);
+                  }
+                  if (cb) cb(err);
+                  return;
+                }
+                if (!cb) console.log(colors.green('FINISHED'));
+                if (cb) cb(null);
+              });
+            }, 5000);
+          }
+        );
+        return;
       });
     });
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "7.12.12",
+  "version": "7.13.1",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -33,7 +33,7 @@
     "xlsx": "0.18.5"
   },
   "devDependencies": {
-    "eslint": "8.28.0",
+    "eslint": "8.29.0",
     "gh-release": "6.0.4",
     "pkg": "5.8.0"
   },