react-native-onyx 1.0.51 → 1.0.53

package/dist/web.development.js

@@ -1213,14 +1213,25 @@ function mergeCollection(collectionKey, collection) {
   }
 
   // Confirm all the collection keys belong to the same parent
+  let hasCollectionKeyCheckFailed = false;
   underscore__WEBPACK_IMPORTED_MODULE_2___default().each(collection, (_data, dataKey) => {
     if (isKeyMatch(collectionKey, dataKey)) {
       return;
     }
 
-    throw new Error(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
+    if (true) {
+      throw new Error(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
+    }
+
+    hasCollectionKeyCheckFailed = true;
+    _Logger__WEBPACK_IMPORTED_MODULE_6__.logAlert(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
   });
 
+  // Gracefully handle bad mergeCollection updates so it doesn't block the merge queue
+  if (hasCollectionKeyCheckFailed) {
+    return Promise.resolve();
+  }
+
   return getAllKeys().
   then((persistedKeys) => {
     // Split to keys that exist in storage and keys that don't