types(vest-utils): Move Predicate type to utilityTypes

ealush · Nov 28, 2023 · 39804ca · 39804ca · vercel · Nov 28, 2023
1 parent 3007217
commit 39804ca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/vest-utils/src/Predicates.ts b/packages/vest-utils/src/Predicates.ts
@@ -1,7 +1,6 @@
 import { isEmpty } from 'isEmpty';
 import optionalFunctionValue from 'optionalFunctionValue';
-
-export type Predicate<T> = boolean | ((value: T) => boolean);
+import { Predicate } from 'utilityTypes';
 
 export function all<T = any>(...p: Predicate<T>[]): (value: T) => boolean {
   return (value: T) =>

diff --git a/packages/vest-utils/src/utilityTypes.ts b/packages/vest-utils/src/utilityTypes.ts
@@ -21,3 +21,5 @@ export type DynamicValue<T, Args extends TArgs = TArgs> = T | CB<T, Args>;
 export type BlankValue = Maybe<''>;
 
 type TArgs = any[];
+
+export type Predicate<T = any> = boolean | ((value: T) => boolean);
diff --git a/packages/vest-utils/src/vest-utils.ts b/packages/vest-utils/src/vest-utils.ts
@@ -38,8 +38,6 @@ export { StringObject } from 'StringObject';
 export { noop } from 'noop';
 export * as Predicates from 'Predicates';
 
-export type { Predicate } from 'Predicates';
-
 export type {
   DropFirst,
   Stringable,
@@ -51,4 +49,5 @@ export type {
   OneOrMoreOf,
   DynamicValue,
   BlankValue,
+  Predicate,
 } from 'utilityTypes';
diff --git a/packages/vest/src/suite/SuiteWalker.ts b/packages/vest/src/suite/SuiteWalker.ts
@@ -1,4 +1,4 @@
-import { Predicates, type Predicate, isNullish } from 'vest-utils';
+import { Predicate, Predicates, isNullish } from 'vest-utils';
 import { TIsolate, VestRuntime, Walker } from 'vestjs-runtime';
 
 import { CommonStates } from 'CommonStateMachine';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ export type DynamicValue<T, Args extends TArgs = TArgs> = T \| CB<T, Args>;
		export type BlankValue = Maybe<''>;

		type TArgs = any[];

		export type Predicate<T = any> = boolean \| ((value: T) => boolean);