react-native-onyx 1.0.101 → 1.0.102

package/dist/web.development.js

@@ -1505,6 +1505,42 @@ 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
  *
@@ -1513,8 +1549,9 @@ function mergeCollection(collectionKey, collection) {
  */
 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];
   underscore__WEBPACK_IMPORTED_MODULE_1___default().each(data, (_ref3) => {let { onyxMethod, key, value } = _ref3;
-    if (!underscore__WEBPACK_IMPORTED_MODULE_1___default().contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET], onyxMethod)) {
+    if (!underscore__WEBPACK_IMPORTED_MODULE_1___default().contains(validMethods, onyxMethod)) {
       throw new Error(`Invalid onyxMethod ${onyxMethod} in Onyx update.`);
     }
     if (onyxMethod === METHOD.MULTI_SET) {
@@ -1527,32 +1564,10 @@ function update(data) {
     }
   });
 
-  const promises = [];
-  let clearPromise = Promise.resolve();
-
-  underscore__WEBPACK_IMPORTED_MODULE_1___default().each(data, (_ref4) => {let { onyxMethod, key, value } = _ref4;
-    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;}
-
-  });
+  // Put clear operation on top
+  data.sort((a) => a.onyxMethod === METHOD.CLEAR ? -1 : 1);
 
-  return clearPromise.then(() => Promise.all(underscore__WEBPACK_IMPORTED_MODULE_1___default().map(promises, (p) => p())));
+  return innerUpdate(data);
 }
 
 /**