react-redux-cache 0.22.1 → 0.22.2

package/dist/esm/createSelectors.js

@@ -1,55 +1,64 @@
-import { EMPTY_OBJECT } from './utilsAndConstants';
+import {EMPTY_OBJECT} from './utilsAndConstants'
+
 export 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];
-    };
-    const selectQueryState = (state, query, cacheKey) => {
-        var _a;
-        return (_a = cache.cacheStateSelector(state).queries[query][cacheKey]) !== null && _a !== void 0 ? _a : EMPTY_OBJECT;
-    };
-    const selectMutationState = (state, mutation) => {
-        var _a;
-        return (_a = cache.cacheStateSelector(state).mutations[mutation]) !== null && _a !== void 0 ? _a : EMPTY_OBJECT;
-    };
-    return {
-        selectEntityById,
-        selectQueryState,
-        selectQueryResult: (state, query, cacheKey) => {
-            return selectQueryState(state, query, cacheKey).result;
-        },
-        selectQueryLoading: (state, query, cacheKey) => {
-            var _a;
-            return (_a = selectQueryState(state, query, cacheKey).loading) !== null && _a !== void 0 ? _a : false;
-        },
-        selectQueryError: (state, query, cacheKey) => {
-            return selectQueryState(state, query, cacheKey).error;
-        },
-        selectQueryParams: (state, query, cacheKey) => {
-            return selectQueryState(state, query, cacheKey).params;
-        },
-        selectQueryExpiresAt: (state, query, cacheKey) => {
-            return selectQueryState(state, query, cacheKey).expiresAt;
-        },
-        selectMutationState,
-        selectMutationResult: (state, mutation) => {
-            return selectMutationState(state, mutation).result;
-        },
-        selectMutationLoading: (state, mutation) => {
-            var _a;
-            return (_a = selectMutationState(state, mutation).loading) !== null && _a !== void 0 ? _a : false;
-        },
-        selectMutationError: (state, mutation) => {
-            return selectMutationState(state, mutation).error;
-        },
-        selectMutationParams: (state, mutation) => {
-            return selectMutationState(state, mutation).params;
-        },
-        selectEntities: (state) => {
-            return cache.cacheStateSelector(state).entities;
-        },
-        selectEntitiesByTypename: (state, typename) => {
-            return cache.cacheStateSelector(state).entities[typename];
-        },
-    };
-};
+  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]
+  }
+  const selectQueryState = (state, query, cacheKey) => {
+    var _a
+    return (_a = cache.cacheStateSelector(state).queries[query][cacheKey]) !== null && _a !== void 0
+      ? _a
+      : EMPTY_OBJECT
+  }
+  const selectMutationState = (state, mutation) => {
+    var _a
+    return (_a = cache.cacheStateSelector(state).mutations[mutation]) !== null && _a !== void 0
+      ? _a
+      : EMPTY_OBJECT
+  }
+  return {
+    selectEntityById,
+    selectQueryState,
+    selectQueryResult: (state, query, cacheKey) => {
+      return selectQueryState(state, query, cacheKey).result
+    },
+    selectQueryLoading: (state, query, cacheKey) => {
+      var _a
+      return (_a = selectQueryState(state, query, cacheKey).loading) !== null && _a !== void 0 ? _a : false
+    },
+    selectQueryError: (state, query, cacheKey) => {
+      return selectQueryState(state, query, cacheKey).error
+    },
+    selectQueryParams: (state, query, cacheKey) => {
+      return selectQueryState(state, query, cacheKey).params
+    },
+    selectQueryExpiresAt: (state, query, cacheKey) => {
+      return selectQueryState(state, query, cacheKey).expiresAt
+    },
+    selectMutationState,
+    selectMutationResult: (state, mutation) => {
+      return selectMutationState(state, mutation).result
+    },
+    selectMutationLoading: (state, mutation) => {
+      var _a
+      return (_a = selectMutationState(state, mutation).loading) !== null && _a !== void 0 ? _a : false
+    },
+    selectMutationError: (state, mutation) => {
+      return selectMutationState(state, mutation).error
+    },
+    selectMutationParams: (state, mutation) => {
+      return selectMutationState(state, mutation).params
+    },
+    selectEntities: (state) => {
+      return cache.cacheStateSelector(state).entities
+    },
+    selectEntitiesByTypename: (state, typename) => {
+      return cache.cacheStateSelector(state).entities[typename]
+    },
+  }
+}

