fix: Support custom dates in insert operations

Author: avaly

src/__tests__/model.test.ts

@@ -1122,6 +1122,36 @@ describe('model', () => {
       expectType<Date>(result.updatedAt);
     });
 
+    test('timestamps schema with custom dates', async () => {
+      const date = new Date('2020-01-01T12:00:00');
+
+      const result = await timestampsModel.insertOne({
+        bar: 123,
+        createdAt: date,
+        foo: 'foo',
+        updatedAt: date,
+      });
+
+      expect(collection.insertOne).toHaveBeenCalledWith(
+        {
+          bar: 123,
+          createdAt: date,
+          foo: 'foo',
+          updatedAt: date,
+        },
+        { ignoreUndefined: true }
+      );
+
+      expectType<TimestampsDocument>(result);
+
+      expectType<ObjectId>(result._id);
+      expectType<string>(result.foo);
+      expectType<number>(result.bar);
+      expectType<Date | undefined>(result.ham);
+      expectType<Date>(result.createdAt);
+      expectType<Date>(result.updatedAt);
+    });
+
     test('throws error on failure', async () => {
       (collection.insertOne as jest.Mock).mockResolvedValue({ result: { ok: 0 } });
 
@@ -1219,15 +1249,29 @@ describe('model', () => {
     });
 
     test('timestamps schema', async () => {
+      (collection.insertMany as jest.Mock).mockResolvedValue({
+        acknowledged: true,
+        insertedCount: 3,
+        insertedIds: [new ObjectId(), new ObjectId(), new ObjectId()],
+      });
+
+      const date = new Date('2020-01-01T12:00:00');
       const result = await timestampsModel.insertMany([
         {
           bar: 123,
           foo: 'foo',
         },
         {
           bar: 456,
+          createdAt: date,
           foo: 'bar',
         },
+        {
+          bar: 789,
+          createdAt: date,
+          foo: 'ham',
+          updatedAt: date,
+        },
       ]);
 
       expect(collection.insertMany).toHaveBeenCalledWith(
@@ -1240,10 +1284,16 @@ describe('model', () => {
           },
           {
             bar: 456,
-            createdAt: expect.any(Date),
+            createdAt: date,
             foo: 'bar',
             updatedAt: expect.any(Date),
           },
+          {
+            bar: 789,
+            createdAt: date,
+            foo: 'ham',
+            updatedAt: date,
+          },
         ],
         { ignoreUndefined: true }
       );

src/model.ts

@@ -670,12 +670,12 @@ export function build<TSchema extends BaseSchema, TDefaults extends Partial<TSch
     ): Promise<TSchema[]> {
       const documents = docs.map((doc) => {
         return {
-          ...(model.defaults || {}),
-          ...doc,
           ...(model.hasTimestamps && {
             createdAt: new Date(),
             updatedAt: new Date(),
           }),
+          ...(model.defaults || {}),
+          ...doc,
         };
       });
 
@@ -720,12 +720,12 @@ export function build<TSchema extends BaseSchema, TDefaults extends Partial<TSch
       options?: InsertOneOptions
     ): Promise<TSchema> {
       const data = {
-        ...(model.defaults || {}),
-        ...doc,
         ...(model.hasTimestamps && {
           createdAt: new Date(),
           updatedAt: new Date(),
         }),
+        ...(model.defaults || {}),
+        ...doc,
       };
 
       // Casting to unknown first because TS complains here