types: simplify indirect types

packages/n4s/src/exports/compounds.ts

@@ -1,21 +1,28 @@
 import { enforce } from 'n4s';
-import { DropFirst } from 'utilityTypes';
 
 import { allOf } from 'allOf';
 import { anyOf } from 'anyOf';
+import { EnforceCustomMatcher } from 'enforceUtilityTypes';
+import { Lazy } from 'genEnforceLazy';
 import { noneOf } from 'noneOf';
 import { oneOf } from 'oneOf';
+import { RuleDetailedResult } from 'ruleReturn';
 
 enforce.extend({ allOf, anyOf, noneOf, oneOf });
 
+type EnforceCompoundRule = (
+  value: unknown,
+  ...rules: Lazy[]
+) => RuleDetailedResult;
+
 /* eslint-disable @typescript-eslint/no-namespace */
 declare global {
   namespace n4s {
     interface EnforceCustomMatchers<R> {
-      allOf: (...args: DropFirst<Parameters<typeof allOf>>) => R;
-      anyOf: (...args: DropFirst<Parameters<typeof anyOf>>) => R;
-      noneOf: (...args: DropFirst<Parameters<typeof noneOf>>) => R;
-      oneOf: (...args: DropFirst<Parameters<typeof oneOf>>) => R;
+      allOf: EnforceCustomMatcher<EnforceCompoundRule, R>;
+      anyOf: EnforceCustomMatcher<EnforceCompoundRule, R>;
+      noneOf: EnforceCustomMatcher<EnforceCompoundRule, R>;
+      oneOf: EnforceCustomMatcher<EnforceCompoundRule, R>;
     }
   }
 }

packages/n4s/src/exports/schema.ts

@@ -1,6 +1,6 @@
 import { enforce } from 'n4s';
-import { DropFirst } from 'utilityTypes';
 
+import { EnforceCustomMatcher } from 'enforceUtilityTypes';
 import { isArrayOf } from 'isArrayOf';
 import { loose } from 'loose';
 import { optional } from 'optional';
@@ -14,10 +14,10 @@ enforce.extend({ isArrayOf, loose, optional, shape });
 declare global {
   namespace n4s {
     interface EnforceCustomMatchers<R> {
-      isArrayOf: (...args: DropFirst<Parameters<typeof isArrayOf>>) => R;
-      loose: (...args: DropFirst<Parameters<typeof loose>>) => R;
-      shape: (...args: DropFirst<Parameters<typeof shape>>) => R;
-      optional: (...args: DropFirst<Parameters<typeof optional>>) => R;
+      isArrayOf: EnforceCustomMatcher<typeof isArrayOf, R>;
+      loose: EnforceCustomMatcher<typeof loose, R>;
+      shape: EnforceCustomMatcher<typeof shape, R>;
+      optional: EnforceCustomMatcher<typeof optional, R>;
     }
   }
 }

packages/n4s/src/lib/enforceUtilityTypes.ts

@@ -0,0 +1,5 @@
+import { CB, DropFirst } from 'utilityTypes';
+
+export type EnforceCustomMatcher<F extends CB, R> = (
+  ...args: DropFirst<Parameters<F>>
+) => R;

packages/n4s/src/runtime/enforceEager.ts

@@ -66,4 +66,4 @@ export default function enforceEager(value: RuleValue): IRules {
   }
 }
 
-export type EnforceEager = typeof enforceEager;
+export type EnforceEager = (value: RuleValue) => IRules;

packages/vast/src/vast.ts

@@ -90,7 +90,7 @@ export function createState(
 type StateInput<S> = S | ((prevState?: S) => S);
 type SetStateInput<S> = S | ((prevState: S) => S);
 
-export type State = ReturnType<typeof createState>;
+export type State = CreateStateReturn;
 export type StateHandlerReturn<S> = [S, (nextState: SetStateInput<S>) => void];
 export type UseState<S> = () => StateHandlerReturn<S>;