react-native-onyx 2.0.109 → 2.0.111

package/dist/OnyxCache.js

@@ -51,7 +51,7 @@ class OnyxCache {
         /** Map of keys and connection arrays whose keys will never be automatically evicted */
         this.evictionBlocklist = {};
         /** List of keys that have been directly subscribed to or recently modified from least to most recent */
-        this.recentlyAccessedKeys = [];
+        this.recentlyAccessedKeys = new Set();
         this.storageKeys = new Set();
         this.nullishStorageKeys = new Set();
         this.recentKeys = new Set();
@@ -252,7 +252,7 @@ class OnyxCache {
      * Remove a key from the recently accessed key list.
      */
     removeLastAccessedKey(key) {
-        this.recentlyAccessedKeys = this.recentlyAccessedKeys.filter((recentlyAccessedKey) => recentlyAccessedKey !== key);
+        this.recentlyAccessedKeys.delete(key);
     }
     /**
      * Add a key to the list of recently accessed keys. The least
@@ -265,7 +265,7 @@ class OnyxCache {
             return;
         }
         this.removeLastAccessedKey(key);
-        this.recentlyAccessedKeys.push(key);
+        this.recentlyAccessedKeys.add(key);
     }
     /**
      * Take all the keys that are safe to evict and add them to
@@ -291,7 +291,12 @@ class OnyxCache {
      * Finds a key that can be safely evicted
      */
     getKeyForEviction() {
-        return this.recentlyAccessedKeys.find((key) => !this.evictionBlocklist[key]);
+        for (const key of this.recentlyAccessedKeys) {
+            if (!this.evictionBlocklist[key]) {
+                return key;
+            }
+        }
+        return undefined;
     }
 }
 const instance = new OnyxCache();

package/dist/storage/__mocks__/index.d.ts

@@ -1,25 +1,25 @@
 /// <reference types="jest" />
 declare const StorageMock: {
-    init: jest.Mock<void, []>;
-    getItem: jest.Mock<Promise<unknown>, [key: any]>;
-    multiGet: jest.Mock<Promise<import("../providers/types").KeyValuePairList>, [keys: import("../providers/types").KeyList]>;
-    setItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [key: any, value: unknown]>;
-    multiSet: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult>, [pairs: import("../providers/types").KeyValuePairList]>;
-    mergeItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult>, [key: any, deltaChanges: unknown, preMergedValue: unknown, shouldSetValue?: boolean | undefined]>;
-    multiMerge: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult | IDBValidKey[]>, [pairs: import("../providers/types").KeyValuePairList]>;
-    removeItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [key: string]>;
-    removeItems: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [keys: import("../providers/types").KeyList]>;
-    clear: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, []>;
-    getAllKeys: jest.Mock<Promise<import("../providers/types").KeyList>, []>;
+    init: jest.Mock<void, [], any>;
+    getItem: jest.Mock<Promise<unknown>, [key: any], any>;
+    multiGet: jest.Mock<Promise<import("../providers/types").KeyValuePairList>, [keys: import("../providers/types").KeyList], any>;
+    setItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [key: any, value: unknown], any>;
+    multiSet: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult>, [pairs: import("../providers/types").KeyValuePairList], any>;
+    mergeItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult>, [key: any, deltaChanges: unknown, preMergedValue: unknown, shouldSetValue?: boolean | undefined], any>;
+    multiMerge: jest.Mock<Promise<void | import("react-native-nitro-sqlite").BatchQueryResult | IDBValidKey[]>, [pairs: import("../providers/types").KeyValuePairList], any>;
+    removeItem: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [key: string], any>;
+    removeItems: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [keys: import("../providers/types").KeyList], any>;
+    clear: jest.Mock<Promise<void | import("react-native-nitro-sqlite").QueryResult<import("react-native-nitro-sqlite").QueryResultRow>>, [], any>;
+    getAllKeys: jest.Mock<Promise<import("../providers/types").KeyList>, [], any>;
     getDatabaseSize: jest.Mock<Promise<{
         bytesUsed: number;
         bytesRemaining: number;
-    }>, []>;
-    keepInstancesSync: jest.Mock<any, any>;
+    }>, [], any>;
+    keepInstancesSync: jest.Mock<any, any, any>;
     mockSet: (key: string, value: unknown) => Promise<unknown>;
     getMockStore: jest.Mock<{
         [x: string]: unknown;
-    }, []>;
-    setMockStore: jest.Mock<void, [data: any]>;
+    }, [], any>;
+    setMockStore: jest.Mock<void, [data: any], any>;
 };
 export default StorageMock;

