react-native-onyx 2.0.3 → 2.0.5

package/dist/utils.js

@@ -1,66 +1,58 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const underscore_1 = __importDefault(require("underscore"));
-function areObjectsEmpty(a, b) {
-    return typeof a === 'object' && typeof b === 'object' && underscore_1.default.isEmpty(a) && underscore_1.default.isEmpty(b);
+/** Checks whether the given object is an object and not null/undefined. */
+function isEmptyObject(obj) {
+    return typeof obj === 'object' && Object.keys(obj || {}).length === 0;
 }
 // Mostly copied from https://medium.com/@lubaka.a/how-to-remove-lodash-performance-improvement-b306669ad0e1
 /**
- * @param {mixed} val
- * @returns {boolean}
+ * Checks whether the given value can be merged. It has to be an object, but not an array, RegExp or Date.
  */
-function isMergeableObject(val) {
-    const nonNullObject = val != null ? typeof val === 'object' : false;
-    return (nonNullObject &&
-        Object.prototype.toString.call(val) !== '[object RegExp]' &&
-        Object.prototype.toString.call(val) !== '[object Date]' &&
-        // eslint-disable-next-line rulesdir/prefer-underscore-method
-        !Array.isArray(val));
+function isMergeableObject(value) {
+    const nonNullObject = value != null ? typeof value === 'object' : false;
+    return nonNullObject && Object.prototype.toString.call(value) !== '[object RegExp]' && Object.prototype.toString.call(value) !== '[object Date]' && !Array.isArray(value);
 }
 /**
- * @param {Object} target
- * @param {Object} source
- * @param {Boolean} shouldRemoveNullObjectValues
- * @returns {Object}
+ * Merges the source object into the target object.
+ * @param target - The target object.
+ * @param source - The source object.
+ * @param shouldRemoveNullObjectValues - If true, null object values will be removed.
+ * @returns - The merged object.
  */
 function mergeObject(target, source, shouldRemoveNullObjectValues = true) {
     const destination = {};
     if (isMergeableObject(target)) {
         // lodash adds a small overhead so we don't use it here
-        // eslint-disable-next-line rulesdir/prefer-underscore-method
         const targetKeys = Object.keys(target);
         for (let i = 0; i < targetKeys.length; ++i) {
             const key = targetKeys[i];
+            const sourceValue = source === null || source === void 0 ? void 0 : source[key];
+            const targetValue = target === null || target === void 0 ? void 0 : target[key];
             // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
-            const isSourceOrTargetNull = target[key] === null || source[key] === null;
+            const isSourceOrTargetNull = targetValue === null || sourceValue === null;
             const shouldOmitSourceKey = shouldRemoveNullObjectValues && isSourceOrTargetNull;
             if (!shouldOmitSourceKey) {
-                destination[key] = target[key];
+                destination[key] = targetValue;
             }
         }
     }
-    // lodash adds a small overhead so we don't use it here
-    // eslint-disable-next-line rulesdir/prefer-underscore-method
     const sourceKeys = Object.keys(source);
     for (let i = 0; i < sourceKeys.length; ++i) {
         const key = sourceKeys[i];
+        const sourceValue = source === null || source === void 0 ? void 0 : source[key];
+        const targetValue = target === null || target === void 0 ? void 0 : target[key];
         // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
-        const shouldOmitSourceKey = shouldRemoveNullObjectValues && source[key] === null;
+        const shouldOmitSourceKey = shouldRemoveNullObjectValues && sourceValue === null;
         // If we pass undefined as the updated value for a key, we want to generally ignore it
-        const isSourceKeyUndefined = source[key] === undefined;
+        const isSourceKeyUndefined = sourceValue === undefined;
         if (!isSourceKeyUndefined && !shouldOmitSourceKey) {
-            const isSourceKeyMergable = isMergeableObject(source[key]);
-            if (isSourceKeyMergable && target[key]) {
-                if (!shouldRemoveNullObjectValues || isSourceKeyMergable) {
-                    // eslint-disable-next-line no-use-before-define
-                    destination[key] = fastMerge(target[key], source[key], shouldRemoveNullObjectValues);
-                }
+            const isSourceKeyMergable = isMergeableObject(sourceValue);
+            if (isSourceKeyMergable && targetValue) {
+                // eslint-disable-next-line no-use-before-define
+                destination[key] = fastMerge(targetValue, sourceValue, shouldRemoveNullObjectValues);
             }
-            else if (!shouldRemoveNullObjectValues || source[key] !== null) {
-                destination[key] = source[key];
+            else if (!shouldRemoveNullObjectValues || sourceValue !== null) {
+                destination[key] = sourceValue;
             }
         }
     }
@@ -72,28 +64,25 @@ function mergeObject(target, source, shouldRemoveNullObjectValues = true) {
  * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
  * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
  * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
- *
- * @param {Object|Array} target
- * @param {Object|Array} source
- * @param {Boolean} shouldRemoveNullObjectValues
- * @returns {Object|Array}
  */
 function fastMerge(target, source, shouldRemoveNullObjectValues = true) {
     // We have to ignore arrays and nullish values here,
     // otherwise "mergeObject" will throw an error,
     // because it expects an object as "source"
-    if (underscore_1.default.isArray(source) || source === null || source === undefined) {
+    if (Array.isArray(source) || source === null || source === undefined) {
         return source;
     }
     return mergeObject(target, source, shouldRemoveNullObjectValues);
 }
+/** Deep removes the nested null values from the given value. */
 function removeNestedNullValues(value) {
-    if (typeof value === 'object' && !underscore_1.default.isArray(value)) {
+    if (typeof value === 'object' && !Array.isArray(value)) {
         return fastMerge(value, value);
     }
     return value;
 }
+/** Formats the action name by uppercasing and adding the key if provided. */
 function formatActionName(method, key) {
     return key ? `${method.toUpperCase()}/${key}` : method.toUpperCase();
 }
-exports.default = { areObjectsEmpty, fastMerge, formatActionName, removeNestedNullValues };
+exports.default = { isEmptyObject, fastMerge, formatActionName, removeNestedNullValues };

package/dist/withOnyx.js

@@ -189,7 +189,7 @@ function default_1(mapOnyxToState, shouldDelayUpdates = false) {
                 // This simply bypasses the loading check if the tempState is gone and the update can be safely queued with a normal setStateProxy.
                 if (!this.state.loading || !this.tempState) {
                     // Performance optimization, do not trigger update with same values
-                    if (prevValue === val || utils_1.default.areObjectsEmpty(prevValue, val)) {
+                    if (prevValue === val || (utils_1.default.isEmptyObject(prevValue) && utils_1.default.isEmptyObject(val))) {
                         return;
                     }
                     this.setStateProxy({ [statePropertyName]: val });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",
@@ -49,10 +49,12 @@
     "@testing-library/jest-native": "^3.4.2",
     "@testing-library/react-native": "^7.0.2",
     "@types/jest": "^28.1.8",
+    "@types/lodash": "^4.14.202",
     "@types/node": "^20.11.5",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.18",
     "@types/react-native": "^0.70.0",
+    "@types/underscore": "^1.11.15",
     "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.19.0",
     "eslint": "^8.56.0",