chore : implementation of Filter types

kakasoo · Jan 19, 2024 · 2c7acc6 · 2c7acc6
1 parent fd1bb58
commit 2c7acc6
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/types/array.type.ts b/src/types/array.type.ts
@@ -4,20 +4,24 @@ import { Equal, ObjectType } from './object.type';
 import { Primitive, ReadonlyOrNot } from './primitive.type';
 
 export namespace ArrayType {
- export type _FilterNull<AllowNull extends boolean, Target> = [
- ...(AllowNull extends false ? (Equal<Target, null> extends true ? [] : [Target]) : [Target]),
- ];
-
- export type _FilterUndefined<AllowUndefined extends boolean, Target> = [
- ...(AllowUndefined extends false ? (Equal<Target, undefined> extends true ? [] : [Target]) : [Target]),
- ];
+ export type _FilterNull<AllowNull extends boolean, Target> = AllowNull extends false
+ ? Equal<Target, null> extends true
+ ? never
+ : Target
+ : Target;
+
+ export type _FilterUndefined<AllowUndefined extends boolean, Target> = AllowUndefined extends false
+ ? Equal<Target, undefined> extends true
+ ? never
+ : Target
+ : Target;
 
  export type Filter<
  T extends ReadonlyOrNot<any[]>,
  AllowNull extends boolean,
  AllowUndefined extends boolean,
  > = T extends [infer First, ...infer Rest]
- ? [..._FilterNull<AllowNull, First>, Filter<Rest, AllowNull, AllowUndefined>]
+ ? [_FilterUndefined<AllowUndefined, _FilterNull<AllowNull, First>>, ...Filter<Rest, AllowNull, AllowUndefined>]
  : [];
 
  /**