type-plus 8.0.0-beta.2 → 8.0.0-beta.3

package/src/mix_types/box.ts

@@ -25,43 +25,40 @@ import type { $Else, $SelectionBranch, $Then } from '../type_plus/branch/$select
  * Box<undefined> // never
  * ```
  */
-export type Box<T, Options extends Box.Options = Box.DefaultOptions> =
-	IsFunction<
-		T,
-		IsFunction.$Branch
-	> extends infer R
-	? R extends $Then ? Function
-	: IsObject<
-		T,
-		IsObject.$Branch<{ exact: true }>> extends infer R
-	? R extends $Then ? Object :
-	T extends Record<any, any> ? T :
-	IsBoolean<
-		T,
-		$SelectionBranch
-	> extends infer R
-	? R extends $Then ? Boolean
-	: R extends $Else ? IsNumber<
-		T,
-		IsNumber.$Branch
-	> extends infer R
-	? R extends $Then ? Number
-	: R extends $Else ? IsString<
-		T,
-		{
-			$then: String,
-			$else: IsSymbol<
-				T,
-				{
-					$then: Symbol,
-					$else: IsBigint<T, { $then: BigInt, $else: Options['$notBoxable'] }>
-				}
-			>
-		}
-	>
-	: never : never
-	: never : never
-	: never
+export type Box<T, Options extends Box.Options = Box.DefaultOptions> = IsFunction<T, IsFunction.$Branch> extends infer R
+	? R extends $Then
+		? Function
+		: IsObject<T, IsObject.$Branch<{ exact: true }>> extends infer R
+			? R extends $Then
+				? Object
+				: T extends Record<any, any>
+					? T
+					: IsBoolean<T, $SelectionBranch> extends infer R
+						? R extends $Then
+							? Boolean
+							: R extends $Else
+								? IsNumber<T, IsNumber.$Branch> extends infer R
+									? R extends $Then
+										? Number
+										: R extends $Else
+											? IsString<
+													T,
+													{
+														$then: String
+														$else: IsSymbol<
+															T,
+															{
+																$then: Symbol
+																$else: IsBigint<T, { $then: BigInt; $else: Options['$notBoxable'] }>
+															}
+														>
+													}
+												>
+											: never
+									: never
+								: never
+						: never
+			: never
 	: never
 
 export namespace Box {

package/src/mix_types/is_any_or_never.ts

@@ -22,10 +22,10 @@ import type { $SelectionOptions } from '../type_plus/branch/$selection_options.j
  * type R = IsAnyOrNever<'a', $SelectionPredicate> // false
  * ```
  */
-export type IsAnyOrNever<
+export type IsAnyOrNever<T, $O extends $SelectionOptions = $SelectionPredicate> = IsNever<
 	T,
-	$O extends $SelectionOptions = $SelectionPredicate
-> = IsNever<T, {
-	$then: $O['$then'],
-	$else: IsAny<T, $O>
-}>
+	{
+		$then: $O['$then']
+		$else: IsAny<T, $O>
+	}
+>

package/src/mix_types/merge.ts

@@ -20,42 +20,38 @@ import type { Box } from './box.js'
  *
  * This type does not have such restrictions, and tries to handle the other types accordingly.
  */
-export type Merge<A, B> =
+export type Merge<A, B> = Or<
+	IsNever<A>,
+	IsNever<B>,
+	never,
 	Or<
-		IsNever<A>,
-		IsNever<B>,
-		never,
+		IsVoid<A>,
+		IsVoid<B>,
+		A & B,
 		Or<
-			IsVoid<A>,
-			IsVoid<B>,
-			A & B,
+			IsUnknown<A>,
+			Or<IsUndefined<A>, IsNull<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: {} }>
-					>
-				>
+				IsUnknown<B>,
+				Or<IsUndefined<B>, IsNull<B>>,
+				A,
+				ObjectMerge<Box<A, { $notBoxable: {} }>, Box<B, { $notBoxable: {} }>>
 			>
 		>
 	>
+>
 
 /**
-* Left join `a` with `b`.
-*
-* This returns the proper type of `{ ...a, ...b }`
-*
-* @example
-* ```ts
-* merge({ a: 1 }, {} as { a?: string | undefined }) // { a: number | string }
-* ```
-*/
+ * Left join `a` with `b`.
+ *
+ * This returns the proper type of `{ ...a, ...b }`
+ *
+ * @example
+ * ```ts
+ * merge({ a: 1 }, {} as { a?: string | undefined }) // { a: number | string }
+ * ```
+ */
 export function merge<A, B>(a: A, b: B): Merge<A, B> {
 	return { ...a, ...b } as any
 }

