type-plus 4.8.1 → 4.8.2

package/cjs/math/GreaterThan.d.ts

@@ -7,5 +7,5 @@ import type { Max } from './Max';
 export declare type GreaterThan<A extends number, B extends number, Fail = never> = And<And<IsPositive<A>, IsWhole<A>>, And<IsPositive<B>, IsWhole<B>>> extends false ? Fail : number extends A ? Fail : number extends B ? Fail : Equal<A, B> extends true ? false : GreaterThan.OnPositiveWhole<A, B>;
 export declare namespace GreaterThan {
     type OnPositiveWhole<A extends number, B extends number> = (DigitArray.FromNumber<A> extends infer DA ? DA extends number[] ? DigitArray.FromNumber<B> extends infer DB ? DB extends number[] ? Max<DA['length'], DB['length']> extends infer M ? M extends number ? PadLeft<DA, M, 0> extends infer PDA ? PDA extends number[] ? PadLeft<DB, M, 0> extends infer PDB ? PDB extends number[] ? OnDigitArray<PDA, PDB> : never : never : never : never : never : never : never : never : never : never);
-    type OnDigitArray<DA extends number[], DB extends number[]> = (Equal<Head<DA>, Head<DB>> extends true ? OnDigitArray<Tail<DA>, Tail<DB>> extends Tail<DA> ? true : false : Digit.GreaterThan<Head<DA>, Head<DB>> extends true ? true : false);
+    type OnDigitArray<DA extends number[], DB extends number[]> = (Equal<Head<DA>, Head<DB>> extends true ? OnDigitArray<Tail<DA>, Tail<DB>> : Digit.GreaterThan<Head<DA>, Head<DB>>);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-plus",
-  "version": "4.8.1",
+  "version": "4.8.2",
   "description": "Provides additional types for TypeScript.",
   "homepage": "https://github.com/unional/type-plus",
   "bugs": {

package/ts/math/GreaterThan.spec.ts

@@ -1,40 +1,43 @@
-import { GreaterThan, isType } from '..'
-
-test('only support positive and whole number', () => {
-  isType.equal<true, never, GreaterThan<0.1, 1>>()
-  isType.equal<true, never, GreaterThan<-1, 1>>()
-  isType.equal<true, never, GreaterThan<1, 0.1>>()
-  isType.equal<true, never, GreaterThan<1, -1>>()
-})
-
-test('number gets never', () => {
-  isType.equal<true, never, GreaterThan<number, 1>>()
-  isType.equal<true, never, GreaterThan<1, number>>()
-})
-
-test('override Fail case', () => {
-  isType.equal<true, number, GreaterThan<number, 1, number>>()
-})
-
-test('n > n is false', () => {
-  isType.f<GreaterThan<0, 0>>()
-  isType.f<GreaterThan<1, 1>>()
-  isType.f<GreaterThan<12, 12>>()
-})
-
-test('with same number of digits', () => {
-  isType.t<GreaterThan<1, 0>>()
-  isType.t<GreaterThan<22, 11>>()
-  isType.t<GreaterThan<20, 19>>()
-
-  isType.f<GreaterThan<0, 1>>()
-  isType.f<GreaterThan<11, 22>>()
-  isType.f<GreaterThan<19, 20>>()
-})
-
-test('with different number of digits', () => {
-  isType.f<GreaterThan<0, 1>>()
-  isType.f<GreaterThan<9, 100>>()
-  isType.t<GreaterThan<10, 1>>()
-  isType.t<GreaterThan<123, 32>>()
-})
+import { GreaterThan, isType } from '..'
+
+test('only support positive and whole number', () => {
+  isType.equal<true, never, GreaterThan<0.1, 1>>()
+  isType.equal<true, never, GreaterThan<-1, 1>>()
+  isType.equal<true, never, GreaterThan<1, 0.1>>()
+  isType.equal<true, never, GreaterThan<1, -1>>()
+})
+
+test('number gets never', () => {
+  isType.equal<true, never, GreaterThan<number, 1>>()
+  isType.equal<true, never, GreaterThan<1, number>>()
+})
+
+test('override Fail case', () => {
+  isType.equal<true, number, GreaterThan<number, 1, number>>()
+})
+
+test('n > n is false', () => {
+  isType.f<GreaterThan<0, 0>>()
+  isType.f<GreaterThan<1, 1>>()
+  isType.f<GreaterThan<12, 12>>()
+})
+
+test('with same number of digits', () => {
+  isType.t<GreaterThan<1, 0>>()
+  isType.t<GreaterThan<22, 11>>()
+  isType.t<GreaterThan<20, 19>>()
+  isType.t<GreaterThan<19, 10>>()
+
+  isType.f<GreaterThan<0, 1>>()
+  isType.f<GreaterThan<11, 22>>()
+  isType.f<GreaterThan<19, 20>>()
+  isType.f<GreaterThan<10, 19>>()
+})
+
+test('with different number of digits', () => {
+  isType.f<GreaterThan<0, 1>>()
+  isType.f<GreaterThan<9, 100>>()
+  isType.t<GreaterThan<10, 1>>()
+  isType.t<GreaterThan<123, 32>>()
+  isType.t<GreaterThan<123, 13>>()
+})

package/ts/math/GreaterThan.ts

@@ -31,8 +31,8 @@ export namespace GreaterThan {
   )
 
   export type OnDigitArray<DA extends number[], DB extends number[]> = (
-    Equal<Head<DA>, Head<DB>> extends true ?
-    OnDigitArray<Tail<DA>, Tail<DB>> extends Tail<DA> ? true : false :
-    Digit.GreaterThan<Head<DA>, Head<DB>> extends true ? true : false
+    Equal<Head<DA>, Head<DB>> extends true
+    ? OnDigitArray<Tail<DA>, Tail<DB>>
+    : Digit.GreaterThan<Head<DA>, Head<DB>>
   )
 }