locize-cli 10.3.2 → 11.0.0

package/combineSubkeyPreprocessor.js

@@ -1,65 +1,65 @@
-const yaml = require('yaml');
+const yaml = require('yaml')
 
 const delimiter = {
   i18next: '_',
   i18njs: '.'
-};
+}
 
 const detectFormat = (keys) => {
-  const i18nextMatches = keys.filter((k) => k.indexOf(delimiter.i18next) > 0).length;
-  const i18njsMatches = keys.filter((k) => k.indexOf(delimiter.i18njs) > 0).length;
+  const i18nextMatches = keys.filter((k) => k.indexOf(delimiter.i18next) > 0).length
+  const i18njsMatches = keys.filter((k) => k.indexOf(delimiter.i18njs) > 0).length
   if (i18nextMatches > i18njsMatches) {
-    return 'i18next';
+    return 'i18next'
   }
   if (i18nextMatches < i18njsMatches) {
-    return 'i18njs';
+    return 'i18njs'
   }
-};
+}
 
 const getBaseKey = (delimiter) => (k) => {
-  const parts = k.split(delimiter);
-  parts.pop();
-  const baseKey = parts.join(delimiter);
-  return baseKey;
-};
+  const parts = k.split(delimiter)
+  parts.pop()
+  const baseKey = parts.join(delimiter)
+  return baseKey
+}
 
-const uniq = (value, index, self) => self.indexOf(value) === index;
+const uniq = (value, index, self) => self.indexOf(value) === index
 
 const stringify = (o) => {
-  let str = yaml.stringify(o);
-  const subKeys = Object.keys(o);
+  let str = yaml.stringify(o)
+  const subKeys = Object.keys(o)
   subKeys.forEach((sk) => {
     if (isNaN(sk)) {
-      str = str.replace(new RegExp(`^(?:${sk}: )+`, 'm'), `{${sk}}: `);
+      str = str.replace(new RegExp(`^(?:${sk}: )+`, 'm'), `{${sk}}: `)
     } else {
-      str = str.replace(new RegExp(`^(?:'${sk}': )+`, 'm'), `{${sk}}: `);
+      str = str.replace(new RegExp(`^(?:'${sk}': )+`, 'm'), `{${sk}}: `)
     }
-  });
-  return str;
-};
+  })
+  return str
+}
 
 const transformKeys = (segments, baseKeys, toMerge, deli) => {
   baseKeys.forEach((bk) => {
     const asObj = toMerge[bk].reduce((mem, k) => {
-      const subKey = k.substring((bk + deli).length);
+      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['__'] = segments[bk]
+        delete segments[bk]
       }
-      mem[subKey] = segments[k];
-      return mem;
-    }, {});
+      mem[subKey] = segments[k]
+      return mem
+    }, {})
     if (Object.keys(asObj).length > 0) {
-      const value = stringify(asObj);
-      segments[`${bk}__#locize.com/combinedSubkey`] = value;
+      const value = stringify(asObj)
+      segments[`${bk}__#locize.com/combinedSubkey`] = value
       toMerge[bk].forEach((k) => {
-        delete segments[k];
-      });
+        delete segments[k]
+      })
     }
-  });
-  return segments;
-};
+  })
+  return segments
+}
 
 // CLDR
 const pluralForms = [
@@ -69,86 +69,87 @@ const pluralForms = [
   'few',
   'many',
   'other'
-];
+]
 
