react-redux-cache 0.21.0 → 0.22.1

package/dist/esm/useMutation.js

@@ -1,79 +1,40 @@
-var __awaiter =
-  (this && this.__awaiter) ||
-  function (thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function (resolve) {
-            resolve(value)
-          })
-    }
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value))
-        } catch (e) {
-          reject(e)
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator['throw'](value))
-        } catch (e) {
-          reject(e)
-        }
-      }
-      function step(result) {
-        result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected)
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next())
-    })
-  }
-import {useMemo} from 'react'
-
-import {mutate as mutateImpl} from './mutate'
-import {EMPTY_OBJECT, logDebug} from './utilsAndConstants'
-
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useMemo } from 'react';
+import { mutate as mutateImpl } from './mutate';
+import { EMPTY_OBJECT, logDebug } from './utilsAndConstants';
 export const useMutation = (cache, actions, selectors, options, abortControllers) => {
-  var _a
-  const {selectMutationState} = selectors
-  const {updateMutationStateAndEntities} = actions
-  const {mutation: mutationKey, onCompleted, onSuccess, onError} = options
-  const store = cache.storeHooks.useStore()
-  const [mutationStateSelector, mutate, abort] = useMemo(() => {
-    return [
-      (state) => selectMutationState(state, mutationKey),
-      (params) =>
-        __awaiter(void 0, void 0, void 0, function* () {
-          return yield mutateImpl(
-            'useMutation.mutate',
-            store,
-            cache,
-            actions,
-            selectors,
-            mutationKey,
-            params,
-            abortControllers,
-            onCompleted,
-            onSuccess,
-            onError
-          )
-        }),
-      () => {
-        var _a
-        const abortController =
-          (_a = abortControllers.get(store)) === null || _a === void 0 ? void 0 : _a[mutationKey]
-        if (abortController === undefined || abortController.signal.aborted) {
-          return false
-        }
-        abortController.abort()
-        store.dispatch(updateMutationStateAndEntities(mutationKey, {loading: undefined}))
-        return true
-      },
-    ]
-  }, [mutationKey, store])
-  const mutationState =
-    (_a = cache.storeHooks.useSelector(mutationStateSelector)) !== null && _a !== void 0 ? _a : EMPTY_OBJECT
-  cache.options.logsEnabled && logDebug('useMutation', {options, mutationState})
-  return [mutate, mutationState, abort]
-}
+    var _a;
+    const { selectMutationState } = selectors;
+    const { updateMutationStateAndEntities } = actions;
+    const { mutation: mutationKey, onCompleted, onSuccess, onError } = options;
+    const store = cache.storeHooks.useStore();
+    const [mutationStateSelector, mutate, abort] = useMemo(() => {
+        return [
+            (state) => selectMutationState(state, mutationKey),
+            (params) => __awaiter(void 0, void 0, void 0, function* () {
+                return yield mutateImpl('useMutation.mutate', store, cache, actions, selectors, mutationKey, params, abortControllers, onCompleted, onSuccess, onError);
+            }),
+            () => {
+                var _a;
+                const abortController = (_a = abortControllers.get(store)) === null || _a === void 0 ? void 0 : _a[mutationKey];
+                if (abortController === undefined || abortController.signal.aborted) {
+                    return false;
+                }
+                abortController.abort();
+                store.dispatch(updateMutationStateAndEntities(mutationKey, { loading: undefined }));
+                return true;
+            },
+        ];
+    }, [mutationKey, store]);
+    const mutationState = (_a = cache.storeHooks.useSelector(mutationStateSelector)) !== null && _a !== void 0 ? _a : EMPTY_OBJECT;
+    cache.options.logsEnabled && logDebug('useMutation', { options, mutationState });
+    return [mutate, mutationState, abort];
+};

package/dist/esm/useQuery.js

