type-plus 6.0.0 → 6.2.0

package/ts/number_plus/number.ts

@@ -1,3 +1,6 @@
+import type { IsNever } from '../PrimitiveTypes.js'
+import type { IsAny } from '../any_plus/any.js'
+
 /**
  * Either number or bigint.
  */
@@ -16,12 +19,48 @@ export type Zero = 0 | 0n
  *
  * type R = Integer<0> // 0
  * type R = Integer<1.1> // never
+ * type R = Integer<number> // never as it contains non-integer
  *
  * type R = Integer<0, true, false> // true
  * type R = Integer<1.1, true, false> // false
  * ```
  */
-export type Integer<N extends Numeric, Then = N, Else = never> = `${N}` extends `${bigint}` ? Then : Else
+export type Integer<N extends Numeric, Then = N, Else = never> = IsNever<
+	N,
+	Else,
+	`${N}` extends `${bigint}` ? Then : Else
+>
+/**
+ * Check if the value is an integer.
+ *
+ * ```
+ * import type { IsInteger } from 'type-plus'
+ *
+ * type R = IsInteger<0> // 0
+ * type R = IsInteger<1.1> // never
+ * type R = IsInteger<number> // never as it contains non-integer
+ *
+ * type R = IsInteger<0, true, false> // true
+ * type R = IsInteger<1.1, true, false> // false
+ * ```
+ */
+export type IsInteger<N extends Numeric, Then = true, Else = false> = Integer<N, Then, Else>
+
+/**
+ * Check if the value is an integer.
+ *
+ * ```
+ * import type { IsWhole } from 'type-plus'
+ *
+ * type R = IsWhole<0> // 0
+ * type R = IsWhole<1.1> // never
+ * type R = IsWhole<number> // never as it contains non-integer
+ *
+ * type R = IsWhole<0, true, false> // true
+ * type R = IsWhole<1.1, true, false> // false
+ * ```
+ */
+export type IsWhole<N extends Numeric, Then = true, Else = false> = Integer<N, Then, Else>
 
 /**
  * Check if the value is a negative number.
@@ -36,11 +75,11 @@ export type Integer<N extends Numeric, Then = N, Else = never> = `${N}` extends
  * type R = Negative<1, true, false> // false
  * ```
  */
-export type Negative<N extends Numeric, Then = N, Else = never> = N extends Zero
-	? Else
-	: `${N}` extends `-${string}`
-	? Then
-	: Else
+export type Negative<N extends Numeric, Then = N, Else = never> = IsNever<
+	N,
+	Else,
+	N extends Zero ? Else : `${N}` extends `-${string}` ? Then : Else
+>
 
 /**
  * Check if the value it not a negative number.
@@ -56,3 +95,55 @@ export type Negative<N extends Numeric, Then = N, Else = never> = N extends Zero
  * ```
  */
 export type NonNegative<N extends Numeric, Then = N, Else = never> = Negative<N, Else, Then>
+
+/**
+ * Check if the type `T` is exactly the type `number` and not numeric literals.
+ *
+ * ```
+ * import type { NumberType } from 'type-plus'
+ *
+ * type R = NumberType<number> // true
+ * type R = NumberType<1> // false
+ * ```
+ */
+export type NumberType<T, Then = T, Else = never> = IsAny<
+	T,
+	Else,
+	[number, T] extends [T, number] ? Then : Else
+>
+
+/**
+ * Check if the value is a positive number.
+ *
+ * ```
+ * import type { Positive } from 'type-plus'
+ *
+ * type R = Positive<1> // 1
+ * type R = Positive<0> // never
+ * type R = Positive<-1> // never
+ *
+ * type R = Positive<1, true, false> // true
+ * type R = Positive<-1, true, false> // false
+ * ```
+ */
+export type Positive<N extends Numeric, Then = N, Else = never> = IsNever<
+	N,
+	Else,
+	number extends N ? Else : N extends Zero ? Then : `${N}` extends `-${string}` ? Else : Then
+>
+
+/**
+ * Is the value `N` a positive number.
+ *
+ * ```
+ * import type { IsPositive } from 'type-plus'
+ *
+ * type R = IsPositive<1> // true
+ * type R = IsPositive<0> // false
+ * type R = IsPositive<-1> // false
+ *
+ * type R = IsPositive<1, 'good', 'bad'> // 'good'
+ * type R = IsPositive<-1, 'good', 'bad> // 'bad'
+ * ```
+ */
+export type IsPositive<N extends Numeric, Then = true, Else = false> = Positive<N, Then, Else>

package/ts/object/IsDisjoint.ts

