react-native-onyx 1.0.107 → 1.0.109

package/lib/Onyx.js

@@ -235,8 +235,14 @@ function tryGetCachedValue(key, mapping = {}) {
     let val = cache.getValue(key);
 
     if (isCollectionKey(key)) {
-        const allKeys = cache.getAllKeys();
-        const matchingKeys = _.filter(allKeys, k => k.startsWith(key));
+        const allCacheKeys = cache.getAllKeys();
+
+        // It is possible we haven't loaded all keys yet so we do not know if the
+        // collection actually exists.
+        if (allCacheKeys.length === 0) {
+            return;
+        }
+        const matchingKeys = _.filter(allCacheKeys, k => k.startsWith(key));
         const values = _.reduce(matchingKeys, (finalObject, matchedKey) => {
             const cachedValue = cache.getValue(matchedKey);
             if (cachedValue) {
@@ -246,9 +252,7 @@ function tryGetCachedValue(key, mapping = {}) {
             }
             return finalObject;
         }, {});
-        if (_.isEmpty(values)) {
-            return;
-        }
+
         val = values;
     }
 
@@ -826,6 +830,10 @@ function connect(mapping) {
             // since there are none matched. In withOnyx() we wait for all connected keys to return a value before rendering the child
             // component. This null value will be filtered out so that the connected component can utilize defaultProps.
             if (matchingKeys.length === 0) {
+                if (mapping.key && !isCollectionKey(mapping.key)) {
+                    cache.set(mapping.key, null);
+                }
+
                 // Here we cannot use batching because the null value is expected to be set immediately for default props
                 // or they will be undefined.
                 sendDataToConnection(mapping, null, undefined, false);

package/lib/utils.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to 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.
+ */
+declare function fastMerge<T>(
+    target: T,
+    source: T,
+    shouldRemoveNullObjectValues: boolean = true
+): T;
+
+export default { fastMerge };

package/package.json

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