locize-cli 8.1.1 → 8.3.0

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/).
 
+## [8.3.0](https://github.com/locize/locize-cli/compare/v8.2.0...v8.3.0) - 2024-11-25
+
+- update some deprecated dependencies (#100)
+
+## [8.2.0](https://github.com/locize/locize-cli/compare/v8.1.1...v8.2.0) - 2024-11-12
+
+- introduce `--backup-deleted-path` argument (#98)
+
 ## [8.1.1](https://github.com/locize/locize-cli/compare/v8.1.0...v8.1.1) - 2024-10-29
 
 - improve some error logs

package/bin/locize

@@ -359,6 +359,7 @@ program
   .option('-i, --project-id <projectId>', 'The project-id that should be used')
   .option('-v, --ver <version>', 'Found namespaces will be matched to this version (default: latest)')
   .option('-p, --path <path>', `Specify the path that should be used (default: ${process.cwd()})`, process.cwd())
+  .option('-B, --backup-deleted-path <path>', 'Saves the segments that will be deleted in this path')
   .option('-A, --auto-create-path <true|false>', 'This will automatically make sure the --path is created. (default: true)', 'true')
   .option('-f, --format <json>', 'File format of namespaces (default: json; [nested, flat, xliff2, xliff12, xlf2, xlf12, android, yaml, yaml-rails, yaml-nested, csv, xlsx, po, strings, resx, fluent, tmx, laravel, properties])', 'json')
   .option('-s, --skip-empty <true|false>', 'Skips to download empty files (default: false)', 'false')
@@ -423,6 +424,7 @@ program
     const pathMask = options.pathMask;
     const unpublished = options.unpublished === 'true';
     const autoCreatePath = options.autoCreatePath === 'true';
+    const backupDeletedPath = options.backupDeletedPath;
 
     sync({
       apiPath: url.parse(getPath).protocol + '//' + url.parse(getPath).host,
@@ -446,7 +448,8 @@ program
       dry: dry,
       pathMask: pathMask,
       unpublished: unpublished,
-      autoCreatePath: autoCreatePath
+      autoCreatePath: autoCreatePath,
+      backupDeletedPath: backupDeletedPath
     });
   })
   .on('--help', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "8.1.1",
+  "version": "8.3.0",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -9,17 +9,17 @@
   "dependencies": {
     "@js.properties/properties": "0.5.4",
     "android-string-resource": "2.3.10",
-    "async": "3.2.5",
+    "async": "3.2.6",
     "cacheable-lookup": "6.1.0",
     "colors": "1.4.0",
     "commander": "9.5.0",
     "csvjson": "5.1.0",
-    "diff": "5.2.0",
+    "diff": "7.0.0",
     "dotenv": "16.4.5",
     "flat": "5.0.2",
     "fluent_conv": "3.3.0",
     "gettext-converter": "1.3.0",
-    "https-proxy-agent": "5.0.1",
+    "https-proxy-agent": "7.0.5",
     "ini": "4.1.3",
     "js-yaml": "4.1.0",
     "laravelphp": "2.0.4",
@@ -27,7 +27,7 @@
     "mkdirp": "3.0.1",
     "node-fetch": "2.7.0",
     "resx": "2.0.4",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.1",
     "strings-file": "0.0.5",
     "tmexchange": "2.0.5",
     "xliff": "6.2.1",
@@ -36,12 +36,12 @@
   "devDependencies": {
     "eslint": "8.56.0",
     "gh-release": "7.0.2",
-    "pkg": "5.8.1"
+    "@yao-pkg/pkg": "6.1.1"
   },
   "scripts": {
     "lint": "eslint .",
     "test": "npm run lint",
-    "pkg": "mkdir -p ./bins && pkg ./bin/locize --out-path ./bins --targets node18-linux-x64,node18-macos-x64,node18-win-x64,node18-alpine-x64",
+    "pkg": "mkdir -p ./bins && pkg ./bin/locize --out-path ./bins --targets node20-linux-x64,node20-macos-x64,node20-win-x64,node20-alpine-x64",
     "release": "gh-release --assets ./bins/locize-linux,./bins/locize-macos,./bins/locize-win.exe,./bins/locize-alpine",
     "version": "npm run pkg",
     "postversion": "git push && npm run release"
@@ -52,7 +52,7 @@
   ],
   "author": "adrai",
   "license": "MIT",
-  "homepage": "http://locize.com",
+  "homepage": "https://locize.com",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/locize/locize-cli.git"

package/request.js

@@ -1,6 +1,6 @@
 const package = require('./package.json');
 const fetch = require('node-fetch');
-const HttpsProxyAgent = require('https-proxy-agent');
+const { HttpsProxyAgent } = require('https-proxy-agent');
 const https = require('https');
 const CacheableLookup = require('cacheable-lookup');
 const cacheable = new CacheableLookup();
@@ -11,6 +11,8 @@ const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY || process.en
 const isRetriableError = (err) => {
   return err && err.message && (
     err.message.indexOf('ETIMEDOUT') > -1 || // on timeout retry
+    err.message.indexOf('FetchError') > -1 ||
+    err.code === 'ETIMEDOUT' ||
     // on dns errors
     err.message.indexOf('ENOTFOUND') > -1 ||
     err.message.indexOf('ENODATA') > -1 ||

package/sync.js

@@ -138,7 +138,7 @@ const compareNamespace = (local, remote, lastModifiedLocal, lastModifiedRemote)
 };
 
 const compareNamespaces = (opt, localNamespaces, cb) => {
-  async.map(localNamespaces, (ns, clb) => {
+  async.mapLimit(localNamespaces, 20, (ns, clb) => {
     getRemoteNamespace(opt, ns.language, ns.namespace, (err, remoteNamespace, lastModified) => {
       if (err) return clb(err);
 
@@ -381,6 +381,28 @@ const checkForMissingLocalNamespaces = (downloads, localNamespaces, opt) => {
   return localMissingNamespaces;
 };
 
+const backupDeleted = (opt, ns, now) => {
+  if (opt.dry || ns.diff.toRemove.length === 0) return;
+  var m = now.getMonth() + 1;
+  if (m < 10) m = `0${m}`;
+  var d = now.getDate();
+  if (d < 10) d = `0${d}`;
+  var h = now.getHours();
+  if (h < 10) h = `0${h}`;
+  var mi = now.getMinutes();
+  if (mi < 10) mi = `0${mi}`;
+  var s = now.getSeconds();
+  if (s < 10) s = `0${s}`;
+  const currentBackupPath = path.join(opt.backupDeletedPath, `${now.getFullYear()}${m}${d}-${h}${mi}${s}`);
+  mkdirp.sync(currentBackupPath);
+  const removingRemote = ns.diff.toRemove.reduce((prev, k) => {
+    prev[k] = ns.remoteContent[k];
+    return prev;
+  }, {});
+  mkdirp.sync(path.join(currentBackupPath, ns.language));
+  fs.writeFileSync(path.join(currentBackupPath, ns.language, `${ns.namespace}.json`), JSON.stringify(removingRemote, null, 2));
+};
+
 const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
   if (!localNamespaces || localNamespaces.length === 0) {
     downloadAll(opt, remoteLanguages, (err) => {
@@ -418,6 +440,7 @@ const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
       var wasThereSomethingToUpdate = false;
 
       function updateComparedNamespaces() {
+        const now = new Date();
         async.eachLimit(compared, Math.round(require('os').cpus().length / 2), (ns, clb) => {
           if (!cb) {
             if (ns.diff.toRemove.length > 0) {
@@ -427,6 +450,7 @@ const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
               } else {
                 console.log(colors.red(`removing ${ns.diff.toRemove.length} keys in ${ns.language}/${ns.namespace}...`));
                 if (opt.dry) console.log(colors.red(`would remove ${ns.diff.toRemove.join(', ')} in ${ns.language}/${ns.namespace}...`));
+                if (!opt.dry && opt.backupDeletedPath) backupDeleted(opt, ns, now);
               }
             }
             if (ns.diff.toRemoveLocally.length > 0) {