locize-cli 10.3.2 → 10.4.0

package/getRemoteLanguages.js

@@ -1,40 +1,40 @@
-const request = require('./request');
+const request = require('./request')
 
 const getRemoteLanguages = (opt, cb) => {
-  request(opt.apiPath + '/languages/' + opt.projectId + '?ts=' + Date.now(), {
+  request(opt.apiPath + '/languages/' + opt.projectId + '?ts=' + Date.now() + (opt.cdnType === 'standard' ? '&cache=no' : ''), {
     method: 'get'
   }, (err, res, obj) => {
     if (err || (obj && (obj.errorMessage || obj.message))) {
-      if (err) return cb(err);
+      if (err) return cb(err)
       if (obj && (obj.errorMessage || obj.message)) {
         if (res && res.statusText && res.status) {
-          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)))
         }
-        return cb(new Error((obj.errorMessage || obj.message)));
+        return cb(new Error((obj.errorMessage || obj.message)))
       }
     }
-    if (res.status >= 300) return cb(new Error(res.statusText + ' (' + res.status + ')'));
+    if (res.status >= 300) return cb(new Error(res.statusText + ' (' + res.status + ')'))
 
     if (Object.keys(obj).length === 0) {
-      return cb(new Error('Project with id "' + opt.projectId + '" not found!'));
+      return cb(new Error('Project with id "' + opt.projectId + '" not found!'))
     }
 
-    const lngs = Object.keys(obj);
-    var foundRefLng = null;
+    const lngs = Object.keys(obj)
+    let foundRefLng = null
     lngs.forEach((l) => {
-      if (obj[l].isReferenceLanguage) foundRefLng = l;
-    });
+      if (obj[l].isReferenceLanguage) foundRefLng = l
+    })
     if (!foundRefLng) {
-      return cb(new Error('Reference language for project with id "' + opt.projectId + '" not found!'));
+      return cb(new Error('Reference language for project with id "' + opt.projectId + '" not found!'))
     }
-    opt.referenceLanguage = foundRefLng;
+    opt.referenceLanguage = foundRefLng
 
     // reflng first
-    lngs.splice(lngs.indexOf(opt.referenceLanguage), 1);
-    lngs.unshift(opt.referenceLanguage);
+    lngs.splice(lngs.indexOf(opt.referenceLanguage), 1)
+    lngs.unshift(opt.referenceLanguage)
 
-    cb(null, lngs);
-  });
-};
+    cb(null, lngs)
+  })
+}
 
-module.exports = getRemoteLanguages;
+module.exports = getRemoteLanguages

package/getRemoteNamespace.js

@@ -1,118 +1,122 @@
-const request = require('./request');
-const flatten = require('flat');
-const sortFlatResources = require('./sortFlatResources');
+const request = require('./request')
+const flatten = require('flat')
+const sortFlatResources = require('./sortFlatResources')
 
-const getRandomDelay = (delayFrom, delayTo) => Math.floor(Math.random() * delayTo) + delayFrom;
+const getRandomDelay = (delayFrom, delayTo) => Math.floor(Math.random() * delayTo) + delayFrom
 
