types(vest): Add a dedicated VestTests plural type

ealush · Jun 10, 2022 · b062abb · b062abb · vercel · Jun 10, 2022
1 parent 59940e1
commit b062abb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/packages/vest/src/core/state/createStateRef.ts b/packages/vest/src/core/state/createStateRef.ts
@@ -1,4 +1,4 @@
-import type { NestedArray } from 'nestedArray';
+import { NestedArray } from 'nestedArray';
 import type { State, UseState } from 'vast';
 
 import VestTest from 'VestTest';
@@ -19,7 +19,7 @@ export default function createStateRef(
     testObjects: state.registerStateKey<TestObjects>(prev => {
       return {
         prev: prev ? prev.current : [],
-        current: [] as NestedArray<VestTest>,
+        current: [] as VestTests,
       };
     }),
   };
@@ -52,6 +52,8 @@ type TestCallbacks = {
 };
 
 type TestObjects = {
-  prev: NestedArray<VestTest>;
-  current: NestedArray<VestTest>;
+  prev: VestTests;
+  current: VestTests;
 };
+
+export type VestTests = NestedArray<VestTest>;
diff --git a/packages/vest/src/core/state/stateHooks.ts b/packages/vest/src/core/state/stateHooks.ts
@@ -1,13 +1,12 @@
 import asArray from 'asArray';
 import assign from 'assign';
 import createCache from 'cache';
-import type { NestedArray } from 'nestedArray';
 import * as nestedArray from 'nestedArray';
 import optionalFunctionValue from 'optionalFunctionValue';
 import { ValueOf } from 'utilityTypes';
 
 import VestTest from 'VestTest';
-import type { StateKey, StateRef, StateValue } from 'createStateRef';
+import type { StateKey, StateRef, StateValue, VestTests } from 'createStateRef';
 import ctx from 'ctx';
 
 // STATE REF
@@ -78,9 +77,7 @@ export function useRefreshTestObjects(): void {
   useSetTests(tests => tests);
 }
 
-export function useSetTests(
-  handler: (current: NestedArray<VestTest>) => NestedArray<VestTest>
-): void {
+export function useSetTests(handler: (current: VestTests) => VestTests): void {
   const [, testObjects] = useTestObjects();
 
   testObjects(({ current, prev }) => ({

diff --git a/packages/vest/src/core/test/lib/useTestAtCursor.ts b/packages/vest/src/core/test/lib/useTestAtCursor.ts
@@ -2,10 +2,10 @@ import defaultTo from 'defaultTo';
 import { isEmpty, isNotEmpty } from 'isEmpty';
 import { isNullish } from 'isNullish';
 import * as nestedArray from 'nestedArray';
-import type { NestedArray } from 'nestedArray';
 import { deferThrow } from 'throwError';
 
 import VestTest from 'VestTest';
+import { VestTests } from 'createStateRef';
 import isSameProfileTest from 'isSameProfileTest';
 import { shouldAllowReorder, useCurrentPath, useCursor } from 'isolate';
 import { usePrevTestByKey, useRetainTestKey } from 'key';
@@ -32,8 +32,7 @@ export function useTestAtCursor(newTestObject: VestTest): VestTest {
     return newTestObject;
   }
 
-  let prevTest: NestedArray<VestTest> | VestTest | null =
-    useGetTestAtCursor(prevTests);
+  let prevTest: VestTests | VestTest | null = useGetTestAtCursor(prevTests);
 
   if (!isNullish(newTestObject.key)) {
     const nextTest = handleKeyTest(newTestObject.key, newTestObject);
@@ -75,7 +74,7 @@ export function useSetTestAtCursor(testObject: VestTest): void {
   );
 }
 
-function useGetTestAtCursor(tests: NestedArray<VestTest>): VestTest {
+function useGetTestAtCursor(tests: VestTests): VestTest {
   const cursorPath = useCurrentPath();
 
   return nestedArray.valueAtPath(tests, cursorPath) as VestTest;