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

package/src/string/is_string.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*
@@ -56,20 +60,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsString<bigint, $IsString.$Branch> // $Else
  * ```
  */
-export type IsString<T, $O extends IsString.$Options = {}> = $SpecialType<
+export type IsString<T, $O extends IsString.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsString.$<T, $O>
 		}
 	>
 >
 
 export namespace IsString {
-	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*
@@ -80,19 +87,19 @@ export namespace IsString {
 	 * 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, string, $O>
 
-	export type $UtilOptions = Assignable.$UtilOptions & $ExactOptions
+	export type $UtilOptions = Assignable.$UtilOptions & $Exact.Options
 
 	export type _D<T, $O extends $UtilOptions> = T extends string & infer U
 		? U extends string
-			? $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 [string & infer U]
 		? U extends string
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Else]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [$Then], T>
+		: $ResolveBranch<$O, [$Else]>
 }

package/src/string/is_string_literal.ts

@@ -1,13 +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 { $ExactDefault, $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'
-import type { $SelectionOptions } from '../type_plus/branch/$selection_options.js'
 import type { _StringType } from './_string_type.js'
 
 /**
@@ -68,20 +71,23 @@ import type { _StringType } from './_string_type.js'
  * type R = IsStringLiteral<string, $IsStringLiteral.$Branch> // $Else
  * ```
  */
-export type IsStringLiteral<T, $O extends IsStringLiteral.$Options = {}> = $SpecialType<
+export type IsStringLiteral<T, $O extends IsStringLiteral.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsStringLiteral.$<T, $O>
 		}
 	>
 >
 
 export namespace IsStringLiteral {
-	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*
@@ -91,37 +97,37 @@ export namespace IsStringLiteral {
 	 * This is a type util for building custom types.
 	 * It does not check against special types.
 	 */
-	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], $ExactDefault]> extends true
-		? $IsDistributive<$O, { $then: _ED<T, $O>; $else: _EN<T, $O> }>
-		: $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
+	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], $Exact.Default]> extends true
+		? $Distributive.Parse<$O, { $then: _ED<T, $O>; $else: _EN<T, $O> }>
+		: $Distributive.Parse<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 
-	export type $UtilOptions = Assignable.$UtilOptions & $ExactOptions
+	export type $UtilOptions = Assignable.$UtilOptions & $Exact.Options
 
-	export type _ED<T, $O extends $SelectionOptions> = T extends string ? _E<T, $O> : $ResolveBranch<T, $O, [$Else]>
+	export type _ED<T, $O extends $Selection.Options> = T extends string ? _E<T, $O> : $ResolveBranch<$O, [$Else]>
 
-	export type _EN<T, $O extends $SelectionOptions> = [T] extends [string] ? _E<T, $O> : $ResolveBranch<T, $O, [$Else]>
+	export type _EN<T, $O extends $Selection.Options> = [T] extends [string] ? _E<T, $O> : $ResolveBranch<$O, [$Else]>
 
-	export type _E<T extends string, $O extends $SelectionOptions> = T extends string
+	export type _E<T extends string, $O extends $Selection.Options> = T extends string
 		? _StringType<T> extends infer R
 			? R extends 'stringLiteral'
-				? $ResolveBranch<T, $O, [$Then]>
-				: $ResolveBranch<T, $O, [$Else]>
+				? $ResolveBranch<$O, [$Then], T>
+				: $ResolveBranch<$O, [$Else]>
 			: never
-		: $ResolveBranch<T, $O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 
-	export type _D<T, $O extends $SelectionOptions> = T extends string & infer U
+	export type _D<T, $O extends $Selection.Options> = T extends string & infer U
 		? _U<T, U, $O>
-		: $ResolveBranch<T, $O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 
-	export type _N<T, $O extends $SelectionOptions> = [T] extends [string & infer U]
+	export type _N<T, $O extends $Selection.Options> = [T] extends [string & infer U]
 		? _U<T, U, $O>
-		: $ResolveBranch<T, $O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 
-	export type _U<T, U, $O extends $SelectionOptions> = U extends `${any}`
-		? $ResolveBranch<T, $O, [$Then]>
+	export type _U<T, U, $O extends $Selection.Options> = U extends `${any}`
+		? $ResolveBranch<$O, [$Then], T>
 		: U extends Uppercase<infer N>
 			? _D<N, $O>
 			: U extends Lowercase<infer N>
 				? _D<N, $O>
-				: $ResolveBranch<T, $O, [$Else]>
+				: $ResolveBranch<$O, [$Else]>
 }