-function onlyKeysFlat(resources, prefix, ret) {
-  if (!resources) resources;
-  ret = ret || {};
+function onlyKeysFlat (resources, prefix, ret) {
+  ret = ret || {}
+  if (!resources) return ret
   Object.keys(resources).forEach((k) => {
     if (typeof resources[k] === 'string' || !resources[k] || typeof resources[k].value === 'string') {
       if (prefix) {
-        ret[prefix + '.' + k] = resources[k];
+        ret[prefix + '.' + k] = resources[k]
       } else {
-        ret[k] = resources[k];
+        ret[k] = resources[k]
       }
     } else {
-      onlyKeysFlat(resources[k], prefix ? prefix + '.' + k : k, ret);
+      onlyKeysFlat(resources[k], prefix ? prefix + '.' + k : k, ret)
     }
-  });
-  return ret;
+  })
+  return ret
 }
 
 const pullNamespacePaged = (opt, lng, ns, cb, next, retry) => {
-  next = next || '';
+  next = next || ''
   request(opt.apiPath + '/pull/' + opt.projectId + '/' + opt.version + '/' + lng + '/' + ns + '?' + 'next=' + next + ((opt.raw || opt.overriddenOnly) ? '&raw=true' : '') + '&ts=' + Date.now(), {
     method: 'get',
     headers: {
-      'Authorization': opt.apiKey
+      Authorization: opt.apiKey
     }
   }, (err, res, obj) => {
-    if (err) return cb(err);
+    if (err) return cb(err)
     if (res.status >= 300) {
-      retry = retry || 0;
+      retry = retry || 0
       if (retry < 3 && res.status !== 401) {
         setTimeout(() => {
-          pullNamespacePaged(opt, lng, ns, cb, next, retry + 1);
-        }, getRandomDelay(3000, 10000));
-        return;
+          pullNamespacePaged(opt, lng, ns, cb, next, retry + 1)
+        }, getRandomDelay(3000, 10000))
+        return
       }
       if (obj && (obj.errorMessage || obj.message)) {
         if (res.statusText && res.status) {
-          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)))
         }
-        return cb(new Error((obj.errorMessage || obj.message)));
+        return cb(new Error((obj.errorMessage || obj.message)))
       }
-      return cb(new Error(res.statusText + ' (' + res.status + ')'));
+      return cb(new Error(res.statusText + ' (' + res.status + ')'))
     }
 
     if (opt.overriddenOnly && obj) {
-      const newObj = {};
+      const newObj = {}
       Object.keys(obj).forEach((k) => {
         if (obj[k].overrides !== undefined) {
           if (opt.raw) {
-            newObj[k] = obj[k];
+            newObj[k] = obj[k]
           } else {
-            newObj[k] = obj[k].value;
+            newObj[k] = obj[k].value
           }
         }
-      });
-      obj = newObj;
+      })
+      obj = newObj
     }
 
     cb(null, {
       result: opt.raw ? sortFlatResources(onlyKeysFlat(obj)) : sortFlatResources(flatten(obj)),
       next: res.headers.get('x-next-page'),
       lastModified: res.headers.get('last-modified') ? new Date(res.headers.get('last-modified')) : undefined
-    });
-  });
-};
+    })
+  })
+}
 
 const pullNamespace = (opt, lng, ns, cb) => {
-  var ret = {};
-  var lastModified = new Date(2000, 0, 1);
-  (function nextPage(next) {
+  const ret = {}
+  let lastModified = new Date(2000, 0, 1);
+  (function nextPage (next) {
     pullNamespacePaged(opt, lng, ns, (err, info) => {
-      if (err) return cb(err);
+      if (err) return cb(err)
 
       Object.keys(info.result).forEach((k) => {
-        ret[k] = info.result[k];
-      });
+        ret[k] = info.result[k]
+      })
 
       if (info.lastModified && info.lastModified.getTime() > (lastModified ? lastModified.getTime() : 0)) {
-        lastModified = info.lastModified;
+        lastModified = info.lastModified
       }
 
       if (info.next) {
-        return nextPage(info.next);
+        return nextPage(info.next)
       }
-      cb(null, ret, lastModified);
-    }, next);
-  })();
-};
+      cb(null, ret, lastModified)
+    }, next)
+  })()
+}
 
 const getRemoteNamespace = (opt, lng, ns, cb) => {
-  if (opt.unpublished) return pullNamespace(opt, lng, ns, cb);
+  if (opt.unpublished) return pullNamespace(opt, lng, ns, cb)
 
-  request(opt.apiPath + (opt.isPrivate ? '/private' : '') + '/' + opt.projectId + '/' + opt.version + '/' + lng + '/' + ns + '?ts=' + Date.now(), {
+  request(opt.apiPath + (opt.isPrivate ? '/private' : '') + '/' + opt.projectId + '/' + opt.version + '/' + lng + '/' + ns + '?ts=' + Date.now() + (opt.cdnType === 'standard' ? '&cache=no' : ''), {
     method: 'get',
-    headers: opt.isPrivate ? {
-      'Authorization': opt.apiKey
-    } : undefined
+    headers: opt.isPrivate
+      ? {
+          Authorization: opt.apiKey
+        }
+      : undefined
   }, (err, res, obj) => {
-    if (err) return cb(err);
+    if (err) return cb(err)
+    const ignore404 = res.status === 404 && opt.cdnType === 'standard'
+    if (ignore404) return cb(null, {}, undefined)
     if (res.status >= 300) {
       if (obj && (obj.errorMessage || obj.message)) {
         if (res.statusText && res.status) {
-          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)));
+          return cb(new Error(res.statusText + ' (' + res.status + ') | ' + (obj.errorMessage || obj.message)))
         }
-        return cb(new Error((obj.errorMessage || obj.message)));
+        return cb(new Error((obj.errorMessage || obj.message)))
       }
-      return cb(new Error(res.statusText + ' (' + res.status + ')'));
+      return cb(new Error(res.statusText + ' (' + res.status + ')'))
     }
-    cb(null, sortFlatResources(flatten(obj)), res.headers.get('last-modified') ? new Date(res.headers.get('last-modified')) : undefined);
-  });
-};
+    cb(null, sortFlatResources(flatten(obj)), res.headers.get('last-modified') ? new Date(res.headers.get('last-modified')) : undefined)
+  })
+}
 
