Merge pull request #15326 from Automattic/8.13

8.13

Author: vkarpov15

lib/mongoose.js

@@ -179,6 +179,10 @@ Mongoose.prototype.setDriver = function setDriver(driver) {
     }
   }
 
+  if (driver.SchemaTypes != null) {
+    Object.assign(mongoose.Schema.Types, driver.SchemaTypes);
+  }
+
   const Connection = driver.Connection;
   const oldDefaultConnection = _mongoose.connections[0];
   _mongoose.connections = [new Connection(_mongoose)];

package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "bson": "^6.10.3",
     "kareem": "2.6.3",
-    "mongodb": "~6.14.0",
+    "mongodb": "~6.15.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",

test/driver.test.js

@@ -13,7 +13,7 @@ describe('driver', function() {
 
     class Collection {
       findOne(filter, options) { // eslint-disable-line no-unused-vars
-        return Promise.resolve({ answer: 42 });
+        return Promise.resolve({ answer: 42, date: '2023-10-01' });
       }
     }
     class Connection extends EventEmitter {
@@ -35,18 +35,34 @@ describe('driver', function() {
     const driver = {
       Collection,
       Connection,
-      plugins: [foo]
+      plugins: [foo],
+      SchemaTypes: {
+        DateString: class DateString extends mongoose.SchemaType {
+          constructor(key, options) {
+            super(key, options, 'DateString');
+          }
+
+          cast(val) {
+            if (typeof val !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(val)) {
+              throw new Error('DateString must be in format yyyy-mm-dd');
+            }
+            return val;
+          }
+        }
+      }
     };
 
     m.setDriver(driver);
     assert.deepStrictEqual(m.plugins.slice(mongoose.plugins.length), [[foo, undefined]]);
 
     await m.connect();
 
-    const Test = m.model('Test', m.Schema({ answer: Number }));
+    const Test = m.model('Test', m.Schema({ answer: Number, date: 'DateString' }));
 
     const res = await Test.findOne();
-    assert.deepEqual(res.toObject(), { answer: 42 });
+    assert.deepEqual(res.toObject(), { answer: 42, date: '2023-10-01' });
+
+    await assert.rejects(Test.create({ answer: 12, date: '2025-01' }), /path "date"/);
 
     function foo() {}
   });