fix(): mapped types with renamed fields

nestjs · Sep 15, 2020 · c10360c · c10360c
1 parent 93e2a8e
commit c10360c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/lib/type-helpers/omit-type.helper.ts b/lib/type-helpers/omit-type.helper.ts
@@ -28,7 +28,7 @@ export function OmitType<T, K extends keyof T>(
   inheritTransformationMetadata(classRef, OmitObjectType, isInheritedPredicate);
 
   fields
-    .filter((item) => !keys.includes(item.schemaName as K))
+    .filter((item) => !keys.includes(item.name as K))
     .forEach((item) => {
       if (isFunction(item.typeFn)) {
         /**

diff --git a/lib/type-helpers/pick-type.helper.ts b/lib/type-helpers/pick-type.helper.ts
@@ -29,7 +29,7 @@ export function PickType<T, K extends keyof T>(
   inheritTransformationMetadata(classRef, PickObjectType, isInheritedPredicate);
 
   fields
-    .filter((item) => keys.includes(item.schemaName as K))
+    .filter((item) => keys.includes(item.name as K))
     .forEach((item) => {
       if (isFunction(item.typeFn)) {
         /**

diff --git a/tests/type-helpers/omit-type.helper.spec.ts b/tests/type-helpers/omit-type.helper.spec.ts
@@ -15,11 +15,14 @@ describe('OmitType', () => {
     @MinLength(10)
     @Field()
     password: string;
+
+    @Field({ name: 'id' })
+    _id: string;
   }
 
-  class UpdateUserDto extends OmitType(CreateUserDto, ['login']) {}
+  class UpdateUserDto extends OmitType(CreateUserDto, ['login', '_id']) {}
 
-  it('should inherit all fields except for "login"', () => {
+  it('should inherit all fields except for "login" and "_id"', () => {
     const { fields } = getFieldsAndDecoratorForType(
       Object.getPrototypeOf(UpdateUserDto),
     );

diff --git a/tests/type-helpers/pick-type.helper.spec.ts b/tests/type-helpers/pick-type.helper.spec.ts
@@ -15,15 +15,28 @@ describe('PickType', () => {
     @MinLength(10)
     @Field()
     password: string;
+
+    @Field({ name: 'id' })
+    _id: string;
   }
 
   class UpdateUserDto extends PickType(CreateUserDto, ['login']) {}
 
+  class UpdateUserWithIdDto extends PickType(CreateUserDto, ['_id']) {}
+
   it('should inherit "login" field', () => {
     const { fields } = getFieldsAndDecoratorForType(
       Object.getPrototypeOf(UpdateUserDto),
     );
     expect(fields.length).toEqual(1);
     expect(fields[0].name).toEqual('login');
   });
+
+  it('should inherit renamed "_id" field', () => {
+    const { fields } = getFieldsAndDecoratorForType(
+      Object.getPrototypeOf(UpdateUserWithIdDto),
+    );
+    expect(fields.length).toEqual(1);
+    expect(fields[0].name).toEqual('_id');
+  });
 });