types(vest): simplify test overload

ealush · Aug 17, 2022 · 3ae44e8 · 3ae44e8 · vercel · Aug 17, 2022
1 parent bae4411
commit 3ae44e8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/packages/vest/src/core/suite/create.ts b/packages/vest/src/core/suite/create.ts
@@ -23,7 +23,6 @@ import { initBus, Events } from 'vestBus';
  */
 function create<T extends CB>(suiteName: SuiteName, suiteCallback: T): Suite<T>;
 function create<T extends CB>(suiteCallback: T): Suite<T>;
-// eslint-disable-next-line max-lines-per-function
 function create<T extends CB>(
   ...args: [suiteName: SuiteName, suiteCallback: T] | [suiteCallback: T]
 ): Suite<T> {

diff --git a/packages/vest/src/core/test/test.memo.ts b/packages/vest/src/core/test/test.memo.ts
@@ -7,30 +7,15 @@ import registerPrevRunTest from 'registerPrevRunTest';
 import { useSuiteId } from 'stateHooks';
 import type { TestBase } from 'test';
 
-export default function bindTestMemo(test: TestBase): {
-  (fieldName: string, test: TestFn, deps: unknown[]): VestTest;
-  (fieldName: string, message: string, test: TestFn, deps: unknown[]): VestTest;
-} {
+export default function testMemo(test: TestBase): TestMemo {
   const cache = createCache(10); // arbitrary cache size
 
   /**
    * Caches a test result based on the test's dependencies.
    */
-  function memo(
-    fieldName: string,
-    ...args: [test: TestFn, deps: unknown[]]
-  ): VestTest;
-  function memo(
-    fieldName: string,
-    ...args: [message: string, test: TestFn, deps: unknown[]]
-  ): VestTest;
-  // eslint-disable-next-line max-statements
-  function memo(
-    fieldName: string,
-    ...args:
-      | [message: string, test: TestFn, deps: unknown[]]
-      | [test: TestFn, deps: unknown[]]
-  ): VestTest {
+  function memo(fieldName: string, ...args: ParametersWithoutMessage): VestTest;
+  function memo(fieldName: string, ...args: ParametersWithMessage): VestTest;
+  function memo(fieldName: string, ...args: ParamsOverload): VestTest {
     const cursorAt = useCursor().current();
 
     const [deps, testFn, msg] = args.reverse() as [any[], TestFn, string];
@@ -56,3 +41,17 @@ export default function bindTestMemo(test: TestBase): {
 
   return memo;
 }
+
+type TestMemo = {
+  (fieldName: string, ...args: ParametersWithoutMessage): VestTest;
+  (fieldName: string, ...args: ParametersWithMessage): VestTest;
+};
+
+type ParametersWithoutMessage = [test: TestFn, dependencies: unknown[]];
+type ParametersWithMessage = [
+  message: string,
+  test: TestFn,
+  dependencies: unknown[]
+];
+
+type ParamsOverload = ParametersWithoutMessage | ParametersWithMessage;
diff --git a/packages/vest/src/core/test/test.ts b/packages/vest/src/core/test/test.ts
@@ -8,7 +8,7 @@ import {
 import VestTest, { TestFn } from 'VestTest';
 import ctx from 'ctx';
 import registerPrevRunTest from 'registerPrevRunTest';
-import bindTestMemo from 'test.memo';
+import testMemo from 'test.memo';
 
 function testBase(fieldName: string, message: string, cb: TestFn): VestTest;
 function testBase(fieldName: string, cb: TestFn): VestTest;
@@ -42,6 +42,7 @@ function testBase(
   );
 
   const context = ctx.useX();
+
   const testObject = new VestTest(fieldName, testFn, {
     message,
     groupName: context.groupName,
@@ -61,7 +62,7 @@ function testBase(
  * });
  */
 export const test = assign(testBase, {
-  memo: bindTestMemo(testBase),
+  memo: testMemo(testBase),
 });
 
 export type TestBase = typeof testBase;