package/src/string/is_template_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'
 import type { _StringType } from './_string_type.js'
 
 /**
@@ -54,36 +59,39 @@ import type { _StringType } from './_string_type.js'
  * type R = IsTemplateLiteral<bigint, $IsString.$Branch> // $Else
  * ```
  */
-export type IsTemplateLiteral<T, $O extends IsTemplateLiteral.$Options = {}> = $SpecialType<
+export type IsTemplateLiteral<T, $O extends IsTemplateLiteral.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsTemplateLiteral.$<T, $O>
 		}
 	>
 >
 
 export namespace IsTemplateLiteral {
-	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>
 
 	export type $UtilOptions = Assignable.$UtilOptions
 
-	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> }>
 
 	type _D<T, $O extends $UtilOptions> = T extends string
 		? _StringType<T> extends infer R
 			? R extends 'templateLiteral'
-				? $ResolveBranch<T, $O, [$Then]>
-				: $ResolveBranch<T, $O, [$Else]>
+				? $ResolveBranch<$O, [$Then], T>
+				: $ResolveBranch<$O, [$Else]>
 			: never
-		: $ResolveBranch<T, $O, [$Else]>
+		: $ResolveBranch<$O, [$Else]>
 
 	type _N<T, $O extends $UtilOptions> = _D<T, { $then: $Then; $else: $Else }> extends infer R
 		? $Then | $Else extends R
-			? $ResolveBranch<T, $O, [$Else]>
-			: $ResolveBranch<T, $O, [R]>
+			? $ResolveBranch<$O, [$Else]>
+			: $ResolveBranch<$O, [R], T>
 		: never
 }

package/src/symbol/is_not_symbol.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 = IsNotSymbol<symbol, $SelectionBranch> // $Else
  * ```
  */
-export type IsNotSymbol<T, $O extends IsNotSymbol.$Options = {}> = $SpecialType<
+export type IsNotSymbol<T, $O extends IsNotSymbol.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotSymbol.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotSymbol {
-	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/symbol/is_symbol.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*
@@ -53,20 +59,23 @@ import type { $Else } from '../type_plus/branch/$selection.js'
  * type R = IsSymbol<string, $SelectionBranch> // $Else
  * ```
  */
