react-redux-cache 0.22.1 → 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

@@ -1,64 +1,64 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createActions = void 0;
-const utilsAndConstants_1 = require("./utilsAndConstants");
+'use strict'
+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`;
-    const updateQueryStateAndEntities = (queryKey, queryCacheKey, state, entityChanges) => ({
-        type: updateQueryStateAndEntitiesType,
-        queryKey,
-        queryCacheKey,
-        state,
-        entityChanges,
-    });
-    updateQueryStateAndEntities.type = updateQueryStateAndEntitiesType;
-    const updateMutationStateAndEntitiesType = `${actionPrefix}updateMutationStateAndEntities`;
-    const updateMutationStateAndEntities = (mutationKey, state, entityChanges) => ({
-        type: updateMutationStateAndEntitiesType,
-        mutationKey,
-        state,
-        entityChanges,
-    });
-    updateMutationStateAndEntities.type = updateMutationStateAndEntitiesType;
-    const mergeEntityChangesType = `${actionPrefix}mergeEntityChanges`;
-    const mergeEntityChanges = (changes) => ({
-        type: mergeEntityChangesType,
-        changes,
-    });
-    mergeEntityChanges.type = mergeEntityChangesType;
-    const invalidateQueryType = `${actionPrefix}invalidateQuery`;
-    const invalidateQuery = (queries) => ({
-        type: invalidateQueryType,
-        queries,
-    });
-    invalidateQuery.type = invalidateQueryType;
-    const clearQueryStateType = `${actionPrefix}clearQueryState`;
-    const clearQueryState = (queries) => ({
-        type: clearQueryStateType,
-        queries,
-    });
-    clearQueryState.type = clearQueryStateType;
-    const clearMutationStateType = `${actionPrefix}clearMutationState`;
-    const clearMutationState = (mutationKeys) => ({
-        type: clearMutationStateType,
-        mutationKeys,
-    });
-    clearMutationState.type = clearMutationStateType;
-    const clearCacheType = `${actionPrefix}clearCache`;
-    const clearCache = (stateToKeep) => ({
-        type: clearCacheType,
-        stateToKeep,
-    });
-    clearCache.type = clearCacheType;
-    return {
-        updateQueryStateAndEntities,
-        updateMutationStateAndEntities,
-        mergeEntityChanges,
-        invalidateQuery,
-        clearQueryState,
-        clearMutationState,
-        clearCache,
-    };
-};
-exports.createActions = createActions;
+  const actionPrefix = `@${utilsAndConstants_1.PACKAGE_SHORT_NAME}/${name}/`
+  const updateQueryStateAndEntitiesType = `${actionPrefix}updateQueryStateAndEntities`
+  const updateQueryStateAndEntities = (queryKey, queryCacheKey, state, entityChanges) => ({
+    type: updateQueryStateAndEntitiesType,
+    queryKey,
+    queryCacheKey,
+    state,
+    entityChanges,
+  })
+  updateQueryStateAndEntities.type = updateQueryStateAndEntitiesType
+  const updateMutationStateAndEntitiesType = `${actionPrefix}updateMutationStateAndEntities`
+  const updateMutationStateAndEntities = (mutationKey, state, entityChanges) => ({
+    type: updateMutationStateAndEntitiesType,
+    mutationKey,
+    state,
+    entityChanges,
+  })
+  updateMutationStateAndEntities.type = updateMutationStateAndEntitiesType
+  const mergeEntityChangesType = `${actionPrefix}mergeEntityChanges`
+  const mergeEntityChanges = (changes) => ({
+    type: mergeEntityChangesType,
+    changes,
+  })
+  mergeEntityChanges.type = mergeEntityChangesType
+  const invalidateQueryType = `${actionPrefix}invalidateQuery`
+  const invalidateQuery = (queries) => ({
+    type: invalidateQueryType,
+    queries,
+  })
+  invalidateQuery.type = invalidateQueryType
+  const clearQueryStateType = `${actionPrefix}clearQueryState`
+  const clearQueryState = (queries) => ({
+    type: clearQueryStateType,
+    queries,
+  })
+  clearQueryState.type = clearQueryStateType
+  const clearMutationStateType = `${actionPrefix}clearMutationState`
+  const clearMutationState = (mutationKeys) => ({
+    type: clearMutationStateType,
+    mutationKeys,
+  })
+  clearMutationState.type = clearMutationStateType
+  const clearCacheType = `${actionPrefix}clearCache`
+  const clearCache = (stateToKeep) => ({
+    type: clearCacheType,
+    stateToKeep,
+  })
+  clearCache.type = clearCacheType
+  return {
+    updateQueryStateAndEntities,
+    updateMutationStateAndEntities,
+    mergeEntityChanges,
+    invalidateQuery,
+    clearQueryState,
+    clearMutationState,
+    clearCache,
+  }
+}
+exports.createActions = createActions

package/dist/cjs/createCache.js

@@ -1,134 +1,219 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCache = exports.withTypenames = void 0;
-const react_1 = require("react");
-const createActions_1 = require("./createActions");
-const createReducer_1 = require("./createReducer");
-const createSelectors_1 = require("./createSelectors");
-const mutate_1 = require("./mutate");
-const query_1 = require("./query");
-const useMutation_1 = require("./useMutation");
-const useQuery_1 = require("./useQuery");
-const utilsAndConstants_1 = require("./utilsAndConstants");
+'use strict'
+Object.defineProperty(exports, '__esModule', {value: true})
+exports.createCache = exports.withTypenames = void 0
+const react_1 = require('react')
+const createActions_1 = require('./createActions')
+const createReducer_1 = require('./createReducer')
+const createSelectors_1 = require('./createSelectors')
+const mutate_1 = require('./mutate')
+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) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-            var _p, _q, _r, _s, _t, _u, _v;
-            const abortControllers = new WeakMap();
-            (_a = partialCache.options) !== null && _a !== void 0 ? _a : (partialCache.options = {});
-            (_b = (_p = partialCache.options).mutableCollections) !== null && _b !== void 0 ? _b : (_p.mutableCollections = false);
-            (_c = (_q = partialCache.options).logsEnabled) !== null && _c !== void 0 ? _c : (_q.logsEnabled = false);
-            (_d = (_r = partialCache.options).additionalValidation) !== null && _d !== void 0 ? _d : (_r.additionalValidation = utilsAndConstants_1.IS_DEV);
-            (_e = (_s = partialCache.options).deepComparisonEnabled) !== null && _e !== void 0 ? _e : (_s.deepComparisonEnabled = true);
-            (_f = partialCache.globals) !== null && _f !== void 0 ? _f : (partialCache.globals = {});
-            (_g = (_t = partialCache.globals).queries) !== null && _g !== void 0 ? _g : (_t.queries = {});
-            (_h = (_u = partialCache.globals.queries).fetchPolicy) !== null && _h !== void 0 ? _h : (_u.fetchPolicy = utilsAndConstants_1.FetchPolicy.NoCacheOrExpired);
-            (_j = (_v = partialCache.globals.queries).skipFetch) !== null && _j !== void 0 ? _j : (_v.skipFetch = false);
-            (_k = partialCache.cacheStateSelector) !== null && _k !== void 0 ? _k : (partialCache.cacheStateSelector = (state) => state[cache.name]);
-            (_l = partialCache.mutations) !== null && _l !== void 0 ? _l : (partialCache.mutations = {});
-            (_m = partialCache.queries) !== null && _m !== void 0 ? _m : (partialCache.queries = {});
-            partialCache.abortControllers = abortControllers;
-            try {
-                (_o = partialCache.storeHooks) !== null && _o !== void 0 ? _o : (partialCache.storeHooks = {
-                    useStore: require('react-redux').useStore,
-                    useSelector: require('react-redux').useSelector,
-                });
-            }
-            catch (e) {
-                throw e;
-            }
-            const cache = partialCache;
-            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');
-            }
-            const setDefaultComparer = (target) => {
-                if ((target === null || target === void 0 ? void 0 : target.selectorComparer) != null && typeof target.selectorComparer === 'object') {
-                    target.selectorComparer = (0, utilsAndConstants_1.createStateComparer)(target.selectorComparer);
-                }
-            };
-            setDefaultComparer(cache.globals.queries);
-            for (const queryKey in partialCache.queries) {
-                setDefaultComparer(partialCache.queries[queryKey]);
+  return {
+    createCache: (partialCache) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o
+      var _p, _q, _r, _s, _t, _u, _v
+      const abortControllers = new WeakMap()
+      ;(_a = partialCache.options) !== null && _a !== void 0 ? _a : (partialCache.options = {})
+      ;(_b = (_p = partialCache.options).mutableCollections) !== null && _b !== void 0
+        ? _b
+        : (_p.mutableCollections = false)
+      ;(_c = (_q = partialCache.options).logsEnabled) !== null && _c !== void 0
+        ? _c
+        : (_q.logsEnabled = false)
+      ;(_d = (_r = partialCache.options).additionalValidation) !== null && _d !== void 0
+        ? _d
+        : (_r.additionalValidation = utilsAndConstants_1.IS_DEV)
+      ;(_e = (_s = partialCache.options).deepComparisonEnabled) !== null && _e !== void 0
+        ? _e
+        : (_s.deepComparisonEnabled = true)
+      ;(_f = partialCache.globals) !== null && _f !== void 0 ? _f : (partialCache.globals = {})
+      ;(_g = (_t = partialCache.globals).queries) !== null && _g !== void 0 ? _g : (_t.queries = {})
+      ;(_h = (_u = partialCache.globals.queries).fetchPolicy) !== null && _h !== void 0
+        ? _h
+        : (_u.fetchPolicy = utilsAndConstants_1.FetchPolicy.NoCacheOrExpired)
+      ;(_j = (_v = partialCache.globals.queries).skipFetch) !== null && _j !== void 0
+        ? _j
+        : (_v.skipFetch = false)
+      ;(_k = partialCache.cacheStateSelector) !== null && _k !== void 0
+        ? _k
+        : (partialCache.cacheStateSelector = (state) => state[cache.name])
+      ;(_l = partialCache.mutations) !== null && _l !== void 0 ? _l : (partialCache.mutations = {})
+      ;(_m = partialCache.queries) !== null && _m !== void 0 ? _m : (partialCache.queries = {})
+      partialCache.abortControllers = abortControllers
+      try {
+        ;(_o = partialCache.storeHooks) !== null && _o !== void 0
+          ? _o
+          : (partialCache.storeHooks = {
+              useStore: require('react-redux').useStore,
+              useSelector: require('react-redux').useSelector,
+            })
+      } catch (e) {
+        throw e
+      }
+      const cache = partialCache
+      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',
+        )
+      }
+      const setDefaultComparer = (target) => {
+        if (
+          (target === null || target === void 0 ? void 0 : target.selectorComparer) != null &&
+          typeof target.selectorComparer === 'object'
+        ) {
+          target.selectorComparer = (0, utilsAndConstants_1.createStateComparer)(target.selectorComparer)
+        }
+      }
+      setDefaultComparer(cache.globals.queries)
+      for (const queryKey in partialCache.queries) {
+        setDefaultComparer(partialCache.queries[queryKey])
+      }
+      const selectors = Object.assign(
+        {selectCacheState: cache.cacheStateSelector},
+        (0, createSelectors_1.createSelectors)(cache),
+      )
+      const {
+        selectCacheState,
+        selectQueryState,
+        selectQueryResult,
+        selectQueryLoading,
+        selectQueryError,
+        selectQueryParams,
+        selectQueryExpiresAt,
+        selectMutationState,
+        selectMutationResult,
+        selectMutationLoading,
+        selectMutationError,
+        selectMutationParams,
+        selectEntityById,
+        selectEntities,
+        selectEntitiesByTypename,
+      } = selectors
+      const actions = (0, createActions_1.createActions)(cache.name)
+      const {
+        updateQueryStateAndEntities,
+        updateMutationStateAndEntities,
+        mergeEntityChanges,
+        invalidateQuery,
+        clearQueryState,
+        clearMutationState,
+        clearCache,
+      } = actions
+      const reducer = (0, createReducer_1.createReducer)(actions, Object.keys(cache.queries), cache.options)
+      const createClient = (store) => {
+        const client = {
+          query: (options) => {
+            var _a
+            const {query: queryKey, params} = options
+            const getCacheKey =
+              (_a = cache.queries[queryKey].getCacheKey) !== null && _a !== void 0
+                ? _a
+                : utilsAndConstants_1.defaultGetCacheKey
+            const cacheKey = getCacheKey(params)
+            return (0, query_1.query)(
+              'query',
+              store,
+              cache,
+              actions,
+              selectors,
+              queryKey,
+              cacheKey,
+              params,
+              options.secondsToLive,
+              options.onlyIfExpired,
+              options.skipFetch,
+              options.mergeResults,
+              options.onCompleted,
+              options.onSuccess,
+              options.onError,
+            )
+          },
+          mutate: (options) => {
+            return (0, mutate_1.mutate)(
+              'mutate',
+              store,
+              cache,
+              actions,
+              selectors,
+              options.mutation,
+              options.params,
+              abortControllers,
+              options.onCompleted,
+              options.onSuccess,
+              options.onError,
+            )
+          },
+        }
+        return client
+      }
+      return {
+        cache,
+        reducer,
+        actions: {
+          updateQueryStateAndEntities,
+          updateMutationStateAndEntities,
+          mergeEntityChanges,
+          invalidateQuery,
+          clearQueryState,
+          clearMutationState,
+          clearCache,
+        },
+        selectors: {
+          selectCacheState,
+          selectQueryState,
+          selectQueryResult,
+          selectQueryLoading,
+          selectQueryError,
+          selectQueryParams,
+          selectQueryExpiresAt,
+          selectMutationState,
+          selectMutationResult,
+          selectMutationLoading,
+          selectMutationError,
+          selectMutationParams,
+          selectEntityById,
+          selectEntities,
+          selectEntitiesByTypename,
+        },
+        hooks: {
+          useClient: () => {
+            const store = cache.storeHooks.useStore()
+            return (0, react_1.useMemo)(() => createClient(store), [store])
+          },
+          useQuery: (options) => (0, useQuery_1.useQuery)(cache, actions, selectors, options),
+          useMutation: (options) =>
+            (0, useMutation_1.useMutation)(cache, actions, selectors, options, abortControllers),
+          useSelectEntityById: (id, typename) => {
+            return cache.storeHooks.useSelector((state) => selectEntityById(state, id, typename))
+          },
+          useEntitiesByTypename: (typename) => {
+            if (cache.options.mutableCollections) {
+              cache.storeHooks.useSelector((state) => {
+                var _a
+                return (_a = selectEntitiesByTypename(state, typename)) === null || _a === void 0
+                  ? void 0
+                  : _a._changeKey
+              })
             }
-            const selectors = Object.assign({ selectCacheState: cache.cacheStateSelector }, (0, createSelectors_1.createSelectors)(cache));
-            const { selectCacheState, selectQueryState, selectQueryResult, selectQueryLoading, selectQueryError, selectQueryParams, selectQueryExpiresAt, selectMutationState, selectMutationResult, selectMutationLoading, selectMutationError, selectMutationParams, selectEntityById, selectEntities, selectEntitiesByTypename, } = selectors;
-            const actions = (0, createActions_1.createActions)(cache.name);
-            const { updateQueryStateAndEntities, updateMutationStateAndEntities, mergeEntityChanges, invalidateQuery, clearQueryState, clearMutationState, clearCache, } = actions;
-            const reducer = (0, createReducer_1.createReducer)(actions, Object.keys(cache.queries), cache.options);
-            const createClient = (store) => {
-                const client = {
-                    query: (options) => {
-                        var _a;
-                        const { query: queryKey, params } = options;
-                        const getCacheKey = (_a = cache.queries[queryKey].getCacheKey) !== null && _a !== void 0 ? _a : (utilsAndConstants_1.defaultGetCacheKey);
-                        const cacheKey = getCacheKey(params);
-                        return (0, query_1.query)('query', store, cache, actions, selectors, queryKey, cacheKey, params, options.secondsToLive, options.onlyIfExpired, options.skipFetch, options.mergeResults, options.onCompleted, options.onSuccess, options.onError);
-                    },
-                    mutate: (options) => {
-                        return (0, mutate_1.mutate)('mutate', store, cache, actions, selectors, options.mutation, options.params, abortControllers, options.onCompleted, options.onSuccess, options.onError);
-                    },
-                };
-                return client;
-            };
-            return {
-                cache,
-                reducer,
-                actions: {
-                    updateQueryStateAndEntities,
-                    updateMutationStateAndEntities,
-                    mergeEntityChanges,
-                    invalidateQuery,
-                    clearQueryState,
-                    clearMutationState,
-                    clearCache,
-                },
-                selectors: {
-                    selectCacheState,
-                    selectQueryState,
-                    selectQueryResult,
-                    selectQueryLoading,
-                    selectQueryError,
-                    selectQueryParams,
-                    selectQueryExpiresAt,
-                    selectMutationState,
-                    selectMutationResult,
-                    selectMutationLoading,
-                    selectMutationError,
-                    selectMutationParams,
-                    selectEntityById,
-                    selectEntities,
-                    selectEntitiesByTypename,
-                },
-                hooks: {
-                    useClient: () => {
-                        const store = cache.storeHooks.useStore();
-                        return (0, react_1.useMemo)(() => createClient(store), [store]);
-                    },
-                    useQuery: (options) => (0, useQuery_1.useQuery)(cache, actions, selectors, options),
-                    useMutation: (options) => (0, useMutation_1.useMutation)(cache, actions, selectors, options, abortControllers),
-                    useSelectEntityById: (id, typename) => {
-                        return cache.storeHooks.useSelector((state) => selectEntityById(state, id, typename));
-                    },
-                    useEntitiesByTypename: (typename) => {
-                        if (cache.options.mutableCollections) {
-                            cache.storeHooks.useSelector((state) => { var _a; return (_a = selectEntitiesByTypename(state, typename)) === null || _a === void 0 ? void 0 : _a._changeKey; });
-                        }
-                        return cache.storeHooks.useSelector((state) => selectEntitiesByTypename(state, typename));
-                    },
-                },
-                utils: {
-                    createClient,
-                    getInitialState: () => {
-                        return reducer(undefined, utilsAndConstants_1.EMPTY_OBJECT);
-                    },
-                    applyEntityChanges: (entities, changes) => {
-                        return (0, utilsAndConstants_1.applyEntityChanges)(entities, changes, cache.options);
-                    },
-                },
-            };
+            return cache.storeHooks.useSelector((state) => selectEntitiesByTypename(state, typename))
+          },
+        },
+        utils: {
+          createClient,
+          getInitialState: () => {
+            return reducer(undefined, utilsAndConstants_1.EMPTY_OBJECT)
+          },
+          applyEntityChanges: (entities, changes) => {
+            return (0, utilsAndConstants_1.applyEntityChanges)(entities, changes, cache.options)
+          },
         },
-    };
-};
-exports.withTypenames = withTypenames;
-exports.createCache = (0, exports.withTypenames)().createCache;
+      }
+    },
+  }
+}
+exports.withTypenames = withTypenames
+exports.createCache = (0, exports.withTypenames)().createCache