react-redux-cache 0.19.5 → 0.20.0

package/dist/esm/useQuery.js

@@ -32,7 +32,7 @@ var __awaiter =
 import {useCallback, useEffect} from 'react'
 
 import {query as queryImpl} from './query'
-import {createStateComparer, defaultGetCacheKey, EMPTY_OBJECT, log} from './utilsAndConstants'
+import {createStateComparer, defaultGetCacheKey, EMPTY_OBJECT, logDebug} from './utilsAndConstants'
 
 export const useQuery = (cache, actions, selectors, options) => {
   var _a, _b, _c, _d, _e
@@ -99,13 +99,13 @@ export const useQuery = (cache, actions, selectors, options) => {
       : EMPTY_OBJECT
   useEffect(() => {
     if (skipFetch) {
-      logsEnabled && log('useQuery.useEffect skip fetch', {skipFetch, queryKey, cacheKey})
+      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 &&
-        log('useQuery.useEffect skip fetch due to fetch policy', {
+        logDebug('useQuery.useEffect skip fetch due to fetch policy', {
           queryState,
           expired,
           queryKey,
@@ -115,12 +115,8 @@ export const useQuery = (cache, actions, selectors, options) => {
     }
     performFetch()
   }, [cacheKey, skipFetch])
-  logsEnabled &&
-    log('useQuery', {
-      cacheKey,
-      options,
-      queryState,
-    })
+  logsEnabled && logDebug('useQuery', {cacheKey, options, queryState})
   return [queryState, performFetch]
 }
+
 const defaultStateComparer = createStateComparer(['result', 'loading', 'params', 'error'])

package/dist/esm/utilsAndConstants.js

@@ -1,12 +1,23 @@
 export const PACKAGE_SHORT_NAME = 'rrc'
+
 export const optionalUtils = {
   deepEqual: undefined,
 }
+
+export const logDebug = (tag, data) => {
+  console.debug(`@${PACKAGE_SHORT_NAME} [${tag}]`, data)
+}
+
+export const logWarn = (tag, data) => {
+  console.warn(`@${PACKAGE_SHORT_NAME} [${tag}]`, data)
+}
+
 try {
   optionalUtils.deepEqual = require('fast-deep-equal/es6')
 } catch (_a) {
-  console.debug(PACKAGE_SHORT_NAME + ': fast-deep-equal optional dependency was not installed')
+  logDebug('deepEqual', 'fast-deep-equal optional dependency was not installed')
 }
+
 export const IS_DEV = (() => {
   try {
     return __DEV__
@@ -14,9 +25,13 @@ export const IS_DEV = (() => {
     return process.env.NODE_ENV === 'development'
   }
 })()
+
 export const EMPTY_OBJECT = Object.freeze({})
+
 export const EMPTY_ARRAY = Object.freeze([])
-export const NOOP = () => {}
+
+export const noop = () => {}
+
 export const defaultGetCacheKey = (params) => {
   switch (typeof params) {
     case 'string':
@@ -28,19 +43,11 @@ export const defaultGetCacheKey = (params) => {
       return String(params)
   }
 }
-export const log = (tag, data) => {
-  console.debug(`@${PACKAGE_SHORT_NAME} [${tag}]`, data)
-}
-export const FetchPolicy = {
-  NoCacheOrExpired: (expired, _params, state) => {
-    return expired || state.result === undefined
-  },
-  Always: () => true,
-}
+
 export const applyEntityChanges = (entities, changes, options) => {
   var _a, _b, _c, _d
   if (changes.merge && changes.entities) {
-    console.warn('react-redux-cache.applyEntityChanges: merge and entities should not be both set')
+    logWarn('applyEntityChanges', 'merge and entities should not be both set')
   }
   const {merge = changes.entities, replace, remove} = changes
   if (!merge && !replace && !remove) {
@@ -48,13 +55,11 @@ export const applyEntityChanges = (entities, changes, options) => {
   }
   const deepEqual = options.deepComparisonEnabled ? optionalUtils.deepEqual : undefined
   let result
-  const typenames = new Set([
-    ...(changes.entities ? Object.keys(changes.entities) : EMPTY_ARRAY),
-    ...(changes.merge ? Object.keys(changes.merge) : EMPTY_ARRAY),
-    ...(changes.remove ? Object.keys(changes.remove) : EMPTY_ARRAY),
-    ...(changes.replace ? Object.keys(changes.replace) : EMPTY_ARRAY),
-  ])
-  for (const typename of typenames) {
+  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]
@@ -87,10 +92,7 @@ export const applyEntityChanges = (entities, changes, options) => {
           ? _c
           : 0)
       if (totalKeysInResponse !== 0 && idsSet.size !== totalKeysInResponse) {
-        console.warn(
-          'react-redux-cache.applyEntityChanges: merge, replace and remove changes have intersections for: ' +
-            typename
-        )
+        logWarn('applyEntityChanges', 'merge, replace and remove changes have intersections for: ' + typename)
       }
     }
     const oldEntities = (_d = entities[typename]) !== null && _d !== void 0 ? _d : EMPTY_OBJECT
@@ -135,7 +137,7 @@ export const applyEntityChanges = (entities, changes, options) => {
     result[typename] = newEntities
   }
   options.logsEnabled &&
-    log('applyEntityChanges', {
+    logDebug('applyEntityChanges', {
       entities,
       changes,
       options,
@@ -143,12 +145,14 @@ export const applyEntityChanges = (entities, changes, options) => {
     })
   return result
 }
+
 export const isEmptyObject = (o) => {
   for (const _ in o) {
     return false
   }
   return true
 }
+
 export const createStateComparer = (fields) => {
   return (x, y) => {
     if (x === y) {
@@ -166,3 +170,10 @@ export const createStateComparer = (fields) => {
     return true
   }
 }
+
+export const FetchPolicy = {
+  NoCacheOrExpired: (expired, _params, state) => {
+    return expired || state.result === undefined
+  },
+  Always: () => true,
+}

package/dist/types/createActions.d.ts

@@ -9,6 +9,7 @@ export type Actions<
   MP = unknown,
   MR = unknown
 > = ReturnType<typeof createActions<N, T, QP, QR, MP, MR>>
+
 export declare const createActions: <N extends string, T extends Typenames, QP, QR, MP, MR>(
   name: N
 ) => {