package/dist/esm/index.js

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

package/dist/esm/mutate.js

@@ -1,73 +1,150 @@
-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 { logDebug } from './utilsAndConstants';
-export const mutate = (logTag_1, store_1, cache_1, actions_1, selectors_1, mutationKey_1, params_1, abortControllers_1, ...args_1) => __awaiter(void 0, [logTag_1, store_1, cache_1, actions_1, selectors_1, mutationKey_1, params_1, abortControllers_1, ...args_1], void 0, function* (logTag, store, cache, actions, selectors, mutationKey, params, abortControllers, onCompleted = cache.mutations[mutationKey].onCompleted, onSuccess = cache.mutations[mutationKey].onSuccess, onError = cache.mutations[mutationKey].onError) {
-    var _a, _b;
-    const { updateMutationStateAndEntities } = actions;
-    let abortControllersOfStore = abortControllers.get(store);
-    if (abortControllersOfStore === undefined) {
-        abortControllersOfStore = {};
-        abortControllers.set(store, abortControllersOfStore);
+var __awaiter =
+  (this && this.__awaiter) ||
+  function (thisArg, _arguments, P, generator) {
+    function adopt(value) {
+      return value instanceof P
+        ? value
+        : new P(function (resolve) {
+            resolve(value)
+          })
     }
-    {
-        const abortController = abortControllersOfStore[mutationKey];
+    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 {logDebug} from './utilsAndConstants'
+
+export const mutate = (
+  logTag_1,
+  store_1,
+  cache_1,
+  actions_1,
+  selectors_1,
+  mutationKey_1,
+  params_1,
+  abortControllers_1,
+  ...args_1
+) =>
+  __awaiter(
+    void 0,
+    [
+      logTag_1,
+      store_1,
+      cache_1,
+      actions_1,
+      selectors_1,
+      mutationKey_1,
+      params_1,
+      abortControllers_1,
+      ...args_1,
+    ],
+    void 0,
+    function* (
+      logTag,
+      store,
+      cache,
+      actions,
+      selectors,
+      mutationKey,
+      params,
+      abortControllers,
+      onCompleted = cache.mutations[mutationKey].onCompleted,
+      onSuccess = cache.mutations[mutationKey].onSuccess,
+      onError = cache.mutations[mutationKey].onError,
+    ) {
+      var _a, _b
+      const {updateMutationStateAndEntities} = actions
+      let abortControllersOfStore = abortControllers.get(store)
+      if (abortControllersOfStore === undefined) {
+        abortControllersOfStore = {}
+        abortControllers.set(store, abortControllersOfStore)
+      }
+      {
+        const abortController = abortControllersOfStore[mutationKey]
         cache.options.logsEnabled &&
-            logDebug(logTag, { mutationKey, params, previousAborted: abortController !== undefined });
+          logDebug(logTag, {mutationKey, params, previousAborted: abortController !== undefined})
         if (abortController !== undefined) {
-            abortController.abort();
+          abortController.abort()
         }
-    }
-    const abortController = new AbortController();
-    abortControllersOfStore[mutationKey] = abortController;
-    const mutatePromise = cache.mutations[mutationKey].mutation(params, store, abortController.signal);
-    store.dispatch(updateMutationStateAndEntities(mutationKey, {
-        loading: mutatePromise,
-        params,
-        result: undefined,
-    }));
-    let response;
-    let error;
-    try {
-        response = yield mutatePromise;
-    }
-    catch (e) {
-        error = e;
-    }
-    cache.options.logsEnabled &&
-        logDebug(`${logTag} finished`, { response, error, aborted: abortController.signal.aborted });
-    if (abortController.signal.aborted) {
-        return ABORTED_RESULT;
-    }
-    delete abortControllersOfStore[mutationKey];
-    if (error) {
-        store.dispatch(updateMutationStateAndEntities(mutationKey, {
-            error: error,
+      }
+      const abortController = new AbortController()
+      abortControllersOfStore[mutationKey] = abortController
+      const mutatePromise = cache.mutations[mutationKey].mutation(params, store, abortController.signal)
+      store.dispatch(
+        updateMutationStateAndEntities(mutationKey, {
+          loading: mutatePromise,
+          params,
+          result: undefined,
+        }),
+      )
+      let response
+      let error
+      try {
+        response = yield mutatePromise
+      } catch (e) {
+        error = e
+      }
+      cache.options.logsEnabled &&
+        logDebug(`${logTag} finished`, {response, error, aborted: abortController.signal.aborted})
+      if (abortController.signal.aborted) {
+        return ABORTED_RESULT
+      }
+      delete abortControllersOfStore[mutationKey]
+      if (error) {
+        store.dispatch(
+          updateMutationStateAndEntities(mutationKey, {
+            error,
             loading: undefined,
-        }));
-        if (!(onError === null || onError === void 0 ? void 0 : onError(error, params, store, actions, selectors))) {
-            (_b = (_a = cache.globals).onError) === null || _b === void 0 ? void 0 : _b.call(_a, error, mutationKey, params, store, actions, selectors);
+          }),
+        )
+        if (
+          !(onError === null || onError === void 0
+            ? void 0
+            : onError(error, params, store, actions, selectors))
+        ) {
+          ;(_b = (_a = cache.globals).onError) === null || _b === void 0
+            ? void 0
+            : _b.call(_a, error, mutationKey, params, store, actions, selectors)
         }
-        onCompleted === null || onCompleted === void 0 ? void 0 : onCompleted(response, error, params, store, actions, selectors);
-        return { error };
-    }
-    if (response) {
+        onCompleted === null || onCompleted === void 0
+          ? void 0
+          : onCompleted(response, error, params, store, actions, selectors)
+        return {error}
+      }
+      if (response) {
         const newState = {
-            error: undefined,
-            loading: undefined,
-            result: response.result,
-        };
-        store.dispatch(updateMutationStateAndEntities(mutationKey, newState, response));
-        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(response, params, store, actions, selectors);
-        onCompleted === null || onCompleted === void 0 ? void 0 : onCompleted(response, error, params, store, actions, selectors);
-        return { result: response.result };
-    }
-    throw new Error(`${logTag}: both error and response are not defined`);
-});
-const ABORTED_RESULT = Object.freeze({ aborted: true });
+          error: undefined,
+          loading: undefined,
+          result: response.result,
+        }
+        store.dispatch(updateMutationStateAndEntities(mutationKey, newState, response))
+        onSuccess === null || onSuccess === void 0
+          ? void 0
+          : onSuccess(response, params, store, actions, selectors)
+        onCompleted === null || onCompleted === void 0
+          ? void 0
+          : onCompleted(response, error, params, store, actions, selectors)
+        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

@@ -1,77 +1,160 @@
-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 { logDebug, noop } from './utilsAndConstants';
-export const query = (logTag, store, cache, actions, selectors, queryKey, cacheKey, params, secondsToLive, onlyIfExpired, skipFetch, mergeResults, onCompleted, onSuccess, onError) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
-    if (secondsToLive === void 0) { secondsToLive = (_a = cache.queries[queryKey].secondsToLive) !== null && _a !== void 0 ? _a : cache.globals.queries.secondsToLive; }
-    if (mergeResults === void 0) { mergeResults = cache.queries[queryKey].mergeResults; }
-    if (onCompleted === void 0) { onCompleted = cache.queries[queryKey].onCompleted; }
-    if (onSuccess === void 0) { onSuccess = cache.queries[queryKey].onSuccess; }
-    if (onError === void 0) { onError = cache.queries[queryKey].onError; }
-    const { selectQueryResult, selectQueryState } = selectors;
-    const logsEnabled = cache.options.logsEnabled;
-    const queryStateOnStart = selectQueryState(store.getState(), queryKey, cacheKey);
+      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 {logDebug, noop} from './utilsAndConstants'
+
+export const query = (
+  logTag,
+  store,
+  cache,
+  actions,
+  selectors,
+  queryKey,
+  cacheKey,
+  params,
+  secondsToLive,
+  onlyIfExpired,
+  skipFetch,
+  mergeResults,
+  onCompleted,
+  onSuccess,
+  onError,
+) =>
+  __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d
+    if (secondsToLive === void 0) {
+      secondsToLive =
+        (_a = cache.queries[queryKey].secondsToLive) !== null && _a !== void 0
+          ? _a
+          : cache.globals.queries.secondsToLive
+    }
+    if (mergeResults === void 0) {
+      mergeResults = cache.queries[queryKey].mergeResults
+    }
+    if (onCompleted === void 0) {
+      onCompleted = cache.queries[queryKey].onCompleted
+    }
+    if (onSuccess === void 0) {
+      onSuccess = cache.queries[queryKey].onSuccess
+    }
+    if (onError === void 0) {
+      onError = cache.queries[queryKey].onError
+    }
+    const {selectQueryResult, selectQueryState} = selectors
+    const logsEnabled = cache.options.logsEnabled
+    const queryStateOnStart = selectQueryState(store.getState(), queryKey, cacheKey)
     if (skipFetch) {
-        return { result: queryStateOnStart.result };
+      return {result: queryStateOnStart.result}
     }
     if (queryStateOnStart === null || queryStateOnStart === void 0 ? void 0 : queryStateOnStart.loading) {
-        logsEnabled &&
-            logDebug(`${logTag} fetch cancelled: already loading`, { queryStateOnStart, params, cacheKey });
-        const error = yield queryStateOnStart.loading.then(noop).catch(catchAndReturn);
-        const result = selectQueryResult(store.getState(), queryKey, cacheKey);
-        const cancelled = 'loading';
-        return error ? { cancelled, result, error } : { cancelled, result };
+      logsEnabled &&
+        logDebug(`${logTag} fetch cancelled: already loading`, {queryStateOnStart, params, cacheKey})
+      const error = yield queryStateOnStart.loading.then(noop).catch(catchAndReturn)
+      const result = selectQueryResult(store.getState(), queryKey, cacheKey)
+      const cancelled = 'loading'
+      return error ? {cancelled, result, error} : {cancelled, result}
     }
-    if (onlyIfExpired && (queryStateOnStart === null || queryStateOnStart === void 0 ? void 0 : queryStateOnStart.expiresAt) != null && queryStateOnStart.expiresAt > Date.now()) {
-        logsEnabled &&
-            logDebug(`${logTag} fetch cancelled: not expired yet`, {
-                queryStateOnStart,
-                params,
-                cacheKey,
-                onlyIfExpired,
-            });
-        return { cancelled: 'not-expired', result: queryStateOnStart.result };
+    if (
+      onlyIfExpired &&
+      (queryStateOnStart === null || queryStateOnStart === void 0 ? void 0 : queryStateOnStart.expiresAt) !=
+        null &&
+      queryStateOnStart.expiresAt > Date.now()
+    ) {
+      logsEnabled &&
+        logDebug(`${logTag} fetch cancelled: not expired yet`, {
+          queryStateOnStart,
+          params,
+          cacheKey,
+          onlyIfExpired,
+        })
+      return {cancelled: 'not-expired', result: queryStateOnStart.result}
     }
-    const { updateQueryStateAndEntities } = actions;
-    const fetchPromise = cache.queries[queryKey].query(params, store);
-    store.dispatch(updateQueryStateAndEntities(queryKey, cacheKey, {
+    const {updateQueryStateAndEntities} = actions
+    const fetchPromise = cache.queries[queryKey].query(params, store)
+    store.dispatch(
+      updateQueryStateAndEntities(queryKey, cacheKey, {
         loading: fetchPromise,
         params,
-    }));
-    logsEnabled && logDebug(`${logTag} started`, { queryKey, params, cacheKey, queryStateOnStart, onlyIfExpired });
-    let response;
+      }),
+    )
+    logsEnabled &&
+      logDebug(`${logTag} started`, {queryKey, params, cacheKey, queryStateOnStart, onlyIfExpired})
+    let response
     try {
-        response = yield fetchPromise;
-    }
-    catch (error) {
-        store.dispatch(updateQueryStateAndEntities(queryKey, cacheKey, {
-            error: error,
-            loading: undefined,
-        }));
-        if (!(onError === null || onError === void 0 ? void 0 : onError(error, params, store))) {
-            (_c = (_b = cache.globals).onError) === null || _c === void 0 ? void 0 : _c.call(_b, error, queryKey, params, store, actions, selectors);
-        }
-        onCompleted === null || onCompleted === void 0 ? void 0 : onCompleted(undefined, error, params, store, actions, selectors);
-        return { error, result: selectQueryResult(store.getState(), queryKey, cacheKey) };
+      response = yield fetchPromise
+    } catch (error) {
+      store.dispatch(
+        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
+          ? void 0
+          : _c.call(_b, error, queryKey, params, store, actions, selectors)
+      }
+      onCompleted === null || onCompleted === void 0
+        ? void 0
+        : onCompleted(undefined, error, params, store, actions, selectors)
+      return {error, result: selectQueryResult(store.getState(), queryKey, cacheKey)}
     }
     const newState = {
-        error: undefined,
-        loading: undefined,
-        expiresAt: (_d = response.expiresAt) !== null && _d !== void 0 ? _d : (secondsToLive != null ? Date.now() + secondsToLive * 1000 : undefined),
-        result: mergeResults
-            ? mergeResults(selectQueryResult(store.getState(), queryKey, cacheKey), response, params, store, actions, selectors)
-            : response.result,
-    };
-    store.dispatch(updateQueryStateAndEntities(queryKey, cacheKey, newState, response));
-    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(response, params, store, actions, selectors);
-    onCompleted === null || onCompleted === void 0 ? void 0 : onCompleted(response, undefined, params, store, actions, selectors);
-    return { result: newState === null || newState === void 0 ? void 0 : newState.result };
-});
-const catchAndReturn = (x) => x;
+      error: undefined,
+      loading: undefined,
+      expiresAt:
+        (_d = response.expiresAt) !== null && _d !== void 0
+          ? _d
+          : secondsToLive != null
+            ? Date.now() + secondsToLive * 1000
+            : undefined,
+      result: mergeResults
+        ? mergeResults(
+            selectQueryResult(store.getState(), queryKey, cacheKey),
+            response,
+            params,
+            store,
+            actions,
+            selectors,
+          )
+        : response.result,
+    }
+    store.dispatch(updateQueryStateAndEntities(queryKey, cacheKey, newState, response))
+    onSuccess === null || onSuccess === void 0
+      ? void 0
+      : onSuccess(response, params, store, actions, selectors)
+    onCompleted === null || onCompleted === void 0
+      ? void 0
+      : onCompleted(response, undefined, params, store, actions, selectors)
+    return {result: newState === null || newState === void 0 ? void 0 : newState.result}
+  })
+
+const catchAndReturn = (x) => x

package/dist/esm/types.js

@@ -1 +1 @@
-export {};
+export {}