react-native-onyx 1.0.92 → 1.0.93

package/dist/web.development.js

@@ -1186,14 +1186,12 @@ function multiSet(data) {
 function applyMerge(existingValue, changes) {
   const lastChange = underscore__WEBPACK_IMPORTED_MODULE_1___default().last(changes);
 
-  if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isArray(existingValue) || underscore__WEBPACK_IMPORTED_MODULE_1___default().isArray(lastChange)) {
+  if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isArray(lastChange)) {
     return lastChange;
   }
 
-  if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isObject(existingValue) || underscore__WEBPACK_IMPORTED_MODULE_1___default().every(changes, (underscore__WEBPACK_IMPORTED_MODULE_1___default().isObject))) {
-    // Object values are merged one after the other
-    // lodash adds a small overhead so we don't use it here
-    // eslint-disable-next-line prefer-object-spread, rulesdir/prefer-underscore-method
+  if (underscore__WEBPACK_IMPORTED_MODULE_1___default().some(changes, (underscore__WEBPACK_IMPORTED_MODULE_1___default().isObject))) {
+    // Object values are then merged one after the other
     return underscore__WEBPACK_IMPORTED_MODULE_1___default().reduce(changes, (modifiedData, change) => _utils__WEBPACK_IMPORTED_MODULE_9__["default"].fastMerge(modifiedData, change),
     existingValue || {});
   }
@@ -1224,6 +1222,12 @@ function applyMerge(existingValue, changes) {
  * @returns {Promise}
  */
 function merge(key, changes) {
+  // Top-level undefined values are ignored
+  // Therefore we need to prevent adding them to the merge queue
+  if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isUndefined(changes)) {
+    return mergeQueue[key] ? mergeQueuePromise[key] : Promise.resolve();
+  }
+
   // Merge attempts are batched together. The delta should be applied after a single call to get() to prevent a race condition.
   // Using the initial value from storage in subsequent merge attempts will lead to an incorrect final merged value.
   if (mergeQueue[key]) {
@@ -1238,12 +1242,21 @@ function merge(key, changes) {
       // We first only merge the changes, so we can provide these to the native implementation (SQLite uses only delta changes in "JSON_PATCH" to merge)
       let batchedChanges = applyMerge(undefined, mergeQueue[key]);
 
+      if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isNull(batchedChanges)) {
+        return remove(key);
+      }
+
+      // The presence of a `null` in the merge queue instructs us to drop the existing value.
+      // In this case, we can't simply merge the batched changes with the existing value, because then the null in the merge queue would have no effect
+      const shouldOverwriteExistingValue = underscore__WEBPACK_IMPORTED_MODULE_1___default().includes(mergeQueue[key], null);
+
       // Clean up the write queue, so we don't apply these changes again
       delete mergeQueue[key];
       delete mergeQueuePromise[key];
 
       // After that we merge the batched changes with the existing value
-      const modifiedData = _utils__WEBPACK_IMPORTED_MODULE_9__["default"].removeNullObjectValues(applyMerge(existingValue, [batchedChanges]));
+      const updatedValue = shouldOverwriteExistingValue ? batchedChanges : applyMerge(existingValue, [batchedChanges]);
+      const modifiedData = _utils__WEBPACK_IMPORTED_MODULE_9__["default"].removeNullObjectValues(updatedValue);
 
       // On native platforms we use SQLite which utilises JSON_PATCH to merge changes.
       // JSON_PATCH generally removes top-level nullish values from the stored object.
@@ -2440,8 +2453,9 @@ function mergeObject(target, source) {
 * @returns {Object|Array}
 */
 function fastMerge(target, source) {
-  // lodash adds a small overhead so we don't use it here
-  // eslint-disable-next-line rulesdir/prefer-underscore-method
+  // We have to ignore arrays and nullish values here,
+  // otherwise "mergeObject" will throw an error,
+  // because it expects an object as "source"
   if (underscore__WEBPACK_IMPORTED_MODULE_0__.isArray(source) || underscore__WEBPACK_IMPORTED_MODULE_0__.isNull(source) || underscore__WEBPACK_IMPORTED_MODULE_0__.isUndefined(source)) {
     return source;
   }