react-redux-cache 0.22.0 → 0.22.2

package/dist/types/mutate.d.ts

@@ -9,7 +9,7 @@ export declare const mutate: <
   QR,
   MP,
   MR,
-  MK extends keyof (MP & MR)
+  MK extends keyof (MP & MR),
 >(
   logTag: string,
   store: Store,
@@ -26,7 +26,7 @@ export declare const mutate: <
         params: MP[keyof MP & keyof MR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, MR[keyof MP & keyof MR & number]> | undefined,
@@ -34,7 +34,7 @@ export declare const mutate: <
         params: MP[keyof MP & keyof MR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, MR[keyof MP & keyof MR & symbol]> | undefined,
@@ -42,7 +42,7 @@ export declare const mutate: <
         params: MP[keyof MP & keyof MR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | undefined,
   onSuccess?:
@@ -51,21 +51,21 @@ export declare const mutate: <
         params: MP[keyof MP & keyof MR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, MR[keyof MP & keyof MR & number]>,
         params: MP[keyof MP & keyof MR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, MR[keyof MP & keyof MR & symbol]>,
         params: MP[keyof MP & keyof MR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | undefined,
   onError?:
@@ -74,21 +74,21 @@ export declare const mutate: <
         params: MP[keyof MP & keyof MR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
     | ((
         error: unknown,
         params: MP[keyof MP & keyof MR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
     | ((
         error: unknown,
         params: MP[keyof MP & keyof MR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
-    | undefined
+    | undefined,
 ) => Promise<MutationResult<MK extends keyof (MP | MR) ? MR[MK] : never>>

package/dist/types/query.d.ts

@@ -9,7 +9,7 @@ export declare const query: <
   QR,
   MP,
   MR,
-  QK extends keyof (QP & QR)
+  QK extends keyof (QP & QR),
 >(
   logTag: string,
   store: Store,
@@ -29,7 +29,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => QR[keyof QP & keyof QR & string])
     | ((
         oldResult: QR[keyof QP & keyof QR & number] | undefined,
@@ -37,7 +37,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => QR[keyof QP & keyof QR & number])
     | ((
         oldResult: QR[keyof QP & keyof QR & symbol] | undefined,
@@ -45,7 +45,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => QR[keyof QP & keyof QR & symbol])
     | undefined,
   onCompleted?:
@@ -55,7 +55,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, QR[keyof QP & keyof QR & number]> | undefined,
@@ -63,7 +63,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, QR[keyof QP & keyof QR & symbol]> | undefined,
@@ -71,7 +71,7 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | undefined,
   onSuccess?:
@@ -80,21 +80,21 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, QR[keyof QP & keyof QR & number]>,
         params: QP[keyof QP & keyof QR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | ((
         response: import('./types').NormalizedQueryResponse<T, QR[keyof QP & keyof QR & symbol]>,
         params: QP[keyof QP & keyof QR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => void)
     | undefined,
   onError?:
@@ -103,21 +103,21 @@ export declare const query: <
         params: QP[keyof QP & keyof QR & string] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
     | ((
         error: unknown,
         params: QP[keyof QP & keyof QR & number] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
     | ((
         error: unknown,
         params: QP[keyof QP & keyof QR & symbol] | undefined,
         store: Store,
         actions: Actions<N, T, QP, QR, MP, MR>,
-        selectors: Selectors<N, T, QP, QR, MP, MR>
+        selectors: Selectors<N, T, QP, QR, MP, MR>,
       ) => boolean | void | null | undefined)
-    | undefined
+    | undefined,
 ) => Promise<QueryResult<QK extends keyof (QP | QR) ? QR[QK] : never>>

package/dist/types/types.d.ts

@@ -68,7 +68,7 @@ export type Cache<N extends string, T extends Typenames, QP, QR, MP, MR> = {
 
 export type QueryStateComparer<T extends Typenames, P, R> = (
   x: QueryState<T, P, R> | undefined,
-  y: QueryState<T, P, R> | undefined
+  y: QueryState<T, P, R> | undefined,
 ) => boolean
 
 export type Globals<N extends string, T extends Typenames, QP, QR, MP, MR> = {
@@ -79,7 +79,7 @@ export type Globals<N extends string, T extends Typenames, QP, QR, MP, MR> = {
     params: unknown,
     store: Store,
     actions: Actions<N, T, QP, QR, MP, MR>,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => void
   /** Query options. */
   queries: {
@@ -91,7 +91,7 @@ export type Globals<N extends string, T extends Typenames, QP, QR, MP, MR> = {
       params: unknown,
       state: QueryState<T, unknown, unknown>,
       store: Store,
-      selectors: Selectors<N, T, QP, QR, MP, MR>
+      selectors: Selectors<N, T, QP, QR, MP, MR>,
     ) => boolean
     /** Disables any fetches when set to true. Triggers fetch when changed to false. @Default false */
     skipFetch: boolean
@@ -153,7 +153,7 @@ export type QueryInfo<
   QP = unknown,
   QR = unknown,
   MP = unknown,
-  MR = unknown
+  MR = unknown,
 > = Partial<Pick<Globals<N, T, QP, QR, MP, MR>['queries'], 'skipFetch' | 'secondsToLive'>> & {
   query: NormalizedQuery<T, P, R>
   /** Determines when useQuery fetch triggers should start fetching. Fetch is performed if function returns true.
@@ -164,7 +164,7 @@ export type QueryInfo<
     params: P,
     queryState: QueryState<T, P, R>,
     store: Store,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => boolean
   /** Merges results before saving to the store. Default implementation is using the latest result. */
   mergeResults?: (
@@ -173,7 +173,7 @@ export type QueryInfo<
     params: P | undefined,
     store: Store,
     actions: Actions<N, T, QP, QR, MP, MR>,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => R
   /**
    * Cache key is used for storing the query state and for performing a fetch when it changes. Queries with the same cache key share their state.
@@ -188,7 +188,7 @@ export type QueryInfo<
     params: P | undefined,
     store: Store,
     actions: Actions<N, T, QP, QR, MP, MR>,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => void
   /** Called after fetch finished successfully. */
   onSuccess?: (
@@ -196,7 +196,7 @@ export type QueryInfo<
     params: P | undefined,
     store: Store,
     actions: Actions<N, T, QP, QR, MP, MR>,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => void
   /** Called after fetch finished with error. Should return true if error was handled and does not require global onError handling. */
   onError?: (
@@ -204,7 +204,7 @@ export type QueryInfo<
     params: P | undefined,
     store: Store,
     actions: Actions<N, T, QP, QR, MP, MR>,
-    selectors: Selectors<N, T, QP, QR, MP, MR>
+    selectors: Selectors<N, T, QP, QR, MP, MR>,
   ) => boolean | void | null | undefined
   /** Either comparer function, or array of keys to subscribe by useQuery's useSelector. Default compares params, result, loading, error. */
   selectorComparer?: QueryStateComparer<T, P, R> | (keyof QueryState<T, P, R>)[]
@@ -214,7 +214,7 @@ export type Query<P = unknown, R = unknown> = (
   /** Query parameters */
   params: P,
   /** Store */
-  store: Store
+  store: Store,
 ) => Promise<QueryResponse<R>>
 
 export type NormalizedQuery<T extends Typenames = Typenames, P = unknown, R = unknown> = (
@@ -237,7 +237,7 @@ export type UseQueryOptions<
   QP,
   QR,
   MP,
-  MR
+  MR,
 > = {
   query: QK
   params: QK extends keyof (QP | QR) ? QP[QK] : never
@@ -269,7 +269,7 @@ export type QueryOptions<
   QR,
   QK extends keyof (QP & QR),
   MP,
-  MR
+  MR,
 > = Pick<
   UseQueryOptions<N, T, QK, QP, QR, MP, MR>,
   | 'query'
@@ -314,7 +314,7 @@ export type MutationInfo<
   QP = unknown,
   QR = unknown,
   MP = unknown,
-  MR = unknown
+  MR = unknown,
 > = Pick<QueryInfo<N, T, P, R, QP, QR, MP, MR>, 'onCompleted' | 'onSuccess' | 'onError'> & {
   mutation: NormalizedMutation<T, P, R>
 }
@@ -325,7 +325,7 @@ export type Mutation<P = unknown, R = unknown> = (
   /** Store */
   store: Store,
   /** Signal is aborted for current mutation when the same mutation was called once again. */
-  abortSignal: AbortSignal
+  abortSignal: AbortSignal,
 ) => Promise<MutationResponse<R>>
 
 export type NormalizedMutation<T extends Typenames = Typenames, P = unknown, R = unknown> = (
@@ -339,7 +339,7 @@ export type MutateOptions<
   QR,
   MP,
   MR,
-  MK extends keyof (MP & MR)
+  MK extends keyof (MP & MR),
 > = Pick<
   MutationInfo<
     N,

package/dist/types/useMutation.d.ts

@@ -9,16 +9,16 @@ export declare const useMutation: <
   QR,
   MP,
   MR,
-  MK extends keyof (MP & MR)
+  MK extends keyof (MP & MR),
 >(
   cache: Pick<Cache<N, T, QP, QR, MP, MR>, 'options' | 'globals' | 'mutations' | 'storeHooks'>,
   actions: Actions<N, T, QP, QR, MP, MR>,
   selectors: Selectors<N, T, QP, QR, MP, MR>,
   options: Omit<MutateOptions<N, T, QP, QR, MP, MR, MK>, 'params'>,
-  abortControllers: WeakMap<Store, Record<Key, AbortController>>
+  abortControllers: WeakMap<Store, Record<Key, AbortController>>,
 ) => readonly [
   (
-    params: MK extends keyof MP & keyof MR ? MP[MK] : never
+    params: MK extends keyof MP & keyof MR ? MP[MK] : never,
   ) => Promise<
     import('./types').MutationResult<
       MK extends infer T_1
@@ -35,5 +35,5 @@ export declare const useMutation: <
     MK extends keyof MP & keyof MR ? MP[MK] : never,
     MK extends keyof MP & keyof MR ? MP[MK] : never
   >,
-  () => boolean
+  () => boolean,
 ]

package/dist/types/useQuery.d.ts

@@ -9,12 +9,12 @@ export declare const useQuery: <
   QR,
   MP,
   MR,
-  QK extends keyof (QP & QR)
+  QK extends keyof (QP & QR),
 >(
   cache: Pick<Cache<N, T, QP, QR, MP, MR>, 'options' | 'globals' | 'queries' | 'storeHooks'>,
   actions: Actions<N, T, QP, QR, MP, MR>,
   selectors: Selectors<N, T, QP, QR, MP, MR>,
-  options: UseQueryOptions<N, T, QK, QP, QR, MP, MR>
+  options: UseQueryOptions<N, T, QK, QP, QR, MP, MR>,
 ) => readonly [
   Omit<
     QueryState<
@@ -25,7 +25,7 @@ export declare const useQuery: <
     'expiresAt'
   >,
   (
-    options?: Partial<Pick<QueryOptions<N, T, QP, QR, QK, MP, MR>, 'params' | 'onlyIfExpired'>>
+    options?: Partial<Pick<QueryOptions<N, T, QP, QR, QK, MP, MR>, 'params' | 'onlyIfExpired'>>,
   ) => Promise<
     import('./types').QueryResult<
       QK extends infer T_1
@@ -36,5 +36,5 @@ export declare const useQuery: <
           : never
         : never
     >
-  >
+  >,
 ]

package/dist/types/utilsAndConstants.d.ts

@@ -34,7 +34,7 @@ export declare const defaultGetCacheKey: <P = unknown>(params: P) => Key
 export declare const applyEntityChanges: <T extends Typenames>(
   entities: EntitiesMap<T> & Mutable,
   changes: EntityChanges<T>,
-  options: CacheOptions
+  options: CacheOptions,
 ) => EntitiesMap<T> | undefined
 
 /** Returns true if object has no keys. */
@@ -42,7 +42,7 @@ export declare const isEmptyObject: (obj: object) => boolean
 
 /** Returns query state comparer that compares only provided fields. Used in implementation of `selectorComparer` option. */
 export declare const createStateComparer: <T extends Typenames = Typenames, Q = unknown, P = unknown>(
-  fields: (keyof QueryState<T, Q, P>)[]
+  fields: (keyof QueryState<T, Q, P>)[],
 ) => QueryStateComparer<T, Q, P>
 
 export declare const FetchPolicy: {
@@ -53,7 +53,7 @@ export declare const FetchPolicy: {
   NoCacheOrExpired: <T extends Typenames = Typenames, P = unknown, R = unknown>(
     expired: boolean,
     _params: P,
-    state: QueryState<T, P, R>
+    state: QueryState<T, P, R>,
   ) => boolean
   /** Every fetch trigger. */
   Always: () => boolean

package/package.json

@@ -2,7 +2,7 @@
   "name": "react-redux-cache",
   "author": "Alexander Danilov",
   "license": "MIT",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Powerful data fetching and caching library for Redux and Zustand that supports normalization.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -23,7 +23,7 @@
     "build-cjs": "tsc -p tsconfig.cjs.json && rm -rf dist/cjs/testing && rm -rf dist/cjs/__tests__",
     "build-esm": "tsc -p tsconfig.esm.json > /dev/null ; rm -rf dist/esm/testing && rm -rf dist/esm/__tests__",
     "build-types": "tsc -p tsconfig.types.json > /dev/null ; rm -rf dist/types/testing && rm -rf dist/types/__tests__",
-    "build": "yarn clean && yarn lint && yarn build-cjs && yarn build-esm && yarn build-types && yarn size && yarn lint-fix-dist && yarn generate-docs",
+    "build": "yarn clean && yarn lint && yarn build-cjs && yarn build-esm && yarn build-types && yarn lint-fix-dist && yarn size && yarn generate-docs && yarn benchmark",
     "size": "npx minified-size dist/esm/*.js | grep 'total:' | sed -E 's/.*total: [^,]*, ([^,]*), ([^,]*), ([^,]*).*/<br\\/>minified: \\1<br\\/>gzipped: \\2<br\\/>brotlied: \\3/'",
     "test": "node node_modules/jest/bin/jest.js",
     "preminor-rc": "yarn build && npm version preminor --preid rc",
@@ -32,7 +32,7 @@
     "remove-rc": "npm version <same-version-without-rc>",
     "prepublishOnly": "yarn build && yarn test",
     "generate-docs": "node --experimental-strip-types scripts/generate-docs.ts",
-    "benchmark": "NODE_ENV=production node -r ts-node/register --expose-gc benchmark.ts"
+    "benchmark": "NODE_ENV=production node --expose-gc benchmark.mjs"
   },
   "peerDependencies": {
     "fast-deep-equal": "*",
@@ -53,19 +53,19 @@
     "@types/jest": "29.5.1",
     "@types/node": "20.1.2",
     "@types/redux-logger": "3.0.9",
-    "@typescript-eslint/eslint-plugin": "5.59.5",
-    "@typescript-eslint/parser": "5.59.5",
-    "eslint": "8.40.0",
-    "eslint-config-prettier": "8.8.0",
+    "@typescript-eslint/eslint-plugin": "8.51.0",
+    "@typescript-eslint/parser": "8.51.0",
+    "eslint": "9.39.2",
+    "eslint-config-prettier": "10.1.8",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-simple-import-sort": "10.0.0",
+    "eslint-plugin-prettier": "5.5.4",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-simple-import-sort": "12.1.1",
     "jest": "29.5.0",
     "jest-environment-jsdom": "29.7.0",
     "minified-size": "4.0.0",
-    "prettier": "2.8.8",
+    "prettier": "3.7.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-redux": "8.0.5",
@@ -73,7 +73,6 @@
     "redux": "4.2.1",
     "redux-logger": "3.0.6",
     "ts-jest": "29.1.0",
-    "ts-node": "10.9.2",
     "typescript": "5.6.3"
   },
   "files": [