package/src/never/is_never.ts

@@ -44,19 +44,22 @@ import type { $NotNever } from './never.js'
  * type R = IsNever<1, $SelectionBranch> // $Else
  * ```
  */
-export type IsNever<
+export type IsNever<T, $O extends IsNever.$Options = {}> = $SpecialType<
 	T,
-	$O extends IsNever.$Options = {}
-> = $SpecialType<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<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]>
+	}
+>
 
 export namespace IsNever {
 	export type $Options = $SelectionOptions & $InputOptions<$Any | $Unknown>
 	export type $Branch = $SelectionBranch
-	export type _O<$O extends $Options> = '$else' extends keyof $O ? $O :
-		$O['selection'] extends 'filter' ? $O & { $else: $NotNever } : $O
+	export type _O<$O extends $Options> = '$else' extends keyof $O
+		? $O
+		: $O['selection'] extends 'filter'
+			? $O & { $else: $NotNever }
+			: $O
 }

package/src/never/is_not_never.ts

@@ -44,19 +44,22 @@ import type { $Never } from './never.js'
  * type R = IsNotNever<1, $SelectionBranch> // $Then
  * ```
  */
-export type IsNotNever<
+export type IsNotNever<T, $O extends IsNotNever.$Options = {}> = $SpecialType<
 	T,
-	$O extends IsNotNever.$Options = {}
-> = $SpecialType<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<T, $O, [$Any, $Then]>
+		$unknown: $ResolveBranch<T, $O, [$Unknown, $Then]>
+		$never: $ResolveBranch<T, IsNotNever._O<$O>, [$Else]>
+		$else: $ResolveBranch<T, $O, [$Then]>
+	}
+>
 
 export namespace IsNotNever {
 	export type $Options = $SelectionOptions & $InputOptions<$Any | $Unknown>
 	export type $Branch = $SelectionBranch
-	export type _O<$O extends $Options> = '$else' extends keyof $O ? $O :
-		$O['selection'] extends 'filter' ? $O & { $else: $Never } : $O
+	export type _O<$O extends $Options> = '$else' extends keyof $O
+		? $O
+		: $O['selection'] extends 'filter'
+			? $O & { $else: $Never }
+			: $O
 }

package/src/nodejs/isNodeError.ts

@@ -1,17 +1,17 @@
 export type SystemErrors = {
-	EACCES: Error & { code: 'EACCES' },
-	EADDRINUSE: Error & { code: 'EADDRINUSE' },
-	ECONNREFUSED: Error,
-	ECONNRESET: Error,
-	EEXIST: Error,
-	EISDIR: Error,
-	EMFILE: Error,
-	ENOENT: Error & { code: 'ENOENT', path: string },
-	ENOTDIR: Error,
-	ENOTEMPTY: Error,
-	ENOTFOUND: Error,
-	EPERM: Error,
-	EPIPE: Error,
+	EACCES: Error & { code: 'EACCES' }
+	EADDRINUSE: Error & { code: 'EADDRINUSE' }
+	ECONNREFUSED: Error
+	ECONNRESET: Error
+	EEXIST: Error
+	EISDIR: Error
+	EMFILE: Error
+	ENOENT: Error & { code: 'ENOENT'; path: string }
+	ENOTDIR: Error
+	ENOTEMPTY: Error
+	ENOTFOUND: Error
+	EPERM: Error
+	EPIPE: Error
 	ETIMEDOUT: Error
 }
 

package/src/nominal/brand.ts