@@ -1,122 +1,55 @@
-var __awaiter =
-  (this && this.__awaiter) ||
-  function (thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function (resolve) {
-            resolve(value)
-          })
-    }
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value))
-        } catch (e) {
-          reject(e)
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useCallback, useEffect } from 'react';
+import { query as queryImpl } from './query';
+import { createStateComparer, defaultGetCacheKey, EMPTY_OBJECT, logDebug } from './utilsAndConstants';
+export const useQuery = (cache, actions, selectors, options) => {
+    var _a, _b, _c, _d, _e;
+    const { query: queryKey, skipFetch = false, params, secondsToLive, selectorComparer, fetchPolicy = (_a = cache.queries[queryKey].fetchPolicy) !== null && _a !== void 0 ? _a : cache.globals.queries.fetchPolicy, mergeResults, onCompleted, onSuccess, onError, } = options;
+    const { selectQueryState } = selectors;
+    const queryInfo = cache.queries[queryKey];
+    const logsEnabled = cache.options.logsEnabled;
+    const getCacheKey = (_b = queryInfo.getCacheKey) !== null && _b !== void 0 ? _b : (defaultGetCacheKey);
+    const comparer = selectorComparer === undefined
+        ? ((_d = (_c = queryInfo.selectorComparer) !== null && _c !== void 0 ? _c : cache.globals.queries.selectorComparer) !== null && _d !== void 0 ? _d : defaultStateComparer)
+        : typeof selectorComparer === 'function'
+            ? selectorComparer
+            : createStateComparer(selectorComparer);
+    const store = cache.storeHooks.useStore();
+    const cacheKey = getCacheKey(params);
+    const performFetch = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
+        const paramsPassed = options && 'params' in options;
+        return yield queryImpl('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]);
+    const queryState = (_e = cache.storeHooks.useSelector((state) => {
+        return selectQueryState(state, queryKey, cacheKey);
+    }, comparer)) !== null && _e !== void 0 ? _e : EMPTY_OBJECT;
+    useEffect(() => {
+        if (skipFetch) {
+            logsEnabled && logDebug('useQuery.useEffect skip fetch', { skipFetch, queryKey, cacheKey });
+            return;
         }
-      }
-      function rejected(value) {
-        try {
-          step(generator['throw'](value))
-        } catch (e) {
-          reject(e)
+        const expired = queryState.expiresAt != null && queryState.expiresAt <= Date.now();
+        if (!fetchPolicy(expired, params, queryState, store, selectors)) {
+            logsEnabled &&
+                logDebug('useQuery.useEffect skip fetch due to fetch policy', {
+                    queryState,
+                    expired,
+                    queryKey,
+                    cacheKey,
+                });
+            return;
         }
-      }
-      function step(result) {
-        result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected)
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next())
-    })
-  }
-import {useCallback, useEffect} from 'react'
-
-import {query as queryImpl} from './query'
-import {createStateComparer, defaultGetCacheKey, EMPTY_OBJECT, logDebug} from './utilsAndConstants'
-
-export const useQuery = (cache, actions, selectors, options) => {
-  var _a, _b, _c, _d, _e
-  const {
-    query: queryKey,
-    skipFetch = false,
-    params,
-    secondsToLive,
-    selectorComparer,
-    fetchPolicy = (_a = cache.queries[queryKey].fetchPolicy) !== null && _a !== void 0
-      ? _a
-      : cache.globals.queries.fetchPolicy,
-    mergeResults,
-    onCompleted,
-    onSuccess,
-    onError,
-  } = options
-  const {selectQueryState} = selectors
-  const queryInfo = cache.queries[queryKey]
-  const logsEnabled = cache.options.logsEnabled
-  const getCacheKey = (_b = queryInfo.getCacheKey) !== null && _b !== void 0 ? _b : defaultGetCacheKey
-  const comparer =
-    selectorComparer === undefined
-      ? (_d =
-          (_c = queryInfo.selectorComparer) !== null && _c !== void 0
-            ? _c
-            : cache.globals.queries.selectorComparer) !== null && _d !== void 0
-        ? _d
-        : defaultStateComparer
-      : typeof selectorComparer === 'function'
-      ? selectorComparer
-      : createStateComparer(selectorComparer)
-  const store = cache.storeHooks.useStore()
-  const cacheKey = getCacheKey(params)
-  const performFetch = useCallback(
-    (options) =>
-      __awaiter(void 0, void 0, void 0, function* () {
-        const paramsPassed = options && 'params' in options
-        return yield queryImpl(
-          '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]
-  )
-  const queryState =
-    (_e = cache.storeHooks.useSelector((state) => {
-      return selectQueryState(state, queryKey, cacheKey)
-    }, comparer)) !== null && _e !== void 0
-      ? _e
-      : EMPTY_OBJECT
-  useEffect(() => {
-    if (skipFetch) {
-      logsEnabled && logDebug('useQuery.useEffect skip fetch', {skipFetch, queryKey, cacheKey})
-      return
-    }
-    const expired = queryState.expiresAt != null && queryState.expiresAt <= Date.now()
-    if (!fetchPolicy(expired, params, queryState, store, selectors)) {
-      logsEnabled &&
-        logDebug('useQuery.useEffect skip fetch due to fetch policy', {
-          queryState,
-          expired,
-          queryKey,
-          cacheKey,
-        })
-      return
-    }
-    performFetch()
-  }, [cacheKey, skipFetch])
-  logsEnabled && logDebug('useQuery', {cacheKey, options, queryState})
-  return [queryState, performFetch]
-}
-
-const defaultStateComparer = createStateComparer(['result', 'loading', 'params', 'error'])
+        performFetch();
+    }, [cacheKey, skipFetch]);
+    logsEnabled && logDebug('useQuery', { cacheKey, options, queryState });
+    return [queryState, performFetch];
+};
+const defaultStateComparer = createStateComparer(['result', 'loading', 'params', 'error']);