-const endsWithPluralForm = (k) => !!pluralForms.find((f) => k.endsWith(`.${f}`)) || !!pluralForms.find((f) => k.endsWith(`_${f}`)) || /_\d+$/.test(k) || k.endsWith('_plural');
+const endsWithPluralForm = (k) => !!pluralForms.find((f) => k.endsWith(`.${f}`)) || !!pluralForms.find((f) => k.endsWith(`_${f}`)) || /_\d+$/.test(k) || k.endsWith('_plural')
 
 const prepareExport = (refRes, trgRes) => {
-  const refLngKeys = Object.keys(refRes);
-  const trgLngKeys = Object.keys(trgRes);
+  const refLngKeys = Object.keys(refRes)
+  const trgLngKeys = Object.keys(trgRes)
 
-  const nonMatchInRef = refLngKeys.filter((k) => trgLngKeys.indexOf(k) < 0 && endsWithPluralForm(k));
-  const nonMatchInTrg = trgLngKeys.filter((k) => refLngKeys.indexOf(k) < 0 && endsWithPluralForm(k));
+  const nonMatchInRef = refLngKeys.filter((k) => trgLngKeys.indexOf(k) < 0 && endsWithPluralForm(k))
+  const nonMatchInTrg = trgLngKeys.filter((k) => refLngKeys.indexOf(k) < 0 && endsWithPluralForm(k))
 
-  const allMatches = nonMatchInRef.concat(nonMatchInTrg);
+  const allMatches = nonMatchInRef.concat(nonMatchInTrg)
 
-  const format = detectFormat(allMatches);
-  if (!format) return { ref: refRes, trg: trgRes };
+  const format = detectFormat(allMatches)
+  if (!format) return { ref: refRes, trg: trgRes }
 
-  const nonMatchBaseKeysInRef = nonMatchInRef.map(getBaseKey(delimiter[format])).filter(uniq);
-  const nonMatchBaseKeysInTrg = nonMatchInTrg.map(getBaseKey(delimiter[format])).filter(uniq);
-  const nonMatchBaseKeys = nonMatchBaseKeysInRef.concat(nonMatchBaseKeysInTrg).filter(uniq);
+  const nonMatchBaseKeysInRef = nonMatchInRef.map(getBaseKey(delimiter[format])).filter(uniq)
+  const nonMatchBaseKeysInTrg = nonMatchInTrg.map(getBaseKey(delimiter[format])).filter(uniq)
+  const nonMatchBaseKeys = nonMatchBaseKeysInRef.concat(nonMatchBaseKeysInTrg).filter(uniq)
 
   const toMergeInRef = nonMatchBaseKeys.reduce((mem, bk) => {
-    mem[bk] = refLngKeys.filter((k) => k.indexOf(bk + delimiter[format]) === 0);
-    return mem;
-  }, {});
+    mem[bk] = refLngKeys.filter((k) => k.indexOf(bk + delimiter[format]) === 0)
+    return mem
+  }, {})
   const toMergeInTrg = nonMatchBaseKeys.reduce((mem, bk) => {
-    mem[bk] = trgLngKeys.filter((k) => k.indexOf(bk + delimiter[format]) === 0);
-    return mem;
-  }, {});
+    mem[bk] = trgLngKeys.filter((k) => k.indexOf(bk + delimiter[format]) === 0)
+    return mem
+  }, {})
 
