react-native-onyx 3.0.40 → 3.0.42

package/dist/Onyx.js

@@ -61,6 +61,11 @@ function init({ keys = {}, initialKeyStates = {}, evictableKeys = [], maxCachedK
     OnyxCache_1.default.setRamOnlyKeys(new Set(ramOnlyKeys));
     if (shouldSyncMultipleInstances) {
         (_a = storage_1.default.keepInstancesSync) === null || _a === void 0 ? void 0 : _a.call(storage_1.default, (key, value) => {
+            // RAM-only keys should never sync from storage as they may have stale persisted data
+            // from before the key was migrated to RAM-only.
+            if (OnyxUtils_1.default.isRamOnlyKey(key)) {
+                return;
+            }
             OnyxCache_1.default.set(key, value);
             // Check if this is a collection member key to prevent duplicate callbacks
             // When a collection is updated, individual members sync separately to other tabs

package/dist/OnyxUtils.js

@@ -208,6 +208,13 @@ function get(key) {
     if (OnyxCache_1.default.hasCacheForKey(key)) {
         return Promise.resolve(OnyxCache_1.default.get(key));
     }
+    // RAM-only keys should never read from storage (they may have stale persisted data
+    // from before the key was migrated to RAM-only). Mark as nullish so future get() calls
+    // short-circuit via hasCacheForKey and avoid re-running this branch.
+    if (isRamOnlyKey(key)) {
+        OnyxCache_1.default.addNullishStorageKey(key);
+        return Promise.resolve(undefined);
+    }
     const taskName = `${OnyxCache_1.TASK.GET}:${key}`;
     // When a value retrieving task for this key is still running hook to it
     if (OnyxCache_1.default.hasPendingTask(taskName)) {
@@ -258,6 +265,14 @@ function multiGet(keys) {
      * These missingKeys will be later used to multiGet the data from the storage.
      */
     for (const key of keys) {
+        // RAM-only keys should never read from storage as they may have stale persisted data
+        // from before the key was migrated to RAM-only.
+        if (isRamOnlyKey(key)) {
+            if (OnyxCache_1.default.hasCacheForKey(key)) {
+                dataMap.set(key, OnyxCache_1.default.get(key));
+            }
+            continue;
+        }
         const cacheValue = OnyxCache_1.default.get(key);
         if (cacheValue) {
             dataMap.set(key, cacheValue);
@@ -361,7 +376,10 @@ function getAllKeys() {
     }
     // Otherwise retrieve the keys from storage and capture a promise to aid concurrent usages
     const promise = storage_1.default.getAllKeys().then((keys) => {
-        OnyxCache_1.default.setAllKeys(keys);
+        // Filter out RAM-only keys from storage results as they may be stale entries
+        // from before the key was migrated to RAM-only.
+        const filteredKeys = keys.filter((key) => !isRamOnlyKey(key));
+        OnyxCache_1.default.setAllKeys(filteredKeys);
         // return the updated set of keys
         return OnyxCache_1.default.getAllKeys();
     });
@@ -888,7 +906,10 @@ function mergeInternal(mode, changes, existingValue) {
  * Merge user provided default key value pairs.
  */
 function initializeWithDefaultKeyStates() {
-    return storage_1.default.multiGet(Object.keys(defaultKeyStates)).then((pairs) => {
+    // Filter out RAM-only keys from storage reads as they may have stale persisted data
+    // from before the key was migrated to RAM-only.
+    const keysToFetch = Object.keys(defaultKeyStates).filter((key) => !isRamOnlyKey(key));
+    return storage_1.default.multiGet(keysToFetch).then((pairs) => {
         const existingDataAsObject = Object.fromEntries(pairs);
         const merged = utils_1.default.fastMerge(existingDataAsObject, defaultKeyStates, {
             shouldRemoveNestedNulls: true,

package/dist/storage/providers/SQLiteProvider.js

@@ -86,7 +86,7 @@ const provider = {
         if (!provider.store) {
             throw new Error('Store is not initialized!');
         }
-        const query = 'REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, json(?));';
+        const query = 'REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, ?);';
         const params = pairs.map((pair) => [pair[0], JSON.stringify(pair[1] === undefined ? null : pair[1])]);
         if (utils_1.default.isEmptyObject(params)) {
             return Promise.resolve();
@@ -100,12 +100,16 @@ const provider = {
         const commands = [];
         // Query to merge the change into the DB value.
         const patchQuery = `INSERT INTO keyvaluepairs (record_key, valueJSON)
-            VALUES (:key, JSON(:value))
+            VALUES (:key, :value)
             ON CONFLICT DO UPDATE
-            SET valueJSON = JSON_PATCH(valueJSON, JSON(:value));
+            SET valueJSON = JSON_PATCH(valueJSON, :value);
         `;
         const patchQueryArguments = [];
         // Query to fully replace the nested objects of the DB value.
+        // NOTE: The JSON() wrapper around the replacement value is required here. Unlike JSON_PATCH (which
+        // parses both arguments as JSON internally), JSON_REPLACE treats a plain TEXT binding as a quoted
+        // JSON string. Without JSON(), objects would be stored as string values (e.g. "{...}") instead of
+        // actual JSON objects, corrupting the stored data.
         const replaceQuery = `UPDATE keyvaluepairs
             SET valueJSON = JSON_REPLACE(valueJSON, ?, JSON(?))
             WHERE record_key = ?;

package/package.json

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