react-native-onyx 1.0.104 → 1.0.106

package/lib/Onyx.js

@@ -1422,42 +1422,6 @@ function mergeCollection(collectionKey, collection) {
         });
 }
 
-/**
- * Internal recursive function to execute the functions in the correct order
- *
- * @param {Array} data An array of objects with shape {onyxMethod: oneOf('set', 'merge', 'mergeCollection', 'multiSet', 'clear'), key: string, value: *}
- * @returns {Promise<Void>}
- */
-function innerUpdate(data) {
-    if (data.length === 0) {
-        return Promise.resolve();
-    }
-
-    const {onyxMethod, key, value} = data.shift();
-    let promise = Promise.resolve();
-    switch (onyxMethod) {
-        case METHOD.SET:
-            promise = set(key, value);
-            break;
-        case METHOD.MERGE:
-            promise = merge(key, value);
-            break;
-        case METHOD.MERGE_COLLECTION:
-            promise = mergeCollection(key, value);
-            break;
-        case METHOD.MULTI_SET:
-            promise = multiSet(value);
-            break;
-        case METHOD.CLEAR:
-            promise = clear();
-            break;
-        default:
-            break;
-    }
-
-    return promise.then(() => innerUpdate(data));
-}
-
 /**
  * Insert API responses and lifecycle data into Onyx
  *
@@ -1466,9 +1430,8 @@ function innerUpdate(data) {
  */
 function update(data) {
     // First, validate the Onyx object is in the format we expect
-    const validMethods = [METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET];
     _.each(data, ({onyxMethod, key, value}) => {
-        if (!_.contains(validMethods, onyxMethod)) {
+        if (!_.contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET], onyxMethod)) {
             throw new Error(`Invalid onyxMethod ${onyxMethod} in Onyx update.`);
         }
         if (onyxMethod === METHOD.MULTI_SET) {
@@ -1481,10 +1444,32 @@ function update(data) {
         }
     });
 
-    // Put clear operation on top
-    data.sort(a => (a.onyxMethod === METHOD.CLEAR ? -1 : 1));
+    const promises = [];
+    let clearPromise = Promise.resolve();
+
+    _.each(data, ({onyxMethod, key, value}) => {
+        switch (onyxMethod) {
+            case METHOD.SET:
+                promises.push(() => set(key, value));
+                break;
+            case METHOD.MERGE:
+                promises.push(() => merge(key, value));
+                break;
+            case METHOD.MERGE_COLLECTION:
+                promises.push(() => mergeCollection(key, value));
+                break;
+            case METHOD.MULTI_SET:
+                promises.push(() => multiSet(value));
+                break;
+            case METHOD.CLEAR:
+                clearPromise = clear();
+                break;
+            default:
+                break;
+        }
+    });
 
-    return innerUpdate(data);
+    return clearPromise.then(() => Promise.all(_.map(promises, p => p())));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "1.0.104",
+  "version": "1.0.106",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",