-  let falseFlags = nonMatchBaseKeysInRef.filter((k) => toMergeInRef[k].length < 2 && (!toMergeInTrg[k] || toMergeInTrg[k].length < 2));
-  falseFlags = falseFlags.concat(nonMatchBaseKeysInTrg.filter((k) => toMergeInTrg[k].length < 2 && (!toMergeInRef[k] || toMergeInRef[k].length < 2)));
+  let falseFlags = nonMatchBaseKeysInRef.filter((k) => toMergeInRef[k].length < 2 && (!toMergeInTrg[k] || toMergeInTrg[k].length < 2))
+  falseFlags = falseFlags.concat(nonMatchBaseKeysInTrg.filter((k) => toMergeInTrg[k].length < 2 && (!toMergeInRef[k] || toMergeInRef[k].length < 2)))
   falseFlags.forEach((k) => {
-    delete toMergeInRef[k];
-    delete toMergeInTrg[k];
-    nonMatchBaseKeys.splice(nonMatchBaseKeys.indexOf(k), 1);
-  });
-
-  const transformedRef = transformKeys(refRes, nonMatchBaseKeys, toMergeInRef, delimiter[format]);
-  const transformedTrg = transformKeys(trgRes, nonMatchBaseKeys, toMergeInTrg, delimiter[format]);
-  return { ref: transformedRef, trg: transformedTrg };
-};
-
-const skRegex = new RegExp('^(?:{(.+)})+', 'gm');
+    delete toMergeInRef[k]
+    delete toMergeInTrg[k]
+    nonMatchBaseKeys.splice(nonMatchBaseKeys.indexOf(k), 1)
+  })
+
+  const transformedRef = transformKeys(refRes, nonMatchBaseKeys, toMergeInRef, delimiter[format])
+  const transformedTrg = transformKeys(trgRes, nonMatchBaseKeys, toMergeInTrg, delimiter[format])
+  return { ref: transformedRef, trg: transformedTrg }
+}
+
+// eslint-disable-next-line prefer-regex-literals
+const skRegex = new RegExp('^(?:{(.+)})+', 'gm')
 const parse = (s) => {
-  let matchArray;
+  let matchArray
   while ((matchArray = skRegex.exec(s)) !== null) {
-    const [match, sk] = matchArray;
+    const [match, sk] = matchArray
     if (isNaN(sk)) {
-      s = s.replace(new RegExp(`^(?:${match}: )+`, 'm'), `${sk}: `);
+      s = s.replace(new RegExp(`^(?:${match}: )+`, 'm'), `${sk}: `)
     } else {
-      const escapedMatch = match.replace('{', '\\{').replace('}', '\\}');
-      s = s.replace(new RegExp(`^(?:${escapedMatch}: )+`, 'm'), `${sk}: `);
+      const escapedMatch = match.replace('{', '\\{').replace('}', '\\}')
+      s = s.replace(new RegExp(`^(?:${escapedMatch}: )+`, 'm'), `${sk}: `)
     }
   }
-  return yaml.parse(s);
-};
+  return yaml.parse(s)
+}
 
 const prepareImport = (resources) => {
-  const keys = Object.keys(resources);
+  const keys = Object.keys(resources)
   keys.forEach((k) => {
     if (k.indexOf('__#locize.com/combinedSubkey') > -1) {
-      const baseKey = k.substring(0, k.indexOf('__#locize.com/combinedSubkey'));
+      const baseKey = k.substring(0, k.indexOf('__#locize.com/combinedSubkey'))
       if (resources[k]) {
-        const parsed = parse(resources[k]);
-        Object.keys(parsed).map((sk) => {
-          const skVal = parsed[sk];
-          resources[`${baseKey}_${sk}`] = skVal;
+        const parsed = parse(resources[k])
+        Object.keys(parsed).forEach((sk) => {
+          const skVal = parsed[sk]
+          resources[`${baseKey}_${sk}`] = skVal
           if (sk === '__') {
-            resources[baseKey] = resources[`${baseKey}_${sk}`];
-            delete resources[`${baseKey}_${sk}`];
+            resources[baseKey] = resources[`${baseKey}_${sk}`]
+            delete resources[`${baseKey}_${sk}`]
           }
-        });
-        delete resources[k];
+        })
+        delete resources[k]
       }
     }
-  });
-  return resources;
-};
+  })
+  return resources
+}
 
 module.exports = {
   prepareExport,
   prepareImport
-};
+}

package/convertToDesiredFormat.js

