From 0184db83a12933990b44fc2c177f34708503a2bc Mon Sep 17 00:00:00 2001
From: Arya Emami <aryaemami59@yahoo.com>
Date: Tue, 24 Oct 2023 15:06:06 -0500
Subject: [PATCH] Fix importing issues in type test files.

---
 typescript_test/argsMemoize.typetest.ts | 11 ++++++---
 typescript_test/test.ts                 | 33 ++++++++++++++-----------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/typescript_test/argsMemoize.typetest.ts b/typescript_test/argsMemoize.typetest.ts
index ef6da6b75..d9ae04d17 100644
--- a/typescript_test/argsMemoize.typetest.ts
+++ b/typescript_test/argsMemoize.typetest.ts
@@ -1,9 +1,12 @@
-import { createSelector } from '@reduxjs/toolkit'
 import memoizeOne from 'memoize-one'
 import microMemoize from 'micro-memoize'
-import { autotrackMemoize, weakMapMemoize } from 'reselect'
-import { createSelectorCreator } from '../src/createSelectorCreator'
-import { defaultMemoize } from '../src/defaultMemoize'
+import {
+  autotrackMemoize,
+  createSelector,
+  createSelectorCreator,
+  defaultMemoize,
+  weakMapMemoize
+} from 'reselect'
 import { expectExactType } from './test'
 
 interface State {
diff --git a/typescript_test/test.ts b/typescript_test/test.ts
index e96341444..5f9187a87 100644
--- a/typescript_test/test.ts
+++ b/typescript_test/test.ts
@@ -1,24 +1,24 @@
 /* eslint-disable no-use-before-define */
 
-import { groupBy, isEqual } from 'lodash'
-
-import type { OutputSelector, ParametricSelector } from '@reduxjs/toolkit'
 import { configureStore, createSlice } from '@reduxjs/toolkit'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import { groupBy, isEqual } from 'lodash'
 import memoizeOne from 'memoize-one'
 import microMemoize from 'micro-memoize'
 import type { TypedUseSelectorHook } from 'react-redux'
 import { useSelector } from 'react-redux'
-import { createStructuredSelector } from 'reselect'
-import { createSelectorCreator } from '../src/createSelectorCreator'
-import { defaultEqualityCheck, defaultMemoize } from '../src/defaultMemoize'
-import type { Selector } from '../src/index'
-import { createSelector } from '../src/index'
-import type {
-  AnyFunction,
+import {
   GetStateFromSelectors,
-  SelectorResultArray
-} from '../src/types'
+  OutputSelector,
+  ParametricSelector,
+  Selector,
+  SelectorResultArray,
+  createSelector,
+  createSelectorCreator,
+  createStructuredSelector,
+  defaultEqualityCheck,
+  defaultMemoize
+} from 'reselect'
 
 export function expectType<T>(t: T): T {
   return t
@@ -909,7 +909,7 @@ function testStructuredSelectorTypeParams() {
   })
 }
 
-function multiArgMemoize<F extends AnyFunction>(
+function multiArgMemoize<F extends (...args: any[]) => any>(
   func: F,
   a: number,
   b: string,
@@ -1098,7 +1098,12 @@ function issue492() {
 }
 
 function customMemoizationOptionTypes() {
-  const customMemoize = (f: AnyFunction, a: string, b: number, c: boolean) => {
+  const customMemoize = (
+    f: (...args: any[]) => any,
+    a: string,
+    b: number,
+    c: boolean
+  ) => {
     return f
   }