-module.exports = getRemoteNamespace;
+module.exports = getRemoteNamespace

package/index.js

@@ -6,4 +6,4 @@ module.exports = {
   sync: require('./sync'),
   publishVersion: require('./publishVersion'),
   copyVersion: require('./copyVersion')
-};
+}

package/isValidUuid.js

@@ -1,2 +1,2 @@
-const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
-module.exports = (id) => uuidRegex.test(id);
+const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+module.exports = (id) => uuidRegex.test(id)

package/mergeBranch.js

@@ -1,102 +1,102 @@
-const colors = require('colors');
-const request = require('./request');
-const getBranches = require('./getBranches');
-const isValidUuid = require('./isValidUuid');
-const getJob = require('./getJob');
+const colors = require('colors')
+const request = require('./request')
+const getBranches = require('./getBranches')
+const isValidUuid = require('./isValidUuid')
+const getJob = require('./getJob')
 
 const mergeBranch = (opt, cb) => {
-  const queryParams = new URLSearchParams();
+  const queryParams = new URLSearchParams()
   if (opt.delete) {
-    queryParams.append('delete', 'true');
+    queryParams.append('delete', 'true')
   }
-  const queryString = queryParams.size > 0 ? '?' + queryParams.toString() : '';
+  const queryString = queryParams.size > 0 ? '?' + queryParams.toString() : ''
   request(opt.apiPath + '/branch/merge/' + opt.branch + queryString, {
     method: 'post',
     headers: {
-      'Authorization': opt.apiKey
+      Authorization: opt.apiKey
     }
   }, (err, res, obj) => {
     if (err || (obj && (obj.errorMessage || obj.message))) {
-      if (!cb) console.log(colors.red('merging branch failed...'));
+      if (!cb) console.log(colors.red('merging branch failed...'))
 
       if (err) {
-        if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
-        if (cb) cb(err);
-        return;
+        if (!cb) { console.error(colors.red(err.message)); process.exit(1) }
+        if (cb) cb(err)
+        return
       }
       if (obj && (obj.errorMessage || obj.message)) {
-        if (!cb) { console.error(colors.red((obj.errorMessage || obj.message))); process.exit(1); }
-        if (cb) cb(new Error((obj.errorMessage || obj.message)));
-        return;
+        if (!cb) { console.error(colors.red((obj.errorMessage || obj.message))); process.exit(1) }
+        if (cb) cb(new Error((obj.errorMessage || obj.message)))
+        return
       }
     }
     if (res.status === 404) {
-      if (!cb) { console.error(colors.yellow(res.statusText + ' (' + res.status + ')')); process.exit(1); }
-      if (cb) cb(null, null);
-      return;
+      if (!cb) { console.error(colors.yellow(res.statusText + ' (' + res.status + ')')); process.exit(1) }
+      if (cb) cb(null, null)
+      return
     }
     if (res.status >= 300) {
-      if (!cb) { console.error(colors.red(res.statusText + ' (' + res.status + ')')); process.exit(1); }
-      if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
-      return;
+      if (!cb) { console.error(colors.red(res.statusText + ' (' + res.status + ')')); process.exit(1) }
+      if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'))
+      return
     }
 
     if (!obj || !obj.jobId) {
-      if (!cb) { console.error(colors.red('No jobId! Something went wrong!')); process.exit(1); }
-      if (cb) cb(new Error('No jobId! Something went wrong!'));
-      return;
+      if (!cb) { console.error(colors.red('No jobId! Something went wrong!')); process.exit(1) }
+      if (cb) cb(new Error('No jobId! Something went wrong!'))
+      return
     }
 
-    (function waitForJob() {
+    (function waitForJob () {
       getJob({
         apiPath: opt.apiPath,
         apiKey: opt.apiKey,
         projectId: opt.branch
       }, obj.jobId, (err, job) => {
         if (err) {
-          if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
-          if (cb) cb(err);
-          return;
+          if (!cb) { console.error(colors.red(err.message)); process.exit(1) }
+          if (cb) cb(err)
+          return
         }
 
         if (job && !job.timeouted) {
-          setTimeout(waitForJob, 2000);
-          return;
+          setTimeout(waitForJob, 2000)
+          return
         }
 
         if (job && job.timeouted) {
-          if (!cb) { console.error(colors.red('Job timeouted!')); process.exit(1); }
-          if (cb) cb(new Error('Job timeouted!'));
-          return;
+          if (!cb) { console.error(colors.red('Job timeouted!')); process.exit(1) }
+          if (cb) cb(new Error('Job timeouted!'))
+          return
         }
 
-        if (!cb) console.log(colors.green('merging branch successful'));
-        if (cb) cb(null);
-      });
-    })();
-  });
-};
+        if (!cb) console.log(colors.green('merging branch successful'))
+        if (cb) cb(null)
+      })
+    })()
+  })
+}
 
 const handleError = (err, cb) => {
   if (!cb && err) {
-    console.error(colors.red(err.stack));
-    process.exit(1);
+    console.error(colors.red(err.stack))
+    process.exit(1)
   }
-  if (cb) cb(err);
-};
+  if (cb) cb(err)
+}
 
 module.exports = (opt, cb) => {
   getBranches(opt, (err, branches) => {
-    if (err) return handleError(err, cb);
+    if (err) return handleError(err, cb)
 
-    let b;
-    if (isValidUuid(opt.branch)) b = branches.find((br) => br.id === opt.branch);
-    if (!b) b = branches.find((br) => br.name === opt.branch);
+    let b
+    if (isValidUuid(opt.branch)) b = branches.find((br) => br.id === opt.branch)
+    if (!b) b = branches.find((br) => br.name === opt.branch)
     if (!b) {
-      return handleError(new Error(`Branch ${opt.branch} not found!`), cb);
+      return handleError(new Error(`Branch ${opt.branch} not found!`), cb)
     }
-    opt.branch = b.id;
+    opt.branch = b.id
 
-    mergeBranch(opt, cb);
-  });
-};
+    mergeBranch(opt, cb)
+  })
+}