@@ -1,22 +1,22 @@
-const flatten = require('flat');
-const i18next2po = require('gettext-converter/cjs/i18next2po');
-const csvjson = require('csvjson');
-const xlsx = require('xlsx');
-const yaml = require('yaml');
-const js2asr = require('android-string-resource/cjs/js2asr');
-const stringsFile = require('strings-file');
-const createxliff = require('xliff/cjs/createxliff');
-const createxliff12 = require('xliff/cjs/createxliff12');
-const js2resx = require('resx/cjs/js2resx');
-const js2ftl = require('fluent_conv/cjs/js2ftl');
-const js2tmx = require('tmexchange/cjs/js2tmx');
-const js2laravel = require('laravelphp/cjs/js2laravel');
-const javaProperties = require('@js.properties/properties');
-const unflatten = require('./unflatten');
-const getRemoteNamespace = require('./getRemoteNamespace');
-const removeUndefinedFromArrays = require('./removeUndefinedFromArrays');
-const shouldUnflatten = require('./shouldUnflatten');
-const prepareCombinedExport = require('./combineSubkeyPreprocessor').prepareExport;
+const flatten = require('flat')
+const i18next2po = require('gettext-converter/cjs/i18next2po')
+const csvjson = require('csvjson')
+const xlsx = require('xlsx')
+const yaml = require('yaml')
+const js2asr = require('android-string-resource/cjs/js2asr')
+const stringsFile = require('strings-file')
+const createxliff = require('xliff/cjs/createxliff')
+const createxliff12 = require('xliff/cjs/createxliff12')
+const js2resx = require('resx/cjs/js2resx')
+const js2ftl = require('fluent_conv/cjs/js2ftl')
+const js2tmx = require('tmexchange/cjs/js2tmx')
+const js2laravel = require('laravelphp/cjs/js2laravel')
+const javaProperties = require('@js.properties/properties')
+const unflatten = require('./unflatten')
+const getRemoteNamespace = require('./getRemoteNamespace')
+const removeUndefinedFromArrays = require('./removeUndefinedFromArrays')
+const shouldUnflatten = require('./shouldUnflatten')
+const prepareCombinedExport = require('./combineSubkeyPreprocessor').prepareExport
 
 const convertToDesiredFormat = (
   opt,
@@ -26,29 +26,29 @@ const convertToDesiredFormat = (
   lastModified,
   cb
 ) => {
-  opt.getNamespace = opt.getNamespace || getRemoteNamespace;
-  const isEmpty = !data || Object.keys(data).length === 0;
+  opt.getNamespace = opt.getNamespace || getRemoteNamespace
+  const isEmpty = !data || Object.keys(data).length === 0
   try {
     if (opt.format === 'json') {
       try {
-        data = unflatten(data, true);
+        data = unflatten(data, true)
       } catch (err) {}
-      cb(null, JSON.stringify(data, null, 2));
-      return;
+      cb(null, JSON.stringify(data, null, 2))
+      return
     }
     if (opt.format === 'nested') {
       try {
-        data = unflatten(data);
+        data = unflatten(data)
       } catch (err) {}
-      cb(null, JSON.stringify(data, null, 2));
-      return;
+      cb(null, JSON.stringify(data, null, 2))
+      return
     }
     if (opt.format === 'flat') {
-      cb(null, JSON.stringify(flatten(data), null, 2));
-      return;
+      cb(null, JSON.stringify(flatten(data), null, 2))
+      return
     }
     if (opt.format === 'po' || opt.format === 'gettext') {
-      const flatData = flatten(data);
+      const flatData = flatten(data)
 
       const gettextOpt = {
         project: 'locize',
@@ -57,138 +57,138 @@ const convertToDesiredFormat = (
         poRevisionDate: lastModified,
         ctxSeparator: '_ is default but we set it to something that is never found!!!',
         persistMsgIdPlural: true
-      };
-      cb(null, i18next2po(lng, flatData, gettextOpt));
-      return;
+      }
+      cb(null, i18next2po(lng, flatData, gettextOpt))
+      return
     }
     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 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,
         compatibilityJSON
-      };
-      cb(null, i18next2po(lng, flatData, gettextOpt));
-      return;
+      }
+      cb(null, i18next2po(lng, flatData, gettextOpt))
+      return
     }
     if (opt.format === 'csv') {
       opt.getNamespace(opt, opt.referenceLanguage, namespace, (err, refNs) => {
-        if (err) return cb(err);
+        if (err) return cb(err)
 
         const js2CsvData = Object.keys(flatten(data)).reduce((mem, k) => {
-          const value = data[k] || '';
+          const value = data[k] || ''
           const line = {
             // https://en.wikipedia.org/wiki/Delimiter-separated_values
             key: k.replace(/"/g, '""'),
             [opt.referenceLanguage]: refNs[k] || '',
             [lng]: value.replace(/"/g, '""')
-          };
-          line.key = line.key.replace(/\n/g, '\\NeWlInE\\');
+          }
+          line.key = line.key.replace(/\n/g, '\\NeWlInE\\')
           line[opt.referenceLanguage] = line[opt.referenceLanguage].replace(
             /\n/g,
             '\\NeWlInE\\'
-          );
-          line[lng] = line[lng].replace(/\n/g, '\\NeWlInE\\');
-          mem.push(line);
+          )
+          line[lng] = line[lng].replace(/\n/g, '\\NeWlInE\\')
+          mem.push(line)
 
-          return mem;
-        }, []);
+          return mem
+        }, [])
         const options = {
           delimiter: ',',
           wrap: true,
           headers: 'relative'
           // objectDenote: '.',
           // arrayDenote: '[]'
-        };
+        }
         cb(
           null,
           `\ufeff${csvjson
             .toCSV(js2CsvData, options)
             .replace(/\\NeWlInE\\/g, '\n')}`
-        );
-      });
-      return;
+        )
+      })
+      return
     }
     if (opt.format === 'xlsx') {
       opt.getNamespace(opt, opt.referenceLanguage, namespace, (err, refNs) => {
-        if (err) return cb(err);
+        if (err) return cb(err)
 
         const js2XlsxData = Object.keys(flatten(data)).reduce((mem, k) => {
-          const value = data[k] || '';
+          const value = data[k] || ''
           const line = {
             key: k,
             [opt.referenceLanguage]: refNs[k] || '',
             [lng]: value
-          };
-          mem.push(line);
+          }
+          mem.push(line)
 
-          return mem;
-        }, []);
+          return mem
+        }, [])
 