package/dist/esm/utilsAndConstants.js

@@ -1,179 +1,157 @@
-export const PACKAGE_SHORT_NAME = 'rrc'
-
+export const PACKAGE_SHORT_NAME = 'rrc';
 export const optionalUtils = {
-  deepEqual: undefined,
-}
-
+    deepEqual: undefined,
+};
 export const logDebug = (tag, data) => {
-  console.debug(`@${PACKAGE_SHORT_NAME} [${tag}]`, data)
-}
-
+    console.debug(`@${PACKAGE_SHORT_NAME} [${tag}]`, data);
+};
 export const logWarn = (tag, data) => {
-  console.warn(`@${PACKAGE_SHORT_NAME} [${tag}]`, data)
-}
-
+    console.warn(`@${PACKAGE_SHORT_NAME} [${tag}]`, data);
+};
 try {
-  optionalUtils.deepEqual = require('fast-deep-equal/es6')
-} catch (_a) {
-  logDebug('deepEqual', 'fast-deep-equal optional dependency was not installed')
+    optionalUtils.deepEqual = require('fast-deep-equal/es6');
+}
+catch (_a) {
+    logDebug('deepEqual', 'fast-deep-equal optional dependency was not installed');
 }
-
 export const IS_DEV = (() => {
-  try {
-    return __DEV__
-  } catch (e) {
-    return process.env.NODE_ENV === 'development'
-  }
-})()
-
-export const EMPTY_OBJECT = Object.freeze({})
-
-export const EMPTY_ARRAY = Object.freeze([])
-
-export const noop = () => {}
-
+    try {
+        return __DEV__;
+    }
+    catch (_a) {
+        return process.env.NODE_ENV === 'development';
+    }
+})();
+export const EMPTY_OBJECT = Object.freeze({});
+export const EMPTY_ARRAY = Object.freeze([]);
+export const noop = () => { };
 export const defaultGetCacheKey = (params) => {
-  switch (typeof params) {
-    case 'string':
-    case 'symbol':
-      return params
-    case 'object':
-      return JSON.stringify(params)
-    default:
-      return String(params)
-  }
-}
-
+    switch (typeof params) {
+        case 'string':
+        case 'symbol':
+            return params;
+        case 'object':
+            return JSON.stringify(params);
+        default:
+            return String(params);
+    }
+};
 export const applyEntityChanges = (entities, changes, options) => {
-  var _a, _b, _c, _d
-  if (changes.merge && changes.entities) {
-    logWarn('applyEntityChanges', 'merge and entities should not be both set')
-  }
-  const {merge = changes.entities, replace, remove} = changes
-  if (!merge && !replace && !remove) {
-    return undefined
-  }
-  const deepEqual = options.deepComparisonEnabled ? optionalUtils.deepEqual : undefined
-  let result
-  const objectWithAllTypenames = Object.assign(
-    Object.assign(Object.assign({}, changes.merge), changes.remove),
-    changes.replace
-  )
-  for (const typename in objectWithAllTypenames) {
-    const entitiesToMerge = merge === null || merge === void 0 ? void 0 : merge[typename]
-    const entitiesToReplace = replace === null || replace === void 0 ? void 0 : replace[typename]
-    const entitiesToRemove = remove === null || remove === void 0 ? void 0 : remove[typename]
-    if (
-      !entitiesToMerge &&
-      !entitiesToReplace &&
-      !(entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.length)
-    ) {
-      continue
+    var _a, _b, _c;
+    if (changes.merge && changes.entities) {
+        logWarn('applyEntityChanges', 'merge and entities should not be both set');
     }
-    if (options.additionalValidation) {
-      const mergeIds = entitiesToMerge && Object.keys(entitiesToMerge)
-      const replaceIds = entitiesToReplace && Object.keys(entitiesToReplace)
-      const idsSet = new Set(mergeIds)
-      replaceIds === null || replaceIds === void 0 ? void 0 : replaceIds.forEach((id) => idsSet.add(id))
-      entitiesToRemove === null || entitiesToRemove === void 0
-        ? void 0
-        : entitiesToRemove.forEach((id) => idsSet.add(String(id)))
-      const totalKeysInResponse =
-        ((_a = mergeIds === null || mergeIds === void 0 ? void 0 : mergeIds.length) !== null && _a !== void 0
-          ? _a
-          : 0) +
-        ((_b = replaceIds === null || replaceIds === void 0 ? void 0 : replaceIds.length) !== null &&
-        _b !== void 0
-          ? _b
-          : 0) +
-        ((_c =
-          entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.length) !==
-          null && _c !== void 0
-          ? _c
-          : 0)
-      if (totalKeysInResponse !== 0 && idsSet.size !== totalKeysInResponse) {
-        logWarn('applyEntityChanges', 'merge, replace and remove changes have intersections for: ' + typename)
-      }
+    const { merge = changes.entities, replace, remove } = changes;
+    if (!merge && !replace && !remove) {
+        return undefined;
     }
-    const oldEntities = (_d = entities[typename]) !== null && _d !== void 0 ? _d : EMPTY_OBJECT
-    let newEntities
-    entitiesToRemove === null || entitiesToRemove === void 0
-      ? void 0
-      : entitiesToRemove.forEach((id) => {
-          if (oldEntities[id]) {
-            newEntities !== null && newEntities !== void 0
-              ? newEntities
-              : (newEntities = Object.assign({}, oldEntities))
-            delete newEntities[id]
-          }
-        })
-    if (entitiesToReplace) {
-      for (const id in entitiesToReplace) {
-        const newEntity = entitiesToReplace[id]
-        if (!(deepEqual === null || deepEqual === void 0 ? void 0 : deepEqual(oldEntities[id], newEntity))) {
-          newEntities !== null && newEntities !== void 0
-            ? newEntities
-            : (newEntities = Object.assign({}, oldEntities))
-          newEntities[id] = newEntity
+    const mutable = options.mutableCollections;
+    const deepEqual = options.deepComparisonEnabled ? optionalUtils.deepEqual : undefined;
+    let result;
+    const objectWithAllTypenames = Object.assign(Object.assign(Object.assign({}, changes.merge), changes.remove), changes.replace);
+    for (const typename in objectWithAllTypenames) {
+        const entitiesToMerge = merge === null || merge === void 0 ? void 0 : merge[typename];
+        const entitiesToReplace = replace === null || replace === void 0 ? void 0 : replace[typename];
+        const entitiesToRemove = remove === null || remove === void 0 ? void 0 : remove[typename];
+        if (!entitiesToMerge && !entitiesToReplace && !(entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.length)) {
+            continue;
         }
-      }
-    }
-    if (entitiesToMerge) {
-      for (const id in entitiesToMerge) {
-        const oldEntity = oldEntities[id]
-        const newEntity = Object.assign(Object.assign({}, oldEntity), entitiesToMerge[id])
-        if (!(deepEqual === null || deepEqual === void 0 ? void 0 : deepEqual(oldEntity, newEntity))) {
-          newEntities !== null && newEntities !== void 0
-            ? newEntities
-            : (newEntities = Object.assign({}, oldEntities))
-          newEntities[id] = newEntity
+        if (options.additionalValidation) {
+            const mergeIds = entitiesToMerge && Object.keys(entitiesToMerge);
+            const replaceIds = entitiesToReplace && Object.keys(entitiesToReplace);
+            const idsSet = new Set(mergeIds);
+            replaceIds === null || replaceIds === void 0 ? void 0 : replaceIds.forEach((id) => idsSet.add(id));
+            entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.forEach((id) => idsSet.add(String(id)));
+            const totalKeysInResponse = ((_a = mergeIds === null || mergeIds === void 0 ? void 0 : mergeIds.length) !== null && _a !== void 0 ? _a : 0) + ((_b = replaceIds === null || replaceIds === void 0 ? void 0 : replaceIds.length) !== null && _b !== void 0 ? _b : 0) + ((_c = entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.length) !== null && _c !== void 0 ? _c : 0);
+            if (totalKeysInResponse !== 0 && idsSet.size !== totalKeysInResponse) {
+                logWarn('applyEntityChanges', 'merge, replace and remove changes have intersections for: ' + typename);
+            }
+        }
+        const oldEntities = entities[typename];
+        let newEntities;
+        entitiesToRemove === null || entitiesToRemove === void 0 ? void 0 : entitiesToRemove.forEach((id) => {
+            if (oldEntities === null || oldEntities === void 0 ? void 0 : oldEntities[id]) {
+                newEntities !== null && newEntities !== void 0 ? newEntities : (newEntities = mutable ? oldEntities : Object.assign({}, oldEntities));
+                delete newEntities[id];
+            }
+        });
+        if (entitiesToReplace) {
+            for (const id in entitiesToReplace) {
+                const newEntity = entitiesToReplace[id];
+                if (oldEntities === undefined || !(deepEqual === null || deepEqual === void 0 ? void 0 : deepEqual(oldEntities[id], newEntity))) {
+                    newEntities !== null && newEntities !== void 0 ? newEntities : (newEntities = mutable ? (oldEntities !== null && oldEntities !== void 0 ? oldEntities : {}) : Object.assign({}, oldEntities));
+                    newEntities[id] = newEntity;
+                }
+            }
+        }
+        if (entitiesToMerge) {
+            for (const id in entitiesToMerge) {
+                const oldEntity = oldEntities === null || oldEntities === void 0 ? void 0 : oldEntities[id];
+                const newEntity = Object.assign(Object.assign({}, oldEntity), entitiesToMerge[id]);
+                if (!(deepEqual === null || deepEqual === void 0 ? void 0 : deepEqual(oldEntity, newEntity))) {
+                    newEntities !== null && newEntities !== void 0 ? newEntities : (newEntities = mutable ? (oldEntities !== null && oldEntities !== void 0 ? oldEntities : {}) : Object.assign({}, oldEntities));
+                    newEntities[id] = newEntity;
+                }
+            }
+        }
+        if (!newEntities) {
+            continue;
         }
-      }
+        if (mutable) {
+            incrementChangeKey(newEntities);
+            if (result === undefined) {
+                incrementChangeKey(entities);
+                result = entities;
+            }
+        }
+        else {
+            result !== null && result !== void 0 ? result : (result = Object.assign({}, entities));
+        }
+        result[typename] = newEntities;
     }
-    if (!newEntities) {
-      continue
+    options.logsEnabled &&
+        logDebug('applyEntityChanges', {
+            entities,
+            changes,
+            options,
+            result,
+        });
+    return result;
+};
+export const isEmptyObject = (obj) => {
+    for (const _ in obj) {
+        return false;
     }
-    result !== null && result !== void 0 ? result : (result = Object.assign({}, entities))
-    result[typename] = newEntities
-  }
-  options.logsEnabled &&
-    logDebug('applyEntityChanges', {
-      entities,
-      changes,
-      options,
-      result,
-    })
-  return result
-}
-
-export const isEmptyObject = (o) => {
-  for (const _ in o) {
-    return false
-  }
-  return true
-}
-
+    return true;
+};
 export const createStateComparer = (fields) => {
-  return (x, y) => {
-    if (x === y) {
-      return true
-    }
-    if (x === undefined || y === undefined) {
-      return false
+    return (x, y) => {
+        if (x === y) {
+            return true;
+        }
+        if (x === undefined || y === undefined) {
+            return false;
+        }
+        for (let i = 0; i < fields.length; i += 1) {
+            const key = fields[i];
+            if (x[key] !== y[key]) {
+                return false;
+            }
+        }
+        return true;
+    };
+};
+export const FetchPolicy = {
+    NoCacheOrExpired: (expired, _params, state) => {
+        return expired || state.result === undefined;
+    },
+    Always: () => true,
+};
+export const incrementChangeKey = (mutable) => {
+    if (mutable._changeKey === undefined) {
+        mutable._changeKey = 0;
     }
-    for (let i = 0; i < fields.length; i += 1) {
-      const key = fields[i]
-      if (x[key] !== y[key]) {
-        return false
-      }
+    else {
+        mutable._changeKey += 1;
     }
-    return true
-  }
-}
-
-export const FetchPolicy = {
-  NoCacheOrExpired: (expired, _params, state) => {
-    return expired || state.result === undefined
-  },
-  Always: () => true,
-}
+};