@@ -1,6 +1,6 @@
-import { And, Not } from '../predicates/index.js'
+import type { And, Not } from '../predicates/index.js'
 import type { AnyRecord } from './AnyRecord.js'
-import { HasKey } from './hasKey.js'
+import type { HasKey } from './hasKey.js'
 
 /**
  * Are the two records disjoint from each other.

package/ts/object/KeysWithDiffType.ts

@@ -1,4 +1,4 @@
-import { ValueOf } from './ValueOf.js'
+import type { ValueOf } from './ValueOf.js'
 import type { IsDisjoint } from './IsDisjoint.js'
 import type { AnyRecord } from './AnyRecord.js'
 

package/ts/object/KnownKeys.ts

@@ -2,7 +2,7 @@
 // known from Gerrit Birkeland @Gerrit0
 // https://github.com/Microsoft/TypeScript/issues/25987#issuecomment-408339599
 
-import { PrimitiveTypes } from '../PrimitiveTypes.js'
+import type { PrimitiveTypes } from '../PrimitiveTypes.js'
 
 // https://github.com/microsoft/TypeScript/issues/25987#issuecomment-441224690
 export type KnownKeys<T> = T extends PrimitiveTypes

package/ts/object/OptionalKeys.ts

@@ -1,4 +1,4 @@
-import { KeyTypes } from './KeyTypes.js'
+import type { KeyTypes } from './KeyTypes.js'
 
 export type OptionalKeys<O extends Record<KeyTypes, any>> = O extends unknown ? OptionalKeys._<O> : never
 

package/ts/object/Partial.ts

@@ -1,6 +1,6 @@
-import { UnionKeys } from '../UnionKeys.js'
-import { Omit } from './omit.js'
-import { Pick } from './pick.js'
+import type { UnionKeys } from '../UnionKeys.js'
+import type { Omit } from './omit.js'
+import type { Pick } from './pick.js'
 
 /**
  * Apply `Partial<>` on the selected properties.

package/ts/object/getField.ts

@@ -1,4 +1,4 @@
-import { UnionKeys } from '../UnionKeys.js'
+import type { UnionKeys } from '../UnionKeys.js'
 
 export function getField<T, TX extends Exclude<T, undefined | null>, K extends UnionKeys<TX>>(
 	subject: T,

package/ts/object/mapKey.ts

@@ -1,4 +1,4 @@
-import { KeyTypes } from './KeyTypes.js'
+import type { KeyTypes } from './KeyTypes.js'
 
 export function mapKey<R, S extends Record<KeyTypes, any>, T = any>(
 	subject: S,

package/ts/object/mapProperties.ts

@@ -1,6 +1,6 @@
 import type { AnyRecord } from './AnyRecord.js'
 import { reduceByKey } from './reduceKey.js'
-import { ValueOf } from './ValueOf.js'
+import type { ValueOf } from './ValueOf.js'
 
 /**
  * An Object-specific version of `map`.

package/ts/object/omit.ts

@@ -1,7 +1,8 @@
-import { AnyRecord, reduceByKey } from '../object/index.js'
-import { UnionKeys } from '../UnionKeys.js'
-import { Pick } from './pick.js'
+import type { UnionKeys } from '../UnionKeys.js'
+import type { AnyRecord } from './AnyRecord.js'
+import type { Pick } from './pick.js'
 import { record } from './record.js'
+import { reduceByKey } from './reduceKey.js'
 
 // by Titian Cernicova-Dragomir
 // https://github.com/microsoft/TypeScript/issues/28339#issuecomment-463577347

package/ts/object/pick.ts

@@ -1,4 +1,4 @@
-import { UnionKeys } from '../UnionKeys.js'
+import type { UnionKeys } from '../UnionKeys.js'
 import type { AnyRecord } from './AnyRecord.js'
 import { record } from './record.js'
 import { reduceByKey } from './reduceKey.js'

package/ts/predicates/Equal.ts

@@ -1,4 +1,4 @@
-import type { IsAny } from './IsAny.js'
+import type { IsAny } from '../any_plus/any.js'
 import type { And, Or } from './logical.js'
 
 /**

package/ts/predicates/index.ts

@@ -2,7 +2,6 @@ export * from './CanAssign.js'
 export type { Equal, IsEqual, IsNotEqual, NotEqual } from './Equal.js'
 export type { Extendable, IsExtend, IsNotExtend, NotExtendable } from './Extends.js'
 export type { If } from './If.js'
-export type { IsAny } from './IsAny.js'
 export type { IsEmptyObject } from './IsEmptyObject.js'
 export * from './isType.js'
 export type { And, Not, Or, Xor } from './logical.js'

package/ts/promise/PromiseValueMerge.ts

@@ -1,5 +1,3 @@
-import type { PromiseValue } from './PromiseValue.js'
-
 /**
  * Merging value types from multiple promises.
  */
