react-redux-cache 0.22.0 → 0.22.2

package/README.md

@@ -333,8 +333,8 @@ For huge collections (> 1000 items, see benchmark) immutable approach may be a b
     
 | Collection size | 0 | 1000 | 10000 | 100000 | 1000000 |
 |-|-|-|-|-|-|
-| immutable | 1.78 | 1.69 | 5.64 | 117.4 | 1284.6 |
-| mutable | 1.68 | 0.92 | 0.98 | 0.98 | 0.99 |
+| immutable | 1.57 | 1.81 | 7.62 | 103.82 | 1457.89 |
+| mutable | 1.4 | 1.15 | 0.65 | 1.03 | 0.76 |
 
 Well written code should not subcribe to whole collections, so just enabling this options most of the times should not break anything. But if it is still needed, you should subscribe to both collection (it may still change e.g. when clearing state) and to its `_changeKey`.
 

package/dist/cjs/createActions.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, '__esModule', {value: true})
 exports.createActions = void 0
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const createActions = (name) => {
   const actionPrefix = `@${utilsAndConstants_1.PACKAGE_SHORT_NAME}/${name}/`
   const updateQueryStateAndEntitiesType = `${actionPrefix}updateQueryStateAndEntities`

package/dist/cjs/createCache.js

@@ -10,7 +10,6 @@ const query_1 = require('./query')
 const useMutation_1 = require('./useMutation')
 const useQuery_1 = require('./useQuery')
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const withTypenames = () => {
   return {
     createCache: (partialCache) => {
@@ -58,7 +57,7 @@ const withTypenames = () => {
       if (cache.options.deepComparisonEnabled && !utilsAndConstants_1.optionalUtils.deepEqual) {
         ;(0, utilsAndConstants_1.logWarn)(
           'createCache',
-          'optional dependency for fast-deep-equal was not provided, while deepComparisonEnabled option is true'
+          'optional dependency for fast-deep-equal was not provided, while deepComparisonEnabled option is true',
         )
       }
       const setDefaultComparer = (target) => {
@@ -75,7 +74,7 @@ const withTypenames = () => {
       }
       const selectors = Object.assign(
         {selectCacheState: cache.cacheStateSelector},
-        (0, createSelectors_1.createSelectors)(cache)
+        (0, createSelectors_1.createSelectors)(cache),
       )
       const {
         selectCacheState,
@@ -130,7 +129,7 @@ const withTypenames = () => {
               options.mergeResults,
               options.onCompleted,
               options.onSuccess,
-              options.onError
+              options.onError,
             )
           },
           mutate: (options) => {
@@ -145,7 +144,7 @@ const withTypenames = () => {
               abortControllers,
               options.onCompleted,
               options.onSuccess,
-              options.onError
+              options.onError,
             )
           },
         }

package/dist/cjs/createReducer.js

@@ -3,12 +3,18 @@ var __rest =
   (this && this.__rest) ||
   function (s, e) {
     var t = {}
-    for (var p in s) {if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];}
-    if (s != null && typeof Object.getOwnPropertySymbols === 'function')
+    for (var p in s) {
+      if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) {
+        t[p] = s[p]
+      }
+    }
+    if (s != null && typeof Object.getOwnPropertySymbols === 'function') {
       for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]]
+        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) {
+          t[p[i]] = s[p[i]]
+        }
       }
+    }
     return t
   }
 Object.defineProperty(exports, '__esModule', {value: true})
@@ -19,7 +25,7 @@ const optionalMutationKeys = ['error', 'result', 'params', 'loading']
 const createReducer = (actions, queryKeys, cacheOptions) => {
   const mutable = cacheOptions.mutableCollections
   cacheOptions.logsEnabled &&
-    (0, utilsAndConstants_1.logDebug)('createCacheReducer', {
+    (0, utilsAndConstants_1.logDebug)('createReducer', {
       queryKeys,
       mutable,
     })
@@ -43,7 +49,7 @@ const createReducer = (actions, queryKeys, cacheOptions) => {
           queryKeys.reduce((result, x) => {
             result[x] = Object.freeze({})
             return result
-          }, {})
+          }, {}),
         ),
         mutations: Object.freeze({}),
       })
@@ -92,7 +98,7 @@ const createReducer = (actions, queryKeys, cacheOptions) => {
                   oldQueryState !== null && oldQueryState !== void 0
                     ? oldQueryState
                     : utilsAndConstants_1.EMPTY_OBJECT,
-                  newQueryState
+                  newQueryState,
                 )
           ) {
             newQueryState = undefined
@@ -119,7 +125,8 @@ const createReducer = (actions, queryKeys, cacheOptions) => {
                   [queryCacheKey]: newQueryState,
                 }),
               })