-        const worksheet = xlsx.utils.json_to_sheet(js2XlsxData);
-        const workbook = xlsx.utils.book_new();
-        let workSheetName = namespace;
-        if (workSheetName.length > 31) workSheetName = workSheetName.substring(0, 31);
-        workbook.SheetNames.push(workSheetName);
-        workbook.Sheets[workSheetName] = worksheet;
+        const worksheet = xlsx.utils.json_to_sheet(js2XlsxData)
+        const workbook = xlsx.utils.book_new()
+        let workSheetName = namespace
+        if (workSheetName.length > 31) workSheetName = workSheetName.substring(0, 31)
+        workbook.SheetNames.push(workSheetName)
+        workbook.Sheets[workSheetName] = worksheet
 
-        const wbout = xlsx.write(workbook, { type: 'buffer' });
+        const wbout = xlsx.write(workbook, { type: 'buffer' })
 
-        cb(null, wbout);
-      });
-      return;
+        cb(null, wbout)
+      })
+      return
     }
     if (
       opt.format === 'yaml' ||
       opt.format === 'yml'
     ) {
-      if (isEmpty) return cb(null, '');
-      cb(null, yaml.stringify(flatten(data)));
-      return;
+      if (isEmpty) return cb(null, '')
+      cb(null, yaml.stringify(flatten(data)))
+      return
     }
     if (
       opt.format === 'yaml-nested' ||
       opt.format === 'yml-nested'
     ) {
-      if (isEmpty) return cb(null, '');
-      cb(null, yaml.stringify(shouldUnflatten(data) ? unflatten(data) : data));
-      return;
+      if (isEmpty) return cb(null, '')
+      cb(null, yaml.stringify(shouldUnflatten(data) ? unflatten(data) : data))
+      return
     }
     if (
       opt.format === 'yaml-rails' ||
       opt.format === 'yml-rails'
     ) {
-      if (isEmpty) return cb(null, '');
-      var newData = {};
-      newData[lng] = shouldUnflatten(data) ? unflatten(data) : data;
-      cb(null, yaml.stringify(removeUndefinedFromArrays(newData)));
-      return;
+      if (isEmpty) return cb(null, '')
+      const newData = {}
+      newData[lng] = shouldUnflatten(data) ? unflatten(data) : data
+      cb(null, yaml.stringify(removeUndefinedFromArrays(newData)))
+      return
     }
     if (
       opt.format === 'yaml-rails-ns' ||
       opt.format === 'yml-rails-ns'
     ) {
-      if (isEmpty) return cb(null, '');
-      var newDataNs = {};
-      newDataNs[lng] = {};
-      newDataNs[lng][namespace] = shouldUnflatten(data) ? unflatten(data) : data;
-      cb(null, yaml.stringify(removeUndefinedFromArrays(newDataNs)));
-      return;
+      if (isEmpty) return cb(null, '')
+      const newDataNs = {}
+      newDataNs[lng] = {}
+      newDataNs[lng][namespace] = shouldUnflatten(data) ? unflatten(data) : data
+      cb(null, yaml.stringify(removeUndefinedFromArrays(newDataNs)))
+      return
     }
     if (opt.format === 'android') {
-      js2asr(flatten(data), cb);
-      return;
+      js2asr(flatten(data), cb)
+      return
     }
     if (opt.format === 'strings') {
       Object.keys(data).forEach((k) => {
-        if (data[k] === null) delete data[k];
-      });
-      data = stringsFile.compile(data);
-      cb(null, data);
-      return;
+        if (data[k] === null) delete data[k]
+      })
+      data = stringsFile.compile(data)
+      cb(null, data)
+      return
     }
     if (
       opt.format === 'xliff2' ||
@@ -199,46 +199,46 @@ const convertToDesiredFormat = (
       const fn =
         opt.format === 'xliff12' || opt.format === 'xlf12'
           ? createxliff12
-          : createxliff;
+          : createxliff
       opt.getNamespace(opt, opt.referenceLanguage, namespace, (err, refNs) => {
-        if (err) return cb(err);
+        if (err) return cb(err)
 
-        const prepared = prepareCombinedExport(refNs, flatten(data));
-        fn(opt.referenceLanguage, lng, prepared.ref, prepared.trg, namespace, cb);
-      });
-      return;
+        const prepared = prepareCombinedExport(refNs, flatten(data))
+        fn(opt.referenceLanguage, lng, prepared.ref, prepared.trg, namespace, cb)
+      })
+      return
     }
     if (opt.format === 'resx') {
-      js2resx(flatten(data), cb);
-      return;
+      js2resx(flatten(data), cb)
+      return
     }
     if (opt.format === 'fluent') {
       Object.keys(data).forEach((k) => {
-        if (!data[k] || data[k] === '') delete data[k];
+        if (!data[k] || data[k] === '') delete data[k]
         data[k] = data[k].replace(
           new RegExp(String.fromCharCode(160), 'g'),
           String.fromCharCode(32)
-        );
-      });
-      js2ftl(unflatten(data), cb);
-      return;
+        )
+      })
+      js2ftl(unflatten(data), cb)
+      return
     }
     if (opt.format === 'tmx') {
       opt.getNamespace(opt, opt.referenceLanguage, namespace, (err, refNs) => {
-        if (err) return cb(err);
+        if (err) return cb(err)
 
-        const js = flatten(data);
+        const js = flatten(data)
         const js2TmxData = Object.keys(js).reduce(
           (mem, k) => {
-            const refItem = refNs[k];
-            if (!refItem) return mem;
+            const refItem = refNs[k]
+            if (!refItem) return mem
 
-            const value = js[k] || '';
-            mem.resources[namespace][k] = {};
-            mem.resources[namespace][k][opt.referenceLanguage] = refItem;
-            mem.resources[namespace][k][lng] = value;
+            const value = js[k] || ''
+            mem.resources[namespace][k] = {}
+            mem.resources[namespace][k][opt.referenceLanguage] = refItem
+            mem.resources[namespace][k][lng] = value
 
-            return mem;
+            return mem
           },
           {
             resources: {
@@ -246,23 +246,23 @@ const convertToDesiredFormat = (
             },
             sourceLanguage: opt.referenceLanguage
           }
-        );
-        js2tmx(js2TmxData, cb);
-      });
-      return;
+        )
+        js2tmx(js2TmxData, cb)
+      })
+      return
     }
     if (opt.format === 'laravel') {
-      js2laravel(unflatten(data), cb);
-      return;
+      js2laravel(unflatten(data), cb)
+      return
     }
     if (opt.format === 'properties') {
-      cb(null, javaProperties.stringifyFromProperties(data, { eol: '\n' }));
-      return;
+      cb(null, javaProperties.stringifyFromProperties(data, { eol: '\n' }))
+      return
     }
-    cb(new Error(`${opt.format} is not a valid format!`));
+    cb(new Error(`${opt.format} is not a valid format!`))
   } catch (err) {
-    cb(err);
+    cb(err)
   }
-};
+}
 
-module.exports = convertToDesiredFormat;
+module.exports = convertToDesiredFormat