fix: remove the function fields from the result type of mapped types

nestjs · Mar 18, 2023 · 56b5d0d · 56b5d0d
1 parent 936e0dc
commit 56b5d0d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/lib/intersection-type.helper.ts b/lib/intersection-type.helper.ts
@@ -6,6 +6,7 @@ import {
   inheritTransformationMetadata,
   inheritValidationMetadata,
 } from './type-helpers.utils';
+import { RemoveFieldsWithType } from './types/remove-fields-with-type.type';
 
 // https://stackoverflow.com/questions/50374908/transform-union-type-to-intersection-type
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
@@ -26,7 +27,10 @@ type ClassRefsToConstructors<T extends Type[]> = {
 // e.g. `Foo | Bar` becomes `Foo & Bar`
 // finally, returns `MappedType` passing the generated intersection type as a type argument
 type Intersection<T extends Type[]> = MappedType<
-  UnionToIntersection<ClassRefsToConstructors<T>[number]>
+  RemoveFieldsWithType<
+    UnionToIntersection<ClassRefsToConstructors<T>[number]>,
+    Function
+  >
 >;
 
 export function IntersectionType<T extends Type[]>(...classRefs: T) {
@@ -47,5 +51,6 @@ export function IntersectionType<T extends Type[]>(...classRefs: T) {
   Object.defineProperty(IntersectionClassType, 'name', {
     value: `Intersection${intersectedNames}`,
   });
+
   return IntersectionClassType as Intersection<T>;
 }
diff --git a/lib/omit-type.helper.ts b/lib/omit-type.helper.ts
@@ -5,11 +5,12 @@ import {
   inheritTransformationMetadata,
   inheritValidationMetadata,
 } from './type-helpers.utils';
+import { RemoveFieldsWithType } from './types/remove-fields-with-type.type';
 
 export function OmitType<T, K extends keyof T>(
   classRef: Type<T>,
   keys: readonly K[],
-): MappedType<Omit<T, (typeof keys)[number]>> {
+) {
   const isInheritedPredicate = (propertyKey: string) =>
     !keys.includes(propertyKey as K);
 
@@ -22,5 +23,7 @@ export function OmitType<T, K extends keyof T>(
   inheritValidationMetadata(classRef, OmitClassType, isInheritedPredicate);
   inheritTransformationMetadata(classRef, OmitClassType, isInheritedPredicate);
 
-  return OmitClassType as MappedType<Omit<T, (typeof keys)[number]>>;
+  return OmitClassType as MappedType<
+    RemoveFieldsWithType<Omit<T, (typeof keys)[number]>, Function>
+  >;
 }
diff --git a/lib/partial-type.helper.ts b/lib/partial-type.helper.ts
@@ -6,8 +6,9 @@ import {
   inheritTransformationMetadata,
   inheritValidationMetadata,
 } from './type-helpers.utils';
+import { RemoveFieldsWithType } from './types/remove-fields-with-type.type';
 
-export function PartialType<T>(classRef: Type<T>): MappedType<Partial<T>> {
+export function PartialType<T>(classRef: Type<T>) {
   abstract class PartialClassType {
     constructor() {
       inheritPropertyInitializers(this, classRef);
@@ -26,5 +27,8 @@ export function PartialType<T>(classRef: Type<T>): MappedType<Partial<T>> {
   Object.defineProperty(PartialClassType, 'name', {
     value: `Partial${classRef.name}`,
   });
-  return PartialClassType as MappedType<Partial<T>>;
+
+  return PartialClassType as MappedType<
+    RemoveFieldsWithType<Partial<T>, Function>
+  >;
 }
diff --git a/lib/pick-type.helper.ts b/lib/pick-type.helper.ts
@@ -5,11 +5,12 @@ import {
   inheritTransformationMetadata,
   inheritValidationMetadata,
 } from './type-helpers.utils';
+import { RemoveFieldsWithType } from './types/remove-fields-with-type.type';
 
 export function PickType<T, K extends keyof T>(
   classRef: Type<T>,
   keys: readonly K[],
-): MappedType<Pick<T, (typeof keys)[number]>> {
+) {
   const isInheritedPredicate = (propertyKey: string) =>
     keys.includes(propertyKey as K);
 
@@ -21,5 +22,7 @@ export function PickType<T, K extends keyof T>(
   inheritValidationMetadata(classRef, PickClassType, isInheritedPredicate);
   inheritTransformationMetadata(classRef, PickClassType, isInheritedPredicate);
 
-  return PickClassType as MappedType<Pick<T, (typeof keys)[number]>>;
+  return PickClassType as MappedType<
+    RemoveFieldsWithType<Pick<T, (typeof keys)[number]>, Function>
+  >;
 }