fix(classes, core): add ability to map Date[] types (#399)

* fix(classes, core): add ability to map Date[] types instantiate.util.ts@classes and map@core weren't mapping Date[] types correctly. Add checks for this case. #397 * fix(pojos): adding pojos support for Date[] types Pojos instantiate util wasn't correctly handling Date[] types, adding support for them. #397 Co-authored-by: Roberto <macbookpro@Robertos-MacBook-Pro.local>
nartc · Jan 11, 2022 · cb27b1a · cb27b1a
1 parent 5a56529
commit cb27b1a
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 4 deletions.
diff --git a/packages/classes/src/lib/utils/instantiate.util.ts b/packages/classes/src/lib/utils/instantiate.util.ts
@@ -69,7 +69,9 @@ export function instantiate<TModel extends Dictionary<TModel>>(
     // if is Date, assign a new Date value if valueAtKey is defined, otherwise, undefined
     if (isDateConstructor(metaResult)) {
       const value = isDefined(valueAtKey)
-        ? new Date(valueAtKey as number)
+        ? Array.isArray(valueAtKey)
+          ? [...valueAtKey]
+          : new Date(valueAtKey as number)
         : undefined;
       setMutate(instance as Record<string, unknown>, key, value);
       continue;

diff --git a/packages/core/src/lib/map/map.ts b/packages/core/src/lib/map/map.ts
@@ -245,7 +245,7 @@ Original error: ${originalError}`;
       if (Array.isArray(mapInitializedValue)) {
         const [first] = mapInitializedValue;
         // if first item is a primitive
-        if (typeof first !== 'object') {
+        if (typeof first !== 'object' || first instanceof Date) {
           setMember(() => mapInitializedValue.slice());
           continue;
         }

diff --git a/packages/integration-test/src/lib/assert-vm.spec.ts b/packages/integration-test/src/lib/assert-vm.spec.ts
@@ -20,6 +20,22 @@ export function assertVm<
   expect(vm.last).toEqual(user.lastName);
   expect(vm.full).toEqual(user.firstName + ' ' + user.lastName);
 
+  if (user.logins.length) {
+    const lastModelLogin = user.logins[user.logins.length - 1];
+
+    expect(Array.isArray(vm.logins)).toBe(true);
+    expect(vm.logins).toHaveLength(user.logins.length);
+
+    for (let i = 0; i < user.logins.length; i++)
+      expect(vm.logins[i].getDate()).toEqual(user.logins[i].getDate());
+
+    expect(vm.lastLogin.toDateString()).toEqual(lastModelLogin.toDateString());
+  } else {
+    expect(Array.isArray(vm.logins)).toBe(true);
+    expect(vm.logins).toHaveLength(0);
+    expect(vm.lastLogin).toBeFalsy();
+  }
+
   expect(vm.profile.birthday).toEqual(user.profile.birthday.toDateString());
   expect(vm.profile.bio).toEqual(user.profile.bio);
 

diff --git a/packages/integration-test/src/lib/with-classes/fixtures/models/user.ts b/packages/integration-test/src/lib/with-classes/fixtures/models/user.ts
@@ -11,6 +11,8 @@ export class User {
   profile!: UserProfile;
   @AutoMap({ typeFn: () => Job })
   job!: Job;
+  @AutoMap()
+  logins: Date[];
 }
 
 export class UserVm {
@@ -26,4 +28,8 @@ export class UserVm {
   jobTitle!: string;
   @AutoMap()
   jobAnnualSalary!: number;
+  @AutoMap()
+  logins: Date[];
+  @AutoMap()
+  lastLogin?: Date;
 }
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts
@@ -14,6 +14,18 @@ const fullNameResolver: Resolver<
   },
 };
 
+const lastLoginResolver: Resolver<
+  User,
+  UserVm | PascalUserVm | SnakeUserVm,
+  Date
+> = {
+  resolve(source: User): Date {
+    return source.logins?.length
+      ? source.logins[source.logins.length - 1]
+      : null;
+  },
+};
+
 export const userProfile: MappingProfile = (mapper) => {
   mapper
     .createMap(User, UserVm)
@@ -25,7 +37,8 @@ export const userProfile: MappingProfile = (mapper) => {
       (d) => d.last,
       mapFrom((s) => s.lastName)
     )
-    .forMember((d) => d.full, mapFrom(fullNameResolver));
+    .forMember((d) => d.full, mapFrom(fullNameResolver))
+    .forMember((d) => d.lastLogin, mapFrom(lastLoginResolver));
 
   mapper
     .createMap(User, PascalUserVm)

diff --git a/packages/integration-test/src/lib/with-classes/utils/get-user.ts b/packages/integration-test/src/lib/with-classes/utils/get-user.ts
@@ -45,6 +45,11 @@ export function getUser(
   const user = new User();
   user.firstName = 'Chau';
   user.lastName = 'Tran';
+  user.logins = [
+    new Date('01/10/2021'),
+    new Date('05/11/2021'),
+    new Date('12/12/2021'),
+  ];
 
   const userJob = new Job();
   userJob.title = 'Developer';

diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/interfaces/user.interface.ts b/packages/integration-test/src/lib/with-pojos/fixtures/interfaces/user.interface.ts
@@ -7,6 +7,7 @@ export interface User {
   lastName: string;
   profile: UserProfile;
   job: Job;
+  logins: Date[];
 }
 
 export interface UserVm {
@@ -16,6 +17,8 @@ export interface UserVm {
   profile: UserProfileVm;
   jobTitle: string;
   jobAnnualSalary: number;
+  logins: Date[];
+  lastLogin?: Date;
 }
 
 export function createUserMetadata() {
@@ -24,6 +27,7 @@ export function createUserMetadata() {
     lastName: String,
     profile: 'UserProfile',
     job: 'Job',
+    logins: Date,
   });
   createMetadataMap('UserVm', {
     first: String,
@@ -32,5 +36,7 @@ export function createUserMetadata() {
     profile: 'UserProfileVm',
     jobTitle: String,
     jobAnnualSalary: Number,
+    logins: Date,
+    lastLogin: Date,
   });
 }
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts
@@ -31,6 +31,10 @@ export const userProfile: MappingProfile = (mapper) => {
     .forMember(
       (d) => d.full,
       mapFrom((s) => s.firstName + ' ' + s.lastName)
+    )
+    .forMember(
+      (d) => d.lastLogin,
+      mapFrom((s) => (s.logins?.length ? s.logins[s.logins.length - 1] : null))
     );
 
   mapper

diff --git a/packages/integration-test/src/lib/with-pojos/utils/get-user.ts b/packages/integration-test/src/lib/with-pojos/utils/get-user.ts
@@ -59,6 +59,11 @@ export function getUser(
     lastName: 'Tran',
     job: userJob,
     profile: userProfile,
+    logins: [
+      new Date('01/10/2021'),
+      new Date('05/11/2021'),
+      new Date('12/12/2021'),
+    ],
     ...(partials.user ?? {}),
   } as User;
 }

diff --git a/packages/pojos/src/lib/utils/instantiate.util.ts b/packages/pojos/src/lib/utils/instantiate.util.ts
@@ -42,7 +42,9 @@ export function instantiate<TModel extends Dictionary<TModel>>(
 
     if (isDateConstructor(metaResult)) {
       const value = isDefined(valueAtKey)
-        ? new Date(valueAtKey as number)
+        ? Array.isArray(valueAtKey)
+          ? [...valueAtKey]
+          : new Date(valueAtKey as number)
         : undefined;
       setMutate(obj as Record<string, unknown>, key, value);
       continue;