@@ -17,7 +17,7 @@ export type Brand<B extends string, T = never> = [T] extends [null] | [undefined
  * A branded type of `B` with value of `T`.
  */
 export interface Branded<B extends string, T> {
-	[typeSym]: B,
+	[typeSym]: B
 	[valueSym]: T
 }
 
@@ -30,10 +30,9 @@ export function brand<B extends string>(type: B): <T>(subject: T) => Brand<B, Wi
  */
 export function brand<B extends string, T>(type: B, subject: T): Brand<B, Widen<T>>
 export function brand(typeInput: string, subject?: unknown) {
-	if (subject === undefined)
-		return <T>(subject: T) => brand(typeInput, subject)
+	if (subject === undefined) return <T>(subject: T) => brand(typeInput, subject)
 
-	if (isType<{ [typeSym]: string }>(subject, s => typeof s === 'object' && s !== null)) {
+	if (isType<{ [typeSym]: string }>(subject, (s) => typeof s === 'object' && s !== null)) {
 		// if subject is not an object, the branding will exist only in type-level.
 		subject[typeSym] = typeInput
 	}

package/src/nominal/flavor.ts

@@ -26,7 +26,7 @@ export interface Flavored<F extends string> {
  * A special flavored type for special types.
  */
 export interface FlavoredUnit<F extends string, T> {
-	[typeSym]?: F,
+	[typeSym]?: F
 	[valueSym]: T
 }
 
@@ -39,10 +39,9 @@ export function flavor<F extends string>(type: F): <T>(subject: T) => Flavor<F,
  */
 export function flavor<F extends string, T>(type: F, subject: T): Flavor<F, Widen<T>>
 export function flavor(type: string, subject?: unknown) {
-	if (subject === undefined)
-		return <T>(subject: T) => flavor(type, subject)
+	if (subject === undefined) return <T>(subject: T) => flavor(type, subject)
 
-	if (isType<{ [typeSym]: string }>(subject, s => typeof s === 'object' && s !== null)) {
+	if (isType<{ [typeSym]: string }>(subject, (s) => typeof s === 'object' && s !== null)) {
 		// if subject is not an object, the branding will exist only in type-level.
 		subject[typeSym] = type
 	}

package/src/nominal/nominal_match.ts

@@ -2,20 +2,13 @@ import type { Brand } from './brand.js'
 import { typeSym } from './constants.js'
 import type { Flavor } from './flavor.js'
 
-export function nominalMatch<A extends string, B extends A>(
-	a: Brand<A, unknown>,
-	b: Brand<B, unknown>
-): boolean
-export function nominalMatch<A extends string, B extends A>(
-	a: Flavor<A, unknown>,
-	b: Flavor<B, unknown>
-): boolean
+export function nominalMatch<A extends string, B extends A>(a: Brand<A, unknown>, b: Brand<B, unknown>): boolean
+export function nominalMatch<A extends string, B extends A>(a: Flavor<A, unknown>, b: Flavor<B, unknown>): boolean
 export function nominalMatch<A extends string, B extends A>(
 	a: Brand<A, unknown> | Flavor<A, unknown>,
 	b: Brand<B, unknown> | Flavor<B, unknown>
 ) {
-	if (typeof a === 'object' && a !== null && typeof b === 'object' && b !== null)
-		return a[typeSym] === b[typeSym]
+	if (typeof a === 'object' && a !== null && typeof b === 'object' && b !== null) return a[typeSym] === b[typeSym]
 
 	return true
 }

package/src/null/is_not_null.ts

@@ -51,16 +51,17 @@ import type { $Then } from '../type_plus/branch/$selection.js'
  * type R = IsNotNull<null, $SelectionBranch> // $Else
  * ```
  */
-export type IsNotNull<T, $O extends IsNotNull.$Options = {}> = $SpecialType<T,
-	$MergeOptions<$O,
+export type IsNotNull<T, $O extends IsNotNull.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>,
+			$then: $ResolveBranch<T, $O, [$Then]>
 			$else: IsNotNull.$<T, $O>
 		}
 	>
 >
 
-
 export namespace IsNotNull {
 	export type $Options = $Equality.$Options
 	export type $Branch<$O extends $Options = {}> = $Equality.$Branch<$O>

package/src/null/is_null.ts

@@ -55,15 +55,16 @@ import type { $Else } from '../type_plus/branch/$selection.js'
  * type R = IsNull<string, $SelectionBranch> // $Else
  * ```
  */
-export type IsNull<T, $O extends IsNull.$Options = {}> =
-	$SpecialType<T,
-		$MergeOptions<$O,
-			{
-				$then: $ResolveBranch<T, $O, [$Else]>,
-				$else: IsNull.$<T, $O>
-			}
-		>
+export type IsNull<T, $O extends IsNull.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
+		{
+			$then: $ResolveBranch<T, $O, [$Else]>
+			$else: IsNull.$<T, $O>
+		}
 	>
+>
 
 export namespace IsNull {
 	export type $Options = $Equality.$Options

package/src/number/cast.ts

@@ -9,9 +9,9 @@
 export type StringToNumber<S extends string, Fail = never> = S extends `-0`
 	? 0
 	: S extends `${infer W}.0`
-	? StringToNumber<W>
-	: S extends `${infer W}.${infer F}0`
-	? StringToNumber<`${W}.${F}`>
-	: S extends `${infer N extends number}`
-	? N
-	: Fail
+		? StringToNumber<W>
+		: S extends `${infer W}.${infer F}0`
+			? StringToNumber<`${W}.${F}`>
+			: S extends `${infer N extends number}`
+				? N
+				: Fail

package/src/number/is_not_number.ts

@@ -57,10 +57,12 @@ 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<T,
-	$MergeOptions<$O,
+export type IsNotNumber<T, $O extends IsNotNumber.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>,
+			$then: $ResolveBranch<T, $O, [$Then]>
 			$else: IsNotNumber.$<T, $O>
 		}
 	>
@@ -78,22 +80,18 @@ export namespace IsNotNumber {
 	 * 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'], false]> extends true
-		? $IsDistributive<$O, { $then: _D<T, $O>, $else: _N<T, $O> }>
+	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], false]> extends true
+		? $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 		: NotAssignable.$<T, number, $O>
 	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]>
-	)
+	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]>
-	export type _N<T, $O extends IsNotNumber.$Options> =
-		[T] extends [number & infer U] ?
-		U extends number ? $ResolveBranch<T, $O, [$Then]>
-		: $ResolveBranch<T, $O, [$Else]>
+	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]>
 }

