type-plus 8.0.0-beta.6 → 8.0.0-beta.7

package/src/mix_types/merge.ts

@@ -1,7 +1,7 @@
+import type { Or } from '../logical/logical.js'
 import type { IsNever } from '../never/is_never.js'
 import type { IsNull } from '../null/is_null.js'
 import type { Merge as ObjectMerge } from '../object/merge.js'
-import type { Or } from '../predicates/logical.js'
 import type { IsUndefined } from '../undefined/is_undefined.js'
 import type { IsUnknown } from '../unknown/is_unknown.js'
 import type { IsVoid } from '../void/is_void.js'
@@ -23,23 +23,28 @@ import type { Box } from './box.js'
 export type Merge<A, B> = Or<
 	IsNever<A>,
 	IsNever<B>,
-	never,
-	Or<
-		IsVoid<A>,
-		IsVoid<B>,
-		A & B,
-		Or<
-			IsUnknown<A>,
-			Or<IsUndefined<A>, IsNull<A>>,
-			B,
-			Or<
-				IsUnknown<B>,
-				Or<IsUndefined<B>, IsNull<B>>,
-				A,
-				ObjectMerge<Box<A, { $notBoxable: {} }>, Box<B, { $notBoxable: {} }>>
-			>
+	{
+		$then: never
+		$else: Or<
+			IsVoid<A>,
+			IsVoid<B>,
+			{
+				$then: A & B
+				$else: Or<
+					IsUnknown<A>,
+					Or<IsUndefined<A>, IsNull<A>>,
+					{
+						$then: B
+						$else: Or<
+							IsUnknown<B>,
+							Or<IsUndefined<B>, IsNull<B>>,
+							{ $then: A; $else: ObjectMerge<Box<A, { $notBoxable: {} }>, Box<B, { $notBoxable: {} }>> }
+						>
+					}
+				>
+			}
 		>
-	>
+	}
 >
 
 /**

package/src/never/is_never.ts

@@ -1,11 +1,11 @@
-import type { $Any } from '../any/any.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $InputOptions } from '../type_plus/branch/$input_options.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $SelectionBranch, $Then } from '../type_plus/branch/$selection.js'
-import type { $SelectionOptions } from '../type_plus/branch/$selection_options.js'
-import type { $Unknown } from '../unknown/unknown.js'
-import type { $NotNever } from './never.js'
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $NotNever } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
 
 /**
  * 🎭 *predicate*
@@ -44,19 +44,20 @@ import type { $NotNever } from './never.js'
  * type R = IsNever<1, $SelectionBranch> // $Else
  * ```
  */
-export type IsNever<T, $O extends IsNever.$Options = {}> = $SpecialType<
+export type IsNever<T, $O extends IsNever.$Options = {}> = $Special<
 	T,
 	{
-		$any: $ResolveBranch<T, IsNever._O<$O>, [$Any, $Else]>
-		$unknown: $ResolveBranch<T, IsNever._O<$O>, [$Unknown, $Else]>
-		$never: $ResolveBranch<T, $O, [$Then]>
-		$else: $ResolveBranch<T, IsNever._O<$O>, [$Else]>
+		$any: $ResolveBranch<IsNever._O<$O>, [$Any, $Else]>
+		$unknown: $ResolveBranch<IsNever._O<$O>, [$Unknown, $Else]>
+		$never: $ResolveBranch<$O, [$Then], T>
+		$void: $ResolveBranch<IsNever._O<$O>, [$Void, $Else]>
+		$else: $ResolveBranch<IsNever._O<$O>, [$Else]>
 	}
 >
 
 export namespace IsNever {
-	export type $Options = $SelectionOptions & $InputOptions<$Any | $Unknown>
-	export type $Branch = $SelectionBranch
+	export type $Options = $Selection.Options & $InputOptions<$Any | $Unknown>
+	export type $Branch = $Selection.Branch
 	export type _O<$O extends $Options> = '$else' extends keyof $O
 		? $O
 		: $O['selection'] extends 'filter'

package/src/never/is_not_never.ts

@@ -1,11 +1,11 @@
-import type { $Any } from '../any/any.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $InputOptions } from '../type_plus/branch/$input_options.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $SelectionBranch, $Then } from '../type_plus/branch/$selection.js'
-import type { $SelectionOptions } from '../type_plus/branch/$selection_options.js'
-import type { $Unknown } from '../unknown/unknown.js'
-import type { $Never } from './never.js'
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
 
 /**
  * 🎭 *predicate*
@@ -44,19 +44,20 @@ import type { $Never } from './never.js'
  * type R = IsNotNever<1, $SelectionBranch> // $Then
  * ```
  */