-            } else if (oldQueryState !== undefined) {
+            }
+          } else if (oldQueryState !== undefined) {
             newState !== null && newState !== void 0 ? newState : (newState = Object.assign({}, state))
             if (mutable) {
               delete newState.queries[queryKey][queryCacheKey]
@@ -170,7 +177,7 @@ const createReducer = (actions, queryKeys, cacheOptions) => {
                   oldMutationState !== null && oldMutationState !== void 0
                     ? oldMutationState
                     : utilsAndConstants_1.EMPTY_OBJECT,
-                  newMutationState
+                  newMutationState,
                 )
           ) {
             newMutationState = undefined
@@ -193,7 +200,8 @@ const createReducer = (actions, queryKeys, cacheOptions) => {
               newState.mutations = Object.assign(Object.assign({}, state.mutations), {
                 [mutationKey]: newMutationState,
               })
-            } else if (oldMutationState !== undefined) {
+            }
+          } else if (oldMutationState !== undefined) {
             newState !== null && newState !== void 0 ? newState : (newState = Object.assign({}, state))
             if (mutable) {
               delete state.mutations[mutationKey]

package/dist/cjs/createSelectors.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, '__esModule', {value: true})
 exports.createSelectors = void 0
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const createSelectors = (cache) => {
   const selectEntityById = (state, id, typename) => {
     var _a
     return id == null
       ? undefined
       : (_a = cache.cacheStateSelector(state).entities[typename]) === null || _a === void 0
-      ? void 0
-      : _a[id]
+        ? void 0
+        : _a[id]
   }
   const selectQueryState = (state, query, cacheKey) => {
     var _a

package/dist/cjs/index.js

@@ -42,7 +42,6 @@ exports.noop =
   exports.createCache =
     void 0
 var createCache_1 = require('./createCache')
-
 Object.defineProperty(exports, 'createCache', {
   enumerable: true,
   get() {
@@ -57,7 +56,6 @@ Object.defineProperty(exports, 'withTypenames', {
 })
 __exportStar(require('./types'), exports)
 var utilsAndConstants_1 = require('./utilsAndConstants')
-
 Object.defineProperty(exports, 'createStateComparer', {
   enumerable: true,
   get() {

package/dist/cjs/mutate.js

@@ -33,7 +33,6 @@ var __awaiter =
 Object.defineProperty(exports, '__esModule', {value: true})
 exports.mutate = void 0
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const mutate = (
   logTag_1,
   store_1,
@@ -70,7 +69,7 @@ const mutate = (
       abortControllers,
       onCompleted = cache.mutations[mutationKey].onCompleted,
       onSuccess = cache.mutations[mutationKey].onSuccess,
-      onError = cache.mutations[mutationKey].onError
+      onError = cache.mutations[mutationKey].onError,
     ) {
       var _a, _b
       const {updateMutationStateAndEntities} = actions
@@ -99,7 +98,7 @@ const mutate = (
           loading: mutatePromise,
           params,
           result: undefined,
-        })
+        }),
       )
       let response
       let error
@@ -123,7 +122,7 @@ const mutate = (
           updateMutationStateAndEntities(mutationKey, {
             error,
             loading: undefined,
-          })
+          }),
         )
         if (
           !(onError === null || onError === void 0
@@ -155,7 +154,7 @@ const mutate = (
         return {result: response.result}
       }
       throw new Error(`${logTag}: both error and response are not defined`)
-    }
+    },
   )
 exports.mutate = mutate
 const ABORTED_RESULT = Object.freeze({aborted: true})

package/dist/cjs/query.js

@@ -33,7 +33,6 @@ var __awaiter =
 Object.defineProperty(exports, '__esModule', {value: true})
 exports.query = void 0
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const query = (
   logTag,
   store,
@@ -49,7 +48,7 @@ const query = (
   mergeResults,
   onCompleted,
   onSuccess,
-  onError
+  onError,
 ) =>
   __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d
@@ -110,7 +109,7 @@ const query = (
       updateQueryStateAndEntities(queryKey, cacheKey, {
         loading: fetchPromise,
         params,
-      })
+      }),
     )
     logsEnabled &&
       (0, utilsAndConstants_1.logDebug)(`${logTag} started`, {
@@ -128,7 +127,7 @@ const query = (
         updateQueryStateAndEntities(queryKey, cacheKey, {
           error,
           loading: undefined,
-        })
+        }),
       )
       if (!(onError === null || onError === void 0 ? void 0 : onError(error, params, store))) {
         ;(_c = (_b = cache.globals).onError) === null || _c === void 0
@@ -147,8 +146,8 @@ const query = (
         (_d = response.expiresAt) !== null && _d !== void 0
           ? _d
           : secondsToLive != null
-          ? Date.now() + secondsToLive * 1000
-          : undefined,
+            ? Date.now() + secondsToLive * 1000
+            : undefined,
       result: mergeResults
         ? mergeResults(
             selectQueryResult(store.getState(), queryKey, cacheKey),
@@ -156,7 +155,7 @@ const query = (
             params,
             store,
             actions,
-            selectors
+            selectors,
           )
         : response.result,
     }

package/dist/cjs/useMutation.js

@@ -35,7 +35,6 @@ exports.useMutation = void 0
 const react_1 = require('react')
 const mutate_1 = require('./mutate')
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const useMutation = (cache, actions, selectors, options, abortControllers) => {
   var _a
   const {selectMutationState} = selectors
@@ -47,8 +46,19 @@ const useMutation = (cache, actions, selectors, options, abortControllers) => {
       (state) => selectMutationState(state, mutationKey),
       (params) =>
         __awaiter(void 0, void 0, void 0, function* () {
-          return yield (0,
-          mutate_1.mutate)('useMutation.mutate', store, cache, actions, selectors, mutationKey, params, abortControllers, onCompleted, onSuccess, onError)
+          return yield (0, mutate_1.mutate)(
+            'useMutation.mutate',
+            store,
+            cache,
+            actions,
+            selectors,
+            mutationKey,
+            params,
+            abortControllers,
+            onCompleted,
+            onSuccess,
+            onError,
+          )
         }),
       () => {
         var _a

package/dist/cjs/useQuery.js

@@ -35,7 +35,6 @@ exports.useQuery = void 0
 const react_1 = require('react')
 const query_1 = require('./query')
 const utilsAndConstants_1 = require('./utilsAndConstants')
-
 const useQuery = (cache, actions, selectors, options) => {
   var _a, _b, _c, _d, _e
   const {
@@ -66,18 +65,33 @@ const useQuery = (cache, actions, selectors, options) => {
         ? _d
         : defaultStateComparer
       : typeof selectorComparer === 'function'
-      ? selectorComparer
-      : (0, utilsAndConstants_1.createStateComparer)(selectorComparer)
+        ? selectorComparer
+        : (0, utilsAndConstants_1.createStateComparer)(selectorComparer)
   const store = cache.storeHooks.useStore()
   const cacheKey = getCacheKey(params)
   const performFetch = (0, react_1.useCallback)(
     (options) =>
       __awaiter(void 0, void 0, void 0, function* () {
         const paramsPassed = options && 'params' in options
-        return yield (0,
-        query_1.query)('useQuery.fetch', store, cache, actions, selectors, queryKey, paramsPassed ? getCacheKey(options.params) : cacheKey, paramsPassed ? options.params : params, secondsToLive, options === null || options === void 0 ? void 0 : options.onlyIfExpired, false, mergeResults, onCompleted, onSuccess, onError)
+        return yield (0, query_1.query)(
+          'useQuery.fetch',
+          store,
+          cache,
+          actions,
+          selectors,
+          queryKey,
+          paramsPassed ? getCacheKey(options.params) : cacheKey,
+          paramsPassed ? options.params : params,
+          secondsToLive,
+          options === null || options === void 0 ? void 0 : options.onlyIfExpired,
+          false,
+          mergeResults,
+          onCompleted,
+          onSuccess,
+          onError,
+        )
       }),
-    [store, queryKey, cacheKey]
+    [store, queryKey, cacheKey],
   )
   const queryState =
     (_e = cache.storeHooks.useSelector((state) => {

package/dist/cjs/utilsAndConstants.js

@@ -35,7 +35,7 @@ try {
 exports.IS_DEV = (() => {
   try {
     return __DEV__
-  } catch (e) {
+  } catch (_a) {
     return process.env.NODE_ENV === 'development'
   }
 })()
@@ -69,7 +69,7 @@ const applyEntityChanges = (entities, changes, options) => {
   let result
   const objectWithAllTypenames = Object.assign(
     Object.assign(Object.assign({}, changes.merge), changes.remove),
-    changes.replace
+    changes.replace,
   )
   for (const typename in objectWithAllTypenames) {
     const entitiesToMerge = merge === null || merge === void 0 ? void 0 : merge[typename]
@@ -106,7 +106,7 @@ const applyEntityChanges = (entities, changes, options) => {
       if (totalKeysInResponse !== 0 && idsSet.size !== totalKeysInResponse) {
         ;(0, exports.logWarn)(
           'applyEntityChanges',
-          'merge, replace and remove changes have intersections for: ' + typename
+          'merge, replace and remove changes have intersections for: ' + typename,
         )
       }
     }

package/dist/esm/createCache.js

@@ -65,7 +65,7 @@ export const withTypenames = () => {
       if (cache.options.deepComparisonEnabled && !optionalUtils.deepEqual) {
         logWarn(
           'createCache',
-          'optional dependency for fast-deep-equal was not provided, while deepComparisonEnabled option is true'
+          'optional dependency for fast-deep-equal was not provided, while deepComparisonEnabled option is true',
         )
       }
       const setDefaultComparer = (target) => {
@@ -132,7 +132,7 @@ export const withTypenames = () => {
               options.mergeResults,
               options.onCompleted,
               options.onSuccess,
-              options.onError
+              options.onError,
             )
           },
           mutate: (options) => {
@@ -147,7 +147,7 @@ export const withTypenames = () => {
               abortControllers,
               options.onCompleted,
               options.onSuccess,
-              options.onError
+              options.onError,
             )
           },
         }

package/dist/esm/createReducer.js

@@ -2,13 +2,18 @@ var __rest =
   (this && this.__rest) ||
   function (s, e) {
     var t = {}
-    for (var p in s) {if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];}
-    if (s != null && typeof Object.getOwnPropertySymbols === 'function')
-      {for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }}
+    for (var p in s) {
+      if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) {
+        t[p] = s[p]
+      }
+    }
+    if (s != null && typeof Object.getOwnPropertySymbols === 'function') {
+      for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) {
+          t[p[i]] = s[p[i]]
+        }
+      }
+    }
     return t
   }
 import {
@@ -21,10 +26,11 @@ import {
 } from './utilsAndConstants'
 const optionalQueryKeys = ['error', 'expiresAt', 'result', 'params', 'loading']
 const optionalMutationKeys = ['error', 'result', 'params', 'loading']
+
 export const createReducer = (actions, queryKeys, cacheOptions) => {
   const mutable = cacheOptions.mutableCollections
   cacheOptions.logsEnabled &&
-    logDebug('createCacheReducer', {
+    logDebug('createReducer', {
       queryKeys,
       mutable,
     })
@@ -48,7 +54,7 @@ export const createReducer = (actions, queryKeys, cacheOptions) => {
           queryKeys.reduce((result, x) => {
             result[x] = Object.freeze({})
             return result
-          }, {})
+          }, {}),
         ),
         mutations: Object.freeze({}),
       })
@@ -93,7 +99,7 @@ export const createReducer = (actions, queryKeys, cacheOptions) => {
               ? void 0
               : deepEqual(
                   oldQueryState !== null && oldQueryState !== void 0 ? oldQueryState : EMPTY_OBJECT,
-                  newQueryState
+                  newQueryState,
                 )
           ) {
             newQueryState = undefined
@@ -118,7 +124,8 @@ export const createReducer = (actions, queryKeys, cacheOptions) => {
                   [queryCacheKey]: newQueryState,
                 }),
               })
-            } else if (oldQueryState !== undefined) {
+            }
+          } else if (oldQueryState !== undefined) {
             newState !== null && newState !== void 0 ? newState : (newState = Object.assign({}, state))
             if (mutable) {
               delete newState.queries[queryKey][queryCacheKey]
@@ -167,7 +174,7 @@ export const createReducer = (actions, queryKeys, cacheOptions) => {
               ? void 0
               : deepEqual(
                   oldMutationState !== null && oldMutationState !== void 0 ? oldMutationState : EMPTY_OBJECT,
-                  newMutationState
+                  newMutationState,
                 )
           ) {
             newMutationState = undefined
@@ -188,7 +195,8 @@ export const createReducer = (actions, queryKeys, cacheOptions) => {
               newState.mutations = Object.assign(Object.assign({}, state.mutations), {
                 [mutationKey]: newMutationState,
               })
-            } else if (oldMutationState !== undefined) {
+            }
+          } else if (oldMutationState !== undefined) {
             newState !== null && newState !== void 0 ? newState : (newState = Object.assign({}, state))
             if (mutable) {
               delete state.mutations[mutationKey]

package/dist/esm/createSelectors.js

@@ -6,8 +6,8 @@ export const createSelectors = (cache) => {
     return id == null
       ? undefined
       : (_a = cache.cacheStateSelector(state).entities[typename]) === null || _a === void 0
-      ? void 0
-      : _a[id]
+        ? void 0
+        : _a[id]
   }
   const selectQueryState = (state, query, cacheKey) => {
     var _a

package/dist/esm/index.js

@@ -1,5 +1,3 @@
 export {createCache, withTypenames} from './createCache'
-
 export * from './types'
-
 export {createStateComparer, defaultGetCacheKey, FetchPolicy, isEmptyObject, noop} from './utilsAndConstants'

package/dist/esm/mutate.js

@@ -67,7 +67,7 @@ export const mutate = (
       abortControllers,
       onCompleted = cache.mutations[mutationKey].onCompleted,
       onSuccess = cache.mutations[mutationKey].onSuccess,
-      onError = cache.mutations[mutationKey].onError
+      onError = cache.mutations[mutationKey].onError,
     ) {
       var _a, _b
       const {updateMutationStateAndEntities} = actions
@@ -92,7 +92,7 @@ export const mutate = (
           loading: mutatePromise,
           params,
           result: undefined,
-        })
+        }),
       )
       let response
       let error
@@ -112,7 +112,7 @@ export const mutate = (
           updateMutationStateAndEntities(mutationKey, {
             error,
             loading: undefined,
-          })
+          }),
         )
         if (
           !(onError === null || onError === void 0
@@ -144,7 +144,7 @@ export const mutate = (
         return {result: response.result}
       }
       throw new Error(`${logTag}: both error and response are not defined`)
-    }
+    },
   )
 
 const ABORTED_RESULT = Object.freeze({aborted: true})

package/dist/esm/query.js

@@ -46,7 +46,7 @@ export const query = (
   mergeResults,
   onCompleted,
   onSuccess,
-  onError
+  onError,
 ) =>
   __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d
@@ -103,7 +103,7 @@ export const query = (
       updateQueryStateAndEntities(queryKey, cacheKey, {
         loading: fetchPromise,
         params,
-      })
+      }),
     )
     logsEnabled &&
       logDebug(`${logTag} started`, {queryKey, params, cacheKey, queryStateOnStart, onlyIfExpired})
@@ -115,7 +115,7 @@ export const query = (
         updateQueryStateAndEntities(queryKey, cacheKey, {
           error,
           loading: undefined,
-        })
+        }),
       )
       if (!(onError === null || onError === void 0 ? void 0 : onError(error, params, store))) {
         ;(_c = (_b = cache.globals).onError) === null || _c === void 0
@@ -134,8 +134,8 @@ export const query = (
         (_d = response.expiresAt) !== null && _d !== void 0
           ? _d
           : secondsToLive != null
-          ? Date.now() + secondsToLive * 1000
-          : undefined,
+            ? Date.now() + secondsToLive * 1000
+            : undefined,
       result: mergeResults
         ? mergeResults(
             selectQueryResult(store.getState(), queryKey, cacheKey),
@@ -143,7 +143,7 @@ export const query = (
             params,
             store,
             actions,
-            selectors
+            selectors,
           )
         : response.result,
     }

package/dist/esm/useMutation.js

@@ -56,7 +56,7 @@ export const useMutation = (cache, actions, selectors, options, abortControllers
             abortControllers,
             onCompleted,
             onSuccess,
-            onError
+            onError,
           )
         }),
       () => {

package/dist/esm/useQuery.js

@@ -63,8 +63,8 @@ export const useQuery = (cache, actions, selectors, options) => {
         ? _d
         : defaultStateComparer
       : typeof selectorComparer === 'function'
-      ? selectorComparer
-      : createStateComparer(selectorComparer)
+        ? selectorComparer
+        : createStateComparer(selectorComparer)
   const store = cache.storeHooks.useStore()
   const cacheKey = getCacheKey(params)
   const performFetch = useCallback(
@@ -86,10 +86,10 @@ export const useQuery = (cache, actions, selectors, options) => {
           mergeResults,
           onCompleted,
           onSuccess,
-          onError
+          onError,
         )
       }),
-    [store, queryKey, cacheKey]
+    [store, queryKey, cacheKey],
   )
   const queryState =
     (_e = cache.storeHooks.useSelector((state) => {

package/dist/esm/utilsAndConstants.js

@@ -21,7 +21,7 @@ try {
 export const IS_DEV = (() => {
   try {
     return __DEV__
-  } catch (e) {
+  } catch (_a) {
     return process.env.NODE_ENV === 'development'
   }
 })()
@@ -58,7 +58,7 @@ export const applyEntityChanges = (entities, changes, options) => {
   let result
   const objectWithAllTypenames = Object.assign(
     Object.assign(Object.assign({}, changes.merge), changes.remove),
-    changes.replace
+    changes.replace,
   )
   for (const typename in objectWithAllTypenames) {
     const entitiesToMerge = merge === null || merge === void 0 ? void 0 : merge[typename]