package/src/number/is_not_number_literal.ts

@@ -56,10 +56,12 @@ 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<T,
-	$MergeOptions<$O,
+export type IsNotNumberLiteral<T, $O extends IsNotNumberLiteral.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Then]>,
+			$then: $ResolveBranch<T, $O, [$Then]>
 			$else: IsNotNumberLiteral.$<T, $O>
 		}
 	>
@@ -77,25 +79,24 @@ 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<$O, {
-			$then: _D<T, $O>,
+	export type $<T, $O extends $UtilOptions> = $IsDistributive<
+		$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
+	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]>
-	export type _N<T, $O extends $UtilOptions> =
-		[T] extends [number & infer U] ?
-		U extends number ? $ResolveBranch<T, $O, [$Else]>
 		: $ResolveBranch<T, $O, [$Then]>
+	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]>
 }

package/src/number/is_number.ts

@@ -60,10 +60,12 @@ 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<T,
-	$MergeOptions<$O,
+export type IsNumber<T, $O extends IsNumber.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>,
+			$then: $ResolveBranch<T, $O, [$Else]>
 			$else: IsNumber.$<T, $O>
 		}
 	>
@@ -81,23 +83,19 @@ export namespace IsNumber {
 	 * 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'], false]> extends true
-		? $IsDistributive<$O, { $then: _D<T, $O>, $else: _N<T, $O> }>
+	export type $<T, $O extends $UtilOptions> = $ResolveOptions<[$O['exact'], false]> extends true
+		? $IsDistributive<$O, { $then: _D<T, $O>; $else: _N<T, $O> }>
 		: Assignable.$<T, number, $O>
 	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]>
-	)
+	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]>
-	export type _N<T, $O extends $UtilOptions> =
-		[T] extends [number & infer U] ?
-		U extends number ? $ResolveBranch<T, $O, [$Else]>
-		: $ResolveBranch<T, $O, [$Then]>
+	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]>
 }

package/src/number/is_number_literal.ts

@@ -58,10 +58,12 @@ 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<T,
-	$MergeOptions<$O,
+export type IsNumberLiteral<T, $O extends IsNumberLiteral.$Options = {}> = $SpecialType<
+	T,
+	$MergeOptions<
+		$O,
 		{
-			$then: $ResolveBranch<T, $O, [$Else]>,
+			$then: $ResolveBranch<T, $O, [$Else]>
 			$else: IsNumberLiteral.$<T, $O>
 		}
 	>
@@ -79,22 +81,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> = $IsDistributive<$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
+	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]>
-	export type _N<T, $O extends $UtilOptions> =
-		[T] extends [number & infer U] ?
-		U extends number ? $ResolveBranch<T, $O, [$Then]>
 		: $ResolveBranch<T, $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]>
 }