-export type IsSymbol<T, $O extends IsSymbol.$Options = {}> = $SpecialType<
+export type IsSymbol<T, $O extends IsSymbol.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsSymbol.$<T, $O>
 		}
 	>
 >
 
 export namespace IsSymbol {
-	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/testing/stub.ts

@@ -2,7 +2,6 @@ import { requiredDeep } from 'unpartial'
 
 import type { AnyFunction } from '../function/any_function.js'
 import type { RecursivePartial } from '../object/recursive_partial.js'
-import type { NoInfer } from '../type/no_infer.js'
 
 /**
  * stub a value.

package/src/testing/test_type.ts

@@ -4,7 +4,7 @@ import type { IsBigint } from '../bigint/is_bigint.js'
 import type { IsBoolean } from '../boolean/is_boolean.js'
 import type { IsFalse } from '../boolean/is_false.js'
 import type { IsTrue } from '../boolean/is_true.js'
-import type { IsEqual } from '../equal/equal.js'
+import type { IsEqual } from '../equal/is_equal.js'
 import type { IsFunction } from '../function/is_function.js'
 import type { IsStrictFunction } from '../function/is_strict_function.js'
 import type { IsNever } from '../never/is_never.js'

package/src/tuple/is_not_tuple.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 { 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 { $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*
@@ -55,20 +60,24 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotTuple<[], IsNotTuple.$Branch> // $Else
  * ```
  */
-export type IsNotTuple<T, $O extends IsNotTuple.$Options = {}> = $SpecialType<
+export type IsNotTuple<T, $O extends IsNotTuple.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotTuple.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotTuple {
-	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>
+
 	// export type $Default = $Select.$Default
 
 	/**
@@ -79,19 +88,19 @@ export namespace IsNotTuple {
 	 * 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: T extends readonly any[]
 				? number extends T['length']
-					? $ResolveBranch<T, $O, [$Then]>
-					: $ResolveBranch<T, $O, [$Else]>
-				: $ResolveBranch<T, $O, [$Then]>
+					? $ResolveBranch<$O, [$Then], T>
+					: $ResolveBranch<$O, [$Else]>
+				: $ResolveBranch<$O, [$Then], T>
 			$else: [T] extends [readonly any[]]
 				? number extends T['length']
-					? $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/tuple/is_tuple.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*
@@ -53,20 +58,23 @@ import type { $Else, $Then } from '../type_plus/branch/$selection.js'
  * type R = IsTuple<string, IsTuple.$Branch> // $Else
  * ```
  */
-export type IsTuple<T, $O extends IsTuple.$Options = {}> = $SpecialType<
+export type IsTuple<T, $O extends IsTuple.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>
+			$then: $ResolveBranch<$O, [$Else]>
 			$else: IsTuple.$<T, $O>
 		}
 	>
 >
 
 export namespace IsTuple {
-	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*
@@ -76,19 +84,19 @@ export namespace IsTuple {
 	 * 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: T extends readonly any[]
 				? number extends T['length']
-					? $ResolveBranch<T, $O, [$Else]>
-					: $ResolveBranch<T, $O, [$Then]>
-				: $ResolveBranch<T, $O, [$Else]>
+					? $ResolveBranch<$O, [$Else]>
+					: $ResolveBranch<$O, [$Then], T>
+				: $ResolveBranch<$O, [$Else]>
 			$else: [T] extends [readonly any[]]
 				? number extends T['length']
-					? $ResolveBranch<T, $O, [$Else]>
-					: $ResolveBranch<T, $O, [$Then]>
-				: $ResolveBranch<T, $O, [$Else]>
+					? $ResolveBranch<$O, [$Else]>
+					: $ResolveBranch<$O, [$Then], T>
+				: $ResolveBranch<$O, [$Else]>
 		}
 	>
 

package/src/tuple/tuple_plus.common_prop_keys.ts

@@ -1,5 +1,5 @@
+import type { $Never } from '../$type/special/$never.js'
 import type { IsNever } from '../never/is_never.js'
-import type { $Never } from '../never/never.js'
 import type { KeyTypes } from '../object/KeyTypes.js'
 import type { Tail } from './tail.js'
 

package/src/tuple/tuple_plus.drop_match.ts

@@ -1,4 +1,4 @@
-import type { IsEqual } from '../equal/equal.js'
+import type { IsEqual } from '../equal/is_equal.js'
 
 export type DropMatch<A extends Readonly<Array<unknown>>, Criteria> = A['length'] extends 0
 	? // empty tuple

package/src/tuple/tuple_plus.find.ts

@@ -1,5 +1,5 @@
+import type { $Never } from '../$type/special/$never.js'
 import type { ElementMatch } from '../array/array_plus.element_match.js'
-import type { $Never } from '../never/never.js'
 import type { TypePlusOptions } from '../utils/options.js'
 import type { IsTuple } from './is_tuple.js'
 

package/src/type-guard/is_type.ts

@@ -1,4 +1,4 @@
-import type { IsEqual } from '../equal/equal.js'
+import type { IsEqual } from '../equal/is_equal.js'
 
 /**
  * Is the subject of type T

package/src/undefined/has_undefined.ts

@@ -1,6 +1,5 @@
-import type { $ResolveBranch } from '../type_plus/branch/$resolve_branch.js'
-import type { $Else, $Then } from '../type_plus/branch/$selection.js'
-import type { $SelectionOptions } from '../type_plus/branch/$selection_options.js'
+import type { $ResolveBranch } from '../$type/branch/$resolve_branch.js'
+import type { $Else, $Selection, $Then } from '../$type/branch/$selection.js'
 import type { IsUndefined } from './is_undefined.js'
 
 /**
@@ -38,8 +37,8 @@ import type { IsUndefined } from './is_undefined.js'
  * type R = HasUndefined<string, $SelectionBranch> // $Else
  * ```
  */
-export type HasUndefined<T, $O extends $SelectionOptions = {}> = $ResolveBranch<
-	T,
+export type HasUndefined<T, $O extends $Selection.Options = {}> = $ResolveBranch<
 	$O,
-	[IsUndefined<T> extends false ? $Else : $Then]
+	[IsUndefined<T> extends false ? $Else : $Then],
+	T
 >

package/src/undefined/is_not_undefined.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*
@@ -52,20 +58,23 @@ import type { $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotUndefined<undefined, $SelectionBranch> // $Else
  * ```
  */
-export type IsNotUndefined<T, $O extends IsNotUndefined.$Options = {}> = $SpecialType<
+export type IsNotUndefined<T, $O extends IsNotUndefined.$Options = {}> = $Special<
 	T,
 	$MergeOptions<
 		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>
+			$then: $ResolveBranch<$O, [$Then], T>
 			$else: IsNotUndefined.$<T, $O>
 		}
 	>
 >
 
 export namespace IsNotUndefined {
-	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*