Fix ||=

moment-team · Dec 6, 2021 · f95875c · f95875c
1 parent 4cf4a2c
commit f95875c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/core.js b/core.js
@@ -12,6 +12,8 @@ let _fs;
 let _octokitUrl;
 let _octokit;
 
+
+// TODO skip merge commits, but take newest version of files as a previous contents
 module.exports = async (context, { LokaliseApi, fs }) => {
   _context = context;
   _lokalise = new LokaliseApi({ apiKey: context.apiKey });
@@ -132,7 +134,9 @@ async function composeDiffSequence(compareResult) {
       if (Object.keys(jsonDifferenceResult.new).length ||
           Object.keys(jsonDifferenceResult.removed).length ||
           jsonDifferenceResult.edited.length) {
-        diffSequence[language] ||= [];
+        if (!diffSequence[language]) {
+          diffSequence[language] = [];
+        }
         diffSequence[language].push(jsonDifferenceResult);
       }
 
@@ -161,9 +165,13 @@ function composeActionsFromDiffSequence (diffSequence, keysToCreate, keysToUpdat
     fileDiffSequence.forEach(change => {
       Object.keys(change.new).forEach(key => {
         const normalizedKey = normalizeKey(key);
-        keysToCreate[normalizedKey] ||= {};
+        if (!keysToCreate[normalizedKey]) {
+          keysToCreate[normalizedKey] = {};
+        }
         keysToCreate[normalizedKey][language] = change.new[key];
-        keysToUpdate[normalizedKey] ||= {};
+        if (!keysToUpdate[normalizedKey]) {
+          keysToUpdate[normalizedKey] = {};
+        }
         keysToUpdate[normalizedKey][language] = change.new[key];
       });
       change.edited.forEach(edited => {
@@ -172,7 +180,9 @@ function composeActionsFromDiffSequence (diffSequence, keysToCreate, keysToUpdat
         if (keysToCreate[normalizedKey]?.[language]) {
           keysToCreate[normalizedKey][language] = edited[key].newvalue;
         } else {
-          keysToUpdate[normalizedKey] ||= {};
+          if (!keysToUpdate[normalizedKey]) {
+            keysToUpdate[normalizedKey] = {};
+          }
           keysToUpdate[normalizedKey][language] = edited[key].newvalue;
         }
       });

diff --git a/dist/index.js b/dist/index.js
@@ -26,6 +26,8 @@ let _fs;
 let _octokitUrl;
 let _octokit;
 
+
+// TODO skip merge commits, but take newest version of files as a previous contents
 module.exports = async (context, { LokaliseApi, fs }) => {
   _context = context;
   _lokalise = new LokaliseApi({ apiKey: context.apiKey });
@@ -146,7 +148,9 @@ async function composeDiffSequence(compareResult) {
       if (Object.keys(jsonDifferenceResult.new).length ||
           Object.keys(jsonDifferenceResult.removed).length ||
           jsonDifferenceResult.edited.length) {
-        diffSequence[language] ||= [];
+        if (!diffSequence[language]) {
+          diffSequence[language] = [];
+        }
         diffSequence[language].push(jsonDifferenceResult);
       }
 
@@ -175,9 +179,13 @@ function composeActionsFromDiffSequence (diffSequence, keysToCreate, keysToUpdat
     fileDiffSequence.forEach(change => {
       Object.keys(change.new).forEach(key => {
         const normalizedKey = normalizeKey(key);
-        keysToCreate[normalizedKey] ||= {};
+        if (!keysToCreate[normalizedKey]) {
+          keysToCreate[normalizedKey] = {};
+        }
         keysToCreate[normalizedKey][language] = change.new[key];
-        keysToUpdate[normalizedKey] ||= {};
+        if (!keysToUpdate[normalizedKey]) {
+          keysToUpdate[normalizedKey] = {};
+        }
         keysToUpdate[normalizedKey][language] = change.new[key];
       });
       change.edited.forEach(edited => {
@@ -186,7 +194,9 @@ function composeActionsFromDiffSequence (diffSequence, keysToCreate, keysToUpdat
         if (keysToCreate[normalizedKey]?.[language]) {
           keysToCreate[normalizedKey][language] = edited[key].newvalue;
         } else {
-          keysToUpdate[normalizedKey] ||= {};
+          if (!keysToUpdate[normalizedKey]) {
+            keysToUpdate[normalizedKey] = {};
+          }
           keysToUpdate[normalizedKey][language] = edited[key].newvalue;
         }
       });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "push-lokalise-keys",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {