deps(global)!: bump mongoose to 8.x (#30)

* deps(global)!: bump mongoose to 8.x

BREAKING-CHANGE: drop mongo 4.x support

* refactor(adapter-mongoose): migrate unit tests to mongodb-memory-server

* refactor(adapter-mongoose): fix mongo-specific tests

Author: SavelevMatthew

.github/workflows/tests.yml

@@ -71,7 +71,7 @@ jobs:
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
       - name: Unit tests
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
-        run: yarn jest --ci --maxWorkers=1 api-tests
+        run: yarn jest --ci --maxWorkers=1 api-tests --forceExit
         env:
           CLOUDINARY_CLOUD_NAME: keystone-cloudinary
           CLOUDINARY_KEY: 758252673115372

package.json

@@ -26,6 +26,7 @@
     "lint:types": "tsc",
     "lint": "yarn lint:prettier && yarn lint:eslint && yarn lint:markdown && yarn lint:types",
     "test": "yarn lint && yarn test:unit && yarn cypress:run",
+    "test:api": "yarn jest --ci --maxWorkers=1 api-tests",
     "test:unit": "cross-env DISABLE_LOGGING=true NODE_ENV=test jest --no-watchman --maxWorkers=1 --logHeapUsage",
     "test:unit:debug": "cross-env NODE_ENV=test node --inspect-brk `which jest` --runInBand",
     "benchmark": "yarn workspace @open-keystone/benchmarks go",

packages/adapter-mongoose/lib/adapter-mongoose.js

@@ -31,7 +31,7 @@ class MongooseAdapter extends BaseKeystoneAdapter {
     this.listAdapterClass = MongooseListAdapter;
     this.name = 'mongoose';
     this.mongoose = new mongoose.Mongoose();
-    this.minVer = '4.0.0';
+    this.minVer = '5.0.0';
     if (debugMongoose()) {
       this.mongoose.set('debug', true);
     }
@@ -56,12 +56,7 @@ class MongooseAdapter extends BaseKeystoneAdapter {
       throw new Error(`No MongoDB connection URI specified.`);
     }
 
-    await this.mongoose.connect(uri, {
-      useNewUrlParser: true,
-      useFindAndModify: false,
-      useUnifiedTopology: true,
-      ...mongooseConfig,
-    });
+    await this.mongoose.connect(uri, mongooseConfig);
   }
   async postConnect({ rels }) {
     // Setup all schemas
@@ -345,8 +340,8 @@ class MongooseListAdapter extends BaseListAdapter {
           return (
             await this._getModel(tableName).create(
               values.map(id => ({
-                [near]: mongoose.Types.ObjectId(itemId),
-                [far]: mongoose.Types.ObjectId(id),
+                [near]: new mongoose.Types.ObjectId(itemId),
+                [far]: new mongoose.Types.ObjectId(id),
               }))
             )
           ).map(x => x[far]);
@@ -420,7 +415,7 @@ class MongooseListAdapter extends BaseListAdapter {
         }
         const currentRefIds = (
           await this._getModel(tableName).aggregate([
-            { $match: { [matchCol]: mongoose.Types.ObjectId(item.id) } },
+            { $match: { [matchCol]: new mongoose.Types.ObjectId(item.id) } },
           ])
         ).map(x => x[selectCol].toString());
 
@@ -431,12 +426,12 @@ class MongooseListAdapter extends BaseListAdapter {
             await this._getModel(tableName).deleteMany({
               $and: [
                 { [matchCol]: { $eq: item._id } },
-                { [selectCol]: { $in: needsDelete.map(id => mongoose.Types.ObjectId(id)) } },
+                { [selectCol]: { $in: needsDelete.map(id => new mongoose.Types.ObjectId(id)) } },
               ],
             });
           } else {
             await this._getModel(tableName).updateMany(
-              { [selectCol]: { $in: needsDelete.map(id => mongoose.Types.ObjectId(id)) } },
+              { [selectCol]: { $in: needsDelete.map(id => new mongoose.Types.ObjectId(id)) } },
               { [columnName]: null }
             );
           }
@@ -457,7 +452,7 @@ class MongooseListAdapter extends BaseListAdapter {
   }
 
   async _delete(id) {
-    id = mongoose.Types.ObjectId(id);
+    id = new mongoose.Types.ObjectId(id);
     // Traverse all other lists and remove references to this item
     // We can't just traverse our own fields, because we might have been
     // a silent partner in a relationship, so we have no self-knowledge of it.
@@ -521,14 +516,14 @@ class MongooseListAdapter extends BaseListAdapter {
         ids = await this._getModel(tableName).aggregate([
           {
             $match: {
-              [columnNames[columnKey].near]: { $eq: mongoose.Types.ObjectId(from.fromId) },
+              [columnNames[columnKey].near]: { $eq: new mongoose.Types.ObjectId(from.fromId) },
             },
           },
         ]);
         ids = ids.map(x => x[columnNames[columnKey].far]);
       } else {
         ids = await this._getModel(tableName).aggregate([
-          { $match: { [columnName]: mongoose.Types.ObjectId(from.fromId) } },
+          { $match: { [columnName]: new mongoose.Types.ObjectId(from.fromId) } },
         ]);
         ids = ids.map(x => x._id);
       }

packages/adapter-mongoose/package.json

@@ -12,12 +12,12 @@
     "@open-keystone/keystone": "workspace:^",
     "@open-keystone/utils": "workspace:^",
     "cuid": "^2.1.8",
-    "mongoose": "^5.13.15",
+    "mongoose": "^8.16.0",
     "p-settle": "^4.1.1"
   },
   "devDependencies": {
-    "mongodb": "^3.6.9",
-    "mongodb-memory-server-core": "^6.9.6",
+    "mongodb": "^6.17.0",
+    "mongodb-memory-server": "^10.1.4",
     "pluralize": "^8.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone-5/tree/main/packages/adapter-mongoose",

packages/adapter-mongoose/tests/mongo-results.test.js

@@ -3,7 +3,7 @@ const { queryParser } = require('../lib/query-parser');
 const { postsAdapter, listAdapter } = require('./utils');
 
 const { MongoClient } = require('mongodb');
-const MongoDBMemoryServer = require('mongodb-memory-server-core').default;
+const { MongoMemoryServer } = require('mongodb-memory-server');
 
 const mongoJoinBuilder = parserOptions => {
   return async (query, aggregate) => {
@@ -16,14 +16,7 @@ const mongoJoinBuilder = parserOptions => {
 
 function getAggregate(database, collection) {
   return pipeline => {
-    return new Promise((resolve, reject) => {
-      database.collection(collection).aggregate(pipeline, (error, cursor) => {
-        if (error) {
-          return reject(error);
-        }
-        return resolve(cursor.toArray());
-      });
-    });
+    return database.collection(collection).aggregate(pipeline).toArray();
   };
 }
 
@@ -32,18 +25,15 @@ let mongoDb;
 let mongoServer;
 
 beforeAll(async () => {
-  mongoServer = new MongoDBMemoryServer();
-  const mongoUri = await mongoServer.getConnectionString();
-  mongoConnection = await MongoClient.connect(mongoUri, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
-  });
-  mongoDb = mongoConnection.db(await mongoServer.getDbName());
-});
-
-afterAll(() => {
-  mongoConnection.close();
-  mongoServer.stop();
+  mongoServer = await MongoMemoryServer.create();
+  const mongoUri = mongoServer.getUri();
+  mongoConnection = await MongoClient.connect(mongoUri);
+  mongoDb = mongoConnection.db();
+}, 60_000);
+
+afterAll(async () => {
+  await mongoConnection.close();
+  await mongoServer.stop();
 });
 
 beforeEach(async () => {
@@ -55,7 +45,7 @@ describe('mongo memory servier is alive', () => {
   it('should start mongo server', async () => {
     const collection = mongoDb.collection('heartbeat');
     const result = await collection.insertMany([{ a: 1 }, { b: 1 }]);
-    expect(result.result).toMatchObject({ n: 2, ok: 1 });
+    expect(result).toMatchObject({ acknowledged: true, insertedCount: 2 });
     expect(await collection.countDocuments({})).toBe(2);
   });
 });

packages/fields-location-google/package.json

@@ -20,7 +20,7 @@
     "@open-keystone/fields": "workspace:^",
     "cuid": "^2.1.8",
     "google-maps-react": "^2.0.6",
-    "mongoose": "^5.13.15",
+    "mongoose": "^8.16.0",
     "node-fetch": "^2.6.1",
     "react": "^17.0.2",
     "react-toast-notifications": "^2.4.4"

packages/fields-mongoid/src/Implementation.js

@@ -82,12 +82,12 @@ export class MongooseMongoIdInterface extends MongooseFieldAdapter {
     return {
       ...this.equalityConditions(
         this.field.isPrimaryKey ? '_id' : dbPath,
-        s => s && mongoose.Types.ObjectId(s)
+        s => s && new mongoose.Types.ObjectId(s)
       ),
       //NOTE: ObjectId(null) returns a new ObjectId value
       ...this.inConditions(
         this.field.isPrimaryKey ? '_id' : dbPath,
-        s => s && mongoose.Types.ObjectId(s)
+        s => s && new mongoose.Types.ObjectId(s)
       ),
     };
   }

packages/fields/package.json

@@ -54,7 +54,7 @@
     "lodash.groupby": "^4.6.0",
     "lodash.isequal": "^4.5.0",
     "luxon": "^1.27.0",
-    "mongoose": "^5.13.15",
+    "mongoose": "^8.16.0",
     "p-settle": "^4.1.1",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",

packages/fields/src/types/DateTime/test-fixtures.js

@@ -61,8 +61,8 @@ export const filterTests = withKeystone => {
         undefined,
         adapterName === 'mongoose'
           ? [
-              { name: 'person7', lastOnline: null },
               { name: 'person6', lastOnline: null },
+              { name: 'person7', lastOnline: null },
               { name: 'person1', lastOnline: '1666-04-12T00:08:00.000+10:00' },
               { name: 'person2', lastOnline: '1950-10-01T23:59:59.999-10:00' },
               { name: 'person3', lastOnline: '1990-12-31T12:34:56.789+01:23' },

packages/fields/src/types/DateTimeUtc/test-fixtures.js

@@ -61,8 +61,8 @@ export const filterTests = withKeystone => {
         undefined,
         adapterName === 'mongoose'
           ? [
-              { name: 'person7', lastOnline: null },
               { name: 'person6', lastOnline: null },
+              { name: 'person7', lastOnline: null },
               { name: 'person1', lastOnline: '1949-04-12T00:08:00.000Z' },
               { name: 'person2', lastOnline: '1950-10-01T23:59:59.999Z' },
               { name: 'person3', lastOnline: '1990-12-31T12:34:56.789Z' },