-export type IsNotNever<T, $O extends IsNotNever.$Options = {}> = $SpecialType<
+export type IsNotNever<T, $O extends IsNotNever.$Options = {}> = $Special<
 	T,
 	{
-		$any: $ResolveBranch<T, $O, [$Any, $Then]>
-		$unknown: $ResolveBranch<T, $O, [$Unknown, $Then]>
-		$never: $ResolveBranch<T, IsNotNever._O<$O>, [$Else]>
-		$else: $ResolveBranch<T, $O, [$Then]>
+		$any: $ResolveBranch<$O, [$Any, $Then], T>
+		$never: $ResolveBranch<IsNotNever._O<$O>, [$Else]>
+		$unknown: $ResolveBranch<$O, [$Unknown, $Then], T>
+		$void: $ResolveBranch<$O, [$Void, $Then], T>
+		$else: $ResolveBranch<$O, [$Then], T>
 	}
 >
 
 export namespace IsNotNever {
-	export type $Options = $SelectionOptions & $InputOptions<$Any | $Unknown>
-	export type $Branch = $SelectionBranch
+	export type $Options = $Selection.Options & $InputOptions<$Any | $Unknown>
+	export type $Branch = $Selection.Branch
 	export type _O<$O extends $Options> = '$else' extends keyof $O
 		? $O
 		: $O['selection'] extends 'filter'

package/src/null/is_not_null.ts

@@ -1,9 +1,15 @@
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { NotAssignable } from '../predicates/not_assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -51,20 +57,23 @@ import type { $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotNull<null, $SelectionBranch> // $Else
  * ```
  */
-export type IsNotNull<T, $O extends IsNotNull.$Options = {}> = $SpecialType<
+export type IsNotNull<T, $O extends IsNotNull.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotNull.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotNull {
-	export type $Options = $Equality.$Options
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*

package/src/null/is_null.ts

@@ -1,9 +1,15 @@
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { Assignable } from '../predicates/assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -55,20 +61,23 @@ import type { $Else } from '../type_plus/branch/$selection.js'
  * type R = IsNull<string, $SelectionBranch> // $Else
  * ```
  */
-export type IsNull<T, $O extends IsNull.$Options = {}> = $SpecialType<
+export type IsNull<T, $O extends IsNull.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsNull.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNull {
-	export type $Options = $Equality.$Options
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*

package/src/number/is_not_number.ts

@@ -1,12 +1,16 @@
+import type { $ResolveOptions } from '../$type/$resolve_options.js'
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { NotAssignable } from '../predicates/not_assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $ResolveOptions } from '../type_plus/$resolve_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $ExactOptions } from '../type_plus/branch/$exact.js'
-import type { $IsDistributive } from '../type_plus/branch/$is_distributive.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -57,20 +61,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotNumber<number, $SelectionBranch> // $Else
  * ```
  */
-export type IsNotNumber<T, $O extends IsNotNumber.$Options = {}> = $SpecialType<
+export type IsNotNumber<T, $O extends IsNotNumber.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotNumber.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotNumber {
-	export type $Options = $Equality.$Options & $ExactOptions
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*
@@ -81,17 +88,17 @@ export namespace IsNotNumber {
 	 * It does not check against special types.
 	 */
 	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], false]> extends true
-		? $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
+		? $Distributive.Parse<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 		: NotAssignable.$<T, number, $O>
-	export type $UtilOptions = NotAssignable.$UtilOptions & $ExactOptions
+	export type $UtilOptions = NotAssignable.$UtilOptions & $Exact.Options
 	export type _D<T, $O extends IsNotNumber.$Options> = T extends number & infer U
 		? U extends number
-			? $ResolveBranch<T, $O, [$Then]>
-			: $ResolveBranch<T, $O, [$Else]>
-		: $ResolveBranch<T, $O, [$Then]>
+			? $ResolveBranch<$O, [$Then], T>
+			: $ResolveBranch<$O, [$Else]>
+		: $ResolveBranch<$O, [$Then], T>
 	export type _N<T, $O extends IsNotNumber.$Options> = [T] extends [number & infer U]
 		? U extends number
-			? $ResolveBranch<T, $O, [$Then]>
-			: $ResolveBranch<T, $O, [$Else]>
-		: $ResolveBranch<T, $O, [$Then]>
+			? $ResolveBranch<$O, [$Then], T>
+			: $ResolveBranch<$O, [$Else]>
+		: $ResolveBranch<$O, [$Then], T>
 }

package/src/number/is_not_number_literal.ts

@@ -1,10 +1,15 @@
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { Assignable } from '../predicates/assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $IsDistributive } from '../type_plus/branch/$is_distributive.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -56,20 +61,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotNumberLiteral<string, $SelectionBranch> // $Then
  * ```
  */
-export type IsNotNumberLiteral<T, $O extends IsNotNumberLiteral.$Options = {}> = $SpecialType<
+export type IsNotNumberLiteral<T, $O extends IsNotNumberLiteral.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotNumberLiteral.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotNumberLiteral {
-	export type $Options = $Equality.$Options
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*
@@ -79,7 +87,7 @@ export namespace IsNotNumberLiteral {
 	 * This is a type util for building custom types.
 	 * It does not check against special types.
 	 */
-	export type $<T, $O extends $UtilOptions> = $IsDistributive<
+	export type $<T, $O extends $UtilOptions> = $Distributive.Parse<
 		$O,
 		{
 			$then: _D<T, $O>
@@ -91,12 +99,12 @@ export namespace IsNotNumberLiteral {
 
 	export type _D<T, $O extends $UtilOptions> = T extends number & infer U
 		? U extends number
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Then]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [$Then], T>
+		: $ResolveBranch<$O, [$Then], T>
 	export type _N<T, $O extends $UtilOptions> = [T] extends [number & infer U]
 		? U extends number
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Then]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [$Then], T>
+		: $ResolveBranch<$O, [$Then], T>
 }

package/src/number/is_number.ts

@@ -1,12 +1,16 @@
+import type { $ResolveOptions } from '../$type/$resolve_options.js'
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { Assignable } from '../predicates/assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $ResolveOptions } from '../type_plus/$resolve_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $ExactOptions } from '../type_plus/branch/$exact.js'
-import type { $IsDistributive } from '../type_plus/branch/$is_distributive.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -60,20 +64,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNumber<string, $SelectionBranch> // $Else
  * ```
  */
-export type IsNumber<T, $O extends IsNumber.$Options = {}> = $SpecialType<
+export type IsNumber<T, $O extends IsNumber.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsNumber.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNumber {
-	export type $Options = $Equality.$Options & $ExactOptions
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*
@@ -84,18 +91,18 @@ export namespace IsNumber {
 	 * It does not check against special types.
 	 */
 	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], false]> extends true
-		? $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
+		? $Distributive.Parse<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 		: Assignable.$<T, number, $O>
-	export type $UtilOptions = Assignable.$UtilOptions & $ExactOptions
+	export type $UtilOptions = Assignable.$UtilOptions & $Exact.Options
 
 	export type _D<T, $O extends $UtilOptions> = T extends number & infer U
 		? U extends number
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Else]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [$Then], T>
+		: $ResolveBranch<$O, [$Else]>
 	export type _N<T, $O extends $UtilOptions> = [T] extends [number & infer U]
 		? U extends number
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Else]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [$Then], T>
+		: $ResolveBranch<$O, [$Else]>
 }

package/src/number/is_number_literal.ts

@@ -1,10 +1,15 @@
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Special } from '../$type/special/$special.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
+import type { $MergeOptions } from '../$type/utils/$merge_options.js'
 import type { Assignable } from '../predicates/assignable.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $MergeOptions } from '../type_plus/$merge_options.js'
-import type { $SpecialType } from '../type_plus/$special_type.js'
-import type { $IsDistributive } from '../type_plus/branch/$is_distributive.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * 🎭 *predicate*
@@ -58,20 +63,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNumberLiteral<string, $SelectionBranch> // $Else
  * ```
  */
-export type IsNumberLiteral<T, $O extends IsNumberLiteral.$Options = {}> = $SpecialType<
+export type IsNumberLiteral<T, $O extends IsNumberLiteral.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsNumberLiteral.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNumberLiteral {
-	export type $Options = $Equality.$Options
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 
 	/**
 	 * 🧰 *type util*
@@ -81,18 +89,18 @@ export namespace IsNumberLiteral {
 	 * This is a type util for building custom types.
 	 * It does not check against special types.
 	 */
-	export type $<T, $O extends $UtilOptions> = $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
+	export type $<T, $O extends $UtilOptions> = $Distributive.Parse<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 
 	export type $UtilOptions = Assignable.$UtilOptions
 
 	export type _D<T, $O extends $UtilOptions> = T extends number & infer U
 		? U extends number
-			? $ResolveBranch<T, $O, [$Then]>
-			: $ResolveBranch<T, $O, [$Else]>
-		: $ResolveBranch<T, $O, [$Else]>
+			? $ResolveBranch<$O, [$Then], T>
+			: $ResolveBranch<$O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 	export type _N<T, $O extends $UtilOptions> = [T] extends [number & infer U]
 		? U extends number
-			? $ResolveBranch<T, $O, [$Then]>
-			: $ResolveBranch<T, $O, [$Else]>
-		: $ResolveBranch<T, $O, [$Else]>
+			? $ResolveBranch<$O, [$Then], T>
+			: $ResolveBranch<$O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 }

package/src/numeric/is_integer.ts

@@ -1,8 +1,14 @@
+import type { $InputOptions } from '../$type/branch/$input_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
+import type { $Distributive } from '../$type/distributive/$distributive.js'
+import type { $Exact } from '../$type/exact/$exact.js'
+import type { $Any } from '../$type/special/$any.js'
+import type { $Never } from '../$type/special/$never.js'
+import type { $Unknown } from '../$type/special/$unknown.js'
+import type { $Void } from '../$type/special/$void.js'
 import type { IsBigint } from '../bigint/is_bigint.js'
 import type { IsNumber } from '../number/is_number.js'
-import type { $Equality } from '../type_plus/$equality.js'
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
 
 /**
  * Is T an integer, including bigint.
@@ -19,36 +25,29 @@ export type IsInteger<T, $O extends IsInteger.$Options = {}> = IsNumber<
 	T,
 	{
 		distributive: $O['distributive']
-		$then: $Then
-		$else: $Else
-	}
-> extends infer R
-	? R extends $Then
-		? number extends T
-			? $ResolveBranch<number, $O, [$Then]> | $ResolveBranch<T, $O, [$Else]>
+		$then: number extends T
+			? $ResolveBranch<$O, [$Then], number> | $ResolveBranch<$O, [$Else]>
 			: T extends number & infer U
 				? `${T}` extends `${number}.${number}`
-					? $ResolveBranch<T, $O, [$Else]>
+					? $ResolveBranch<$O, [$Else]>
 					: [T, U] extends [U, T]
-						? $ResolveBranch<T, $O, [$Then]>
-						: $ResolveBranch<number, $O, [$Then]> | $ResolveBranch<T, $O, [$Else]>
-				: never
-		: R extends $Else
-			? IsBigint<
-					T,
-					{
-						distributive: $O['distributive']
-						$then: $Then
-						$else: $Else
-					}
-				> extends infer R
-				? R extends $Then
-					? $ResolveBranch<T, $O, [$Then]>
-					: $ResolveBranch<T, $O, [$Else]>
+						? $ResolveBranch<$O, [$Then], T>
+						: $ResolveBranch<$O, [$Then], number> | $ResolveBranch<$O, [$Else]>
 				: never
-			: never
-	: never
+		$else: IsBigint<
+			T,
+			{
+				distributive: $O['distributive']
+				$then: $ResolveBranch<$O, [$Then], T>
+				$else: $ResolveBranch<$O, [$Else]>
+			}
+		>
+	}
+>
 export namespace IsInteger {
-	export type $Options = $Equality.$Options
-	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>
+	export type $Options = $Selection.Options &
+		$Distributive.Options &
+		$Exact.Options &
+		$InputOptions<$Any | $Unknown | $Never | $Void>
+	export type $Branch<$O extends $Options = {}> = $Selection.Branch<$O>
 }