@@ -14,13 +12,13 @@ export type PromiseValueMerge<
 	P8 extends Promise<any> = any,
 	P9 extends Promise<any> = any
 > = Promise<
-	PromiseValue<P1> &
-		PromiseValue<P2> &
-		PromiseValue<P3> &
-		PromiseValue<P4> &
-		PromiseValue<P5> &
-		PromiseValue<P6> &
-		PromiseValue<P7> &
-		PromiseValue<P8> &
-		PromiseValue<P9>
+	Awaited<P1> &
+		Awaited<P2> &
+		Awaited<P3> &
+		Awaited<P4> &
+		Awaited<P5> &
+		Awaited<P6> &
+		Awaited<P7> &
+		Awaited<P8> &
+		Awaited<P9>
 >

package/cjs/array_plus/_plus.d.ts

@@ -1,2 +0,0 @@
-export type * from './array.js';
-//# sourceMappingURL=_plus.d.ts.map

package/cjs/array_plus/_plus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.d.ts","sourceRoot":"","sources":["../../ts/array_plus/_plus.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA"}

package/cjs/array_plus/_plus.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.js","sourceRoot":"","sources":["../../ts/array_plus/_plus.ts"],"names":[],"mappings":""}

package/cjs/math/IsPositive.d.ts

@@ -1,7 +0,0 @@
-/**
- * Check if type of positive number literal
- * `number` type is false as it can be negative.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsPositive<N extends number, Then = true, Else = false> = number extends N ? Else : `${N}` extends `-${number}` ? Else : Then;
-//# sourceMappingURL=IsPositive.d.ts.map

package/cjs/math/IsPositive.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsPositive.d.ts","sourceRoot":"","sources":["../../ts/math/IsPositive.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,MAAM,SAAS,CAAC,GACnF,IAAI,GACJ,GAAG,CAAC,EAAE,SAAS,IAAI,MAAM,EAAE,GAC3B,IAAI,GACJ,IAAI,CAAA"}

package/cjs/math/IsPositive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsPositive.js","sourceRoot":"","sources":["../../ts/math/IsPositive.ts"],"names":[],"mappings":""}

package/cjs/math/IsWhole.d.ts

@@ -1,7 +0,0 @@
-/**
- * Check if type is whole number literal.
- * `number` type is false as it can be fractional.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsWhole<N extends number, Then = true, Else = false> = number extends N ? Else : `${N}` extends `${number}.${number}` ? Else : Then;
-//# sourceMappingURL=IsWhole.d.ts.map

package/cjs/math/IsWhole.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsWhole.d.ts","sourceRoot":"","sources":["../../ts/math/IsWhole.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,MAAM,SAAS,CAAC,GAChF,IAAI,GACJ,GAAG,CAAC,EAAE,SAAS,GAAG,MAAM,IAAI,MAAM,EAAE,GACpC,IAAI,GACJ,IAAI,CAAA"}

package/cjs/math/IsWhole.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsWhole.js","sourceRoot":"","sources":["../../ts/math/IsWhole.ts"],"names":[],"mappings":""}

package/cjs/number_plus/_plus.d.ts

@@ -1,2 +0,0 @@
-export type * from './number.js';
-//# sourceMappingURL=_plus.d.ts.map

package/cjs/number_plus/_plus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.d.ts","sourceRoot":"","sources":["../../ts/number_plus/_plus.ts"],"names":[],"mappings":"AAAA,mBAAmB,aAAa,CAAA"}

package/cjs/number_plus/_plus.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.js","sourceRoot":"","sources":["../../ts/number_plus/_plus.ts"],"names":[],"mappings":""}

package/cjs/predicates/IsAny.d.ts

@@ -1,3 +0,0 @@
-import type { IsExtend } from './Extends.js';
-export type IsAny<T, Then = true, Else = false> = boolean extends IsExtend<T, string> ? Then : Else;
-//# sourceMappingURL=IsAny.d.ts.map

package/cjs/predicates/IsAny.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsAny.d.ts","sourceRoot":"","sources":["../../ts/predicates/IsAny.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,OAAO,SAAS,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA"}

package/cjs/predicates/IsAny.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsAny.js","sourceRoot":"","sources":["../../ts/predicates/IsAny.ts"],"names":[],"mappings":""}

package/esm/array_plus/_plus.d.ts

@@ -1,2 +0,0 @@
-export type * from './array.js';
-//# sourceMappingURL=_plus.d.ts.map

package/esm/array_plus/_plus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.d.ts","sourceRoot":"","sources":["../../ts/array_plus/_plus.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA"}

package/esm/array_plus/_plus.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=_plus.js.map

package/esm/array_plus/_plus.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.js","sourceRoot":"","sources":["../../ts/array_plus/_plus.ts"],"names":[],"mappings":""}

package/esm/math/IsPositive.d.ts

@@ -1,7 +0,0 @@
-/**
- * Check if type of positive number literal
- * `number` type is false as it can be negative.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsPositive<N extends number, Then = true, Else = false> = number extends N ? Else : `${N}` extends `-${number}` ? Else : Then;
-//# sourceMappingURL=IsPositive.d.ts.map

package/esm/math/IsPositive.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsPositive.d.ts","sourceRoot":"","sources":["../../ts/math/IsPositive.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,MAAM,SAAS,CAAC,GACnF,IAAI,GACJ,GAAG,CAAC,EAAE,SAAS,IAAI,MAAM,EAAE,GAC3B,IAAI,GACJ,IAAI,CAAA"}

package/esm/math/IsPositive.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=IsPositive.js.map

package/esm/math/IsPositive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsPositive.js","sourceRoot":"","sources":["../../ts/math/IsPositive.ts"],"names":[],"mappings":""}

package/esm/math/IsWhole.d.ts

@@ -1,7 +0,0 @@
-/**
- * Check if type is whole number literal.
- * `number` type is false as it can be fractional.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsWhole<N extends number, Then = true, Else = false> = number extends N ? Else : `${N}` extends `${number}.${number}` ? Else : Then;
-//# sourceMappingURL=IsWhole.d.ts.map

package/esm/math/IsWhole.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsWhole.d.ts","sourceRoot":"","sources":["../../ts/math/IsWhole.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,MAAM,SAAS,CAAC,GAChF,IAAI,GACJ,GAAG,CAAC,EAAE,SAAS,GAAG,MAAM,IAAI,MAAM,EAAE,GACpC,IAAI,GACJ,IAAI,CAAA"}

package/esm/math/IsWhole.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=IsWhole.js.map

package/esm/math/IsWhole.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsWhole.js","sourceRoot":"","sources":["../../ts/math/IsWhole.ts"],"names":[],"mappings":""}

package/esm/number_plus/_plus.d.ts

@@ -1,2 +0,0 @@
-export type * from './number.js';
-//# sourceMappingURL=_plus.d.ts.map

package/esm/number_plus/_plus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.d.ts","sourceRoot":"","sources":["../../ts/number_plus/_plus.ts"],"names":[],"mappings":"AAAA,mBAAmB,aAAa,CAAA"}

package/esm/number_plus/_plus.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=_plus.js.map

package/esm/number_plus/_plus.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_plus.js","sourceRoot":"","sources":["../../ts/number_plus/_plus.ts"],"names":[],"mappings":""}

package/esm/predicates/IsAny.d.ts

@@ -1,3 +0,0 @@
-import type { IsExtend } from './Extends.js';
-export type IsAny<T, Then = true, Else = false> = boolean extends IsExtend<T, string> ? Then : Else;
-//# sourceMappingURL=IsAny.d.ts.map

package/esm/predicates/IsAny.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsAny.d.ts","sourceRoot":"","sources":["../../ts/predicates/IsAny.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,IAAI,OAAO,SAAS,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA"}

package/esm/predicates/IsAny.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=IsAny.js.map

package/esm/predicates/IsAny.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IsAny.js","sourceRoot":"","sources":["../../ts/predicates/IsAny.ts"],"names":[],"mappings":""}

package/ts/array_plus/_plus.ts

@@ -1 +0,0 @@
-export type * from './array.js'

package/ts/math/IsPositive.ts

@@ -1,10 +0,0 @@
-/**
- * Check if type of positive number literal
- * `number` type is false as it can be negative.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsPositive<N extends number, Then = true, Else = false> = number extends N
-	? Else
-	: `${N}` extends `-${number}`
-	? Else
-	: Then

package/ts/math/IsWhole.ts

@@ -1,10 +0,0 @@
-/**
- * Check if type is whole number literal.
- * `number` type is false as it can be fractional.
- * @see https://itnext.io/implementing-arithmetic-within-typescripts-type-system-a1ef140a6f6f
- */
-export type IsWhole<N extends number, Then = true, Else = false> = number extends N
-	? Else
-	: `${N}` extends `${number}.${number}`
-	? Else
-	: Then

package/ts/predicates/IsAny.ts

@@ -1,3 +0,0 @@
-import type { IsExtend } from './Extends.js'
-
-export type IsAny<T, Then = true, Else = false> = boolean extends IsExtend<T, string> ? Then : Else