package/dist/useOnyx.js

@@ -36,29 +36,6 @@ const useLiveRef_1 = __importDefault(require("./useLiveRef"));
 const usePrevious_1 = __importDefault(require("./usePrevious"));
 const metrics_1 = __importDefault(require("./metrics"));
 const Logger = __importStar(require("./Logger"));
-/**
- * Gets the cached value from the Onyx cache. If the key is a collection key, it will return all the values in the collection.
- * It is a fork of `tryGetCachedValue` from `OnyxUtils` caused by different selector logic in `useOnyx`. It should be unified in the future, when `withOnyx` is removed.
- */
-function tryGetCachedValue(key) {
-    if (!OnyxUtils_1.default.isCollectionKey(key)) {
-        return OnyxCache_1.default.get(key);
-    }
-    const allCacheKeys = OnyxCache_1.default.getAllKeys();
-    // It is possible we haven't loaded all keys yet so we do not know if the
-    // collection actually exists.
-    if (allCacheKeys.size === 0) {
-        return;
-    }
-    const values = {};
-    allCacheKeys.forEach((cacheKey) => {
-        if (!cacheKey.startsWith(key)) {
-            return;
-        }
-        values[cacheKey] = OnyxCache_1.default.get(cacheKey);
-    });
-    return values;
-}
 function useOnyx(key, options, dependencies = []) {
     const connectionRef = (0, react_1.useRef)(null);
     const previousKey = (0, usePrevious_1.default)(key);
@@ -146,7 +123,7 @@ function useOnyx(key, options, dependencies = []) {
         // update `newValueRef` when `Onyx.connect()` callback is fired.
         if (isFirstConnectionRef.current || shouldGetCachedValueRef.current) {
             // Gets the value from cache and maps it with selector. It changes `null` to `undefined` for `useOnyx` compatibility.
-            const value = tryGetCachedValue(key);
+            const value = OnyxUtils_1.default.tryGetCachedValue(key);
             const selectedValue = selectorRef.current ? selectorRef.current(value) : value;
             newValueRef.current = (selectedValue !== null && selectedValue !== void 0 ? selectedValue : undefined);
             // This flag is `false` when the original Onyx value (without selector) is not defined yet.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "2.0.109",
+  "version": "2.0.111",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",
@@ -54,12 +54,12 @@
     "@actions/core": "^1.10.1",
     "@jest/globals": "^29.7.0",
     "@lwc/eslint-plugin-lwc": "^1.7.2",
-    "@ngneat/falso": "^7.2.0",
+    "@ngneat/falso": "^7.3.0",
     "@react-native-community/eslint-config": "^3.2.0",
+    "@react-native/babel-preset": "0.76.3",
     "@react-native/polyfills": "^2.0.0",
-    "@testing-library/jest-native": "^3.4.2",
-    "@testing-library/react-native": "^10.0.0",
-    "@types/jest": "^28.1.8",
+    "@testing-library/react-native": "^13.2.0",
+    "@types/jest": "^29.5.14",
     "@types/jsdoc-to-markdown": "^7.0.6",
     "@types/lodash": "^4.14.202",
     "@types/node": "^20.11.5",
@@ -78,21 +78,21 @@
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.31.10",
     "idb-keyval": "^6.2.1",
-    "jest": "^26.5.2",
-    "jest-cli": "^26.5.2",
+    "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jsdoc-to-markdown": "^7.1.0",
-    "metro-react-native-babel-preset": "^0.77.0",
     "nodemon": "^3.0.3",
     "prettier": "^2.8.8",
     "prop-types": "^15.7.2",
     "react": "18.2.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "18.2.0",
     "react-native": "0.76.3",
     "react-native-device-info": "^10.3.0",
     "react-native-nitro-modules": "^0.24.1",
     "react-native-nitro-sqlite": "^9.1.8",
     "react-native-performance": "^2.0.0",
-    "react-test-renderer": "18.1.0",
+    "react-test-renderer": "18.2.0",
     "reassure": "1.4.0",
     "ts-node": "^10.9.2",
     "type-fest": "^3.12.0",
@@ -101,8 +101,8 @@
   "peerDependencies": {
     "idb-keyval": "^6.2.1",
     "react": ">=18.1.0",
-    "react-native": ">=0.75.0",
     "react-dom": ">=18.1.0",
+    "react-native": ">=0.75.0",
     "react-native-device-info": "^10.3.0",
     "react-native-nitro-modules": ">=0.24.1",
     "react-native-nitro-sqlite": "^9.1.4",