locize-cli 7.14.0 → 7.14.2

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.14.2](https://github.com/locize/locize-cli/compare/v7.14.1...v7.14.2) - 2023-05-09
+
+- optimize unflatten algorithm
+
+## [7.14.1](https://github.com/locize/locize-cli/compare/v7.14.0...v7.14.1) - 2023-03-28
+
+- update fluent_conv to fix [#84](https://github.com/locize/locize-cli/pull/84)
+
 ## [7.14.0](https://github.com/locize/locize-cli/compare/v7.13.2...v7.14.0) - 2023-03-11
 
 - support for .env file [#83](https://github.com/locize/locize-cli/pull/83)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "7.14.0",
+  "version": "7.14.2",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -17,16 +17,16 @@
     "diff": "5.1.0",
     "dotenv": "16.0.3",
     "flat": "5.0.2",
-    "fluent_conv": "3.1.0",
+    "fluent_conv": "3.2.0",
     "gettext-converter": "1.2.3",
     "https-proxy-agent": "5.0.1",
     "ini": "3.0.1",
     "js-yaml": "4.1.0",
     "laravelphp": "2.0.3",
     "lodash.clonedeep": "4.5.0",
-    "mkdirp": "2.1.5",
+    "mkdirp": "2.1.6",
     "node-fetch": "2.6.8",
-    "resx": "2.0.3",
+    "resx": "2.0.4",
     "rimraf": "3.0.2",
     "strings-file": "0.0.5",
     "tmexchange": "2.0.4",
@@ -34,7 +34,7 @@
     "xlsx": "0.18.5"
   },
   "devDependencies": {
-    "eslint": "8.36.0",
+    "eslint": "8.40.0",
     "gh-release": "7.0.2",
     "pkg": "5.8.1"
   },

package/unflatten.js

@@ -1,5 +1,6 @@
 module.exports = (data) => {
   const result = {};
+  const shouldConvertArray = {};
   for (var i in data) {
     const keys = i.split('.');
     keys.reduce((r, e, j) => {
@@ -13,8 +14,59 @@ module.exports = (data) => {
           return mem;
         }, {});
       }
+      if (Array.isArray(r[e]) && r[e].length > 50) {
+        const base = i.substring(0, i.indexOf(e) + e.length);
+        if (Object.values(r[e]).length < (r[e].length / 2)) {
+          shouldConvertArray[base] = true;
+        } else if (shouldConvertArray[base]) {
+          delete shouldConvertArray[base];
+        }
+      }
+      if (typeof r === 'string') {
+        if (e === '' && keys.length > 2) {
+          const lastPart = keys[keys.length - 2] + '.';
+          const firstParts = keys.slice(0, keys.length - 2);
+          let obj;
+          try {
+            obj = firstParts.reduce((acc, p) => acc[p], result);
+          } catch (err) {
+            if (firstParts.indexOf('') < 0) throw err;
+
+            let navRes = result;
+            for (let ind = 0; ind < firstParts.length; ind++) {
+              const p = firstParts[ind];
+              if (typeof navRes[p] === 'object') {
+                navRes = navRes[p];
+              } else {
+                const rest = firstParts.slice(ind).map((c) => (c === '' ? '.' : c)).join('.');
+                navRes[rest] = data[i];
+                break;
+              }
+            }
+          }
+          if (obj && typeof obj !== 'string' && obj[lastPart] === undefined) {
+            obj[lastPart] = data[i];
+          }
+        }
+        return r;
+      }
       return r[e] || (r[e] = (!isNumber || hasLeadingZero || tooHighNumberToBeAnArrayIndex) ? (keys.length - 1 === j ? data[i] : {}) : []);
     }, result);
   }
+  const arrsToConvert = Object.keys(shouldConvertArray);
+  arrsToConvert.forEach((arrToConvert) => {
+    const parts = arrToConvert.split('.');
+    let pr = result;
+    parts.forEach((part, ind) => {
+      if (ind === parts.length - 1) {
+        pr[part] = pr[part].reduce((mem, item, ind) => {
+          mem[ind] = item;
+          return mem;
+        }, {});
+      } else {
+        pr = pr[part];
+      }
+    });
+  });
   return result;
 };