Merge branch 'master' into fix-memoizeOptions-typing

# Conflicts:
#	src/index.ts

src/defaultMemoize.ts

@@ -156,7 +156,7 @@ export function defaultMemoize<F extends (...args: any[]) => any>(
         )
 
         if (matchingEntry) {
-          return matchingEntry.value
+          value = matchingEntry.value
         }
       }
 

src/index.ts

@@ -167,9 +167,9 @@ interface CreateSelectorFunction<
   ): OutputSelector<
     Selectors,
     Result,
-    GetParamsFromSelectors<Selectors>,
     ((...args: SelectorResultArray<Selectors>) => Result) &
-      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
+      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>,
+    GetParamsFromSelectors<Selectors>
   > &
     Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
 
@@ -183,9 +183,9 @@ interface CreateSelectorFunction<
   ): OutputSelector<
     Selectors,
     Result,
-    GetParamsFromSelectors<Selectors>,
     ((...args: SelectorResultArray<Selectors>) => Result) &
-      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
+      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>,
+    GetParamsFromSelectors<Selectors>
   > &
     Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
 
@@ -197,9 +197,9 @@ interface CreateSelectorFunction<
   ): OutputSelector<
     Selectors,
     Result,
-    GetParamsFromSelectors<Selectors>,
     ((...args: SelectorResultArray<Selectors>) => Result) &
-      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
+      Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>,
+    GetParamsFromSelectors<Selectors>
   > &
     Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
 }

src/types.ts

@@ -16,8 +16,8 @@ interface OutputSelectorFields<Combiner, Result> {
 export type OutputSelector<
   S extends SelectorArray,
   Result,
-  Params extends readonly any[],
-  Combiner
+  Combiner,
+  Params extends readonly any[] = never
 > = Selector<GetStateFromSelectors<S>, Result, Params> &
   OutputSelectorFields<Combiner, Result>
 

test/test_selector.ts

@@ -603,6 +603,35 @@ describe('defaultMemoize', () => {
     }
   })
 
+  test('updates the cache key even if resultEqualityCheck is a hit', () => {
+    const selector = jest.fn(x => x)
+    const equalityCheck = jest.fn((a, b) => a === b)
+    const resultEqualityCheck = jest.fn((a, b) => typeof a === typeof b)
+
+    const memoizedFn = defaultMemoize(selector, {
+      maxSize: 1,
+      resultEqualityCheck,
+      equalityCheck
+    })
+
+    // initialize the cache
+    memoizedFn('cache this result')
+    expect(selector).toBeCalledTimes(1)
+
+    // resultEqualityCheck hit (with a different cache key)
+    const result = memoizedFn('arg1')
+    expect(equalityCheck).toHaveLastReturnedWith(false)
+    expect(resultEqualityCheck).toHaveLastReturnedWith(true)
+    expect(result).toBe('cache this result')
+    expect(selector).toBeCalledTimes(2)
+
+    // cache key should now be updated
+    const result2 = memoizedFn('arg1')
+    expect(result2).toBe('cache this result')
+    expect(equalityCheck).toHaveLastReturnedWith(true)
+    expect(selector).toBeCalledTimes(2)
+  })
+
   // Issue #527
   test('Allows caching a value of `undefined`', () => {
     const state = {