Merge branch 'master' into types-expression

Uzlopak · web-flow · commit e3dca3058de1 · 2022-06-02T09:01:24.000+02:00
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 16
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3
 
       - name: Setup node
-        uses: actions/setup-node@5b52f097d36d4b0b2f94ed6de710023fbb8b2236 # v3.1.0
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.0
         with:
           node-version: 16
 
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: stale
-        uses: actions/stale@v3
+        uses: actions/stale@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 5 days'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 14
 
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: ${{ matrix.node }}
 
@@ -86,7 +86,7 @@ jobs:
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 16
       - run: npm install
@@ -101,7 +101,7 @@ jobs:
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 16
       - run: npm install
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 16
       - name: Alignment
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 14
 
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
       - name: Setup node
-        uses: actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # v3.1.1
+        uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # v3.1.1
         with:
           node-version: 12
 
diff --git a/.lgtm.yml b/.lgtm.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+6.3.5 / 2022-05-30
+==================
+ * fix(document): avoid infinite recursion when calling toObject() on self-referencing document #11756
+ * fix(document): avoid manually populating documents that are manually populated in another doc with different unpopulatedValue #11442
+ * fix(document): fix ObjectId conversion for external schemas #11841 [coyotte508](https://github.com/coyotte508)
+ * fix: fix codeql warnings #11817 [Uzlopak](https://github.com/Uzlopak)
+ * fix(types): allow passing TVirtuals to Schema class #11543
+ * fix(types): Type of Connection.transaction() #11825 [dwrss](https://github.com/dwrss)
+ * docs(typescript): add coverage for TypeScript query helpers #11709
+ * docs: fix documention of error handling #11844 [Uzlopak](https://github.com/Uzlopak)
+ * docs: typings mongoose.Error should reference to MongooseError #11850 [Uzlopak](https://github.com/Uzlopak)
+ * chore: improve issue templates #11794 [Uzlopak](https://github.com/Uzlopak)
+ * chore: use ts-benchmark instead of internal TS benchmarking #11798 [mohammad0-0ahmad](https://github.com/mohammad0-0ahmad)
+
 6.3.4 / 2022-05-19
 ==================
  * fix(schema): disallow using schemas with schema-level projection with map subdocuments #11698
diff --git a/examples/redis-todo/.npmrc b/examples/redis-todo/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/examples/redis-todo/config.js b/examples/redis-todo/config.js
@@ -0,0 +1,7 @@
+'use strict';
+
+const JWT_SECRET = 'token';
+
+module.exports = {
+  JWT_SECRET
+};
diff --git a/examples/redis-todo/db/models/userModel.js b/examples/redis-todo/db/models/userModel.js
@@ -3,6 +3,7 @@
 const mongoose = require('mongoose');
 const jwt = require('jsonwebtoken');
 const bcrypt = require('bcryptjs');
+const JWT_SECRET = require('../../config').JWT_SECRET;
 
 const { Schema, model } = mongoose;
 
@@ -26,7 +27,7 @@ userSchema.methods.toJSON = function() {
 
 // creating token
 userSchema.methods.genAuthToken = function() {
-  return jwt.sign({ userId: this._id.toString() }, 'token'); // this = user
+  return jwt.sign({ userId: this._id.toString() }, JWT_SECRET); // this = user
 };
 
 // password hasing
diff --git a/examples/redis-todo/middleware/auth.js b/examples/redis-todo/middleware/auth.js
@@ -1,18 +1,19 @@
 'use strict';
 
 const jwt = require('jsonwebtoken');
+const JWT_SECRET = require('../config').JWT_SECRET;
 
 module.exports = async function(req, res, next) {
   try {
     const authToken = req.header('x-auth');
     if (!authToken) return res.status(404).send({ msg: 'AuthToken not found' });
 
-    const decodedValue = jwt.verify(authToken, 'token');
+    const decodedValue = jwt.verify(authToken, JWT_SECRET);
     if (!decodedValue) return res.status(401).send({ msg: 'Invalid Authentication' });
 
     req.userId = decodedValue.userId;
     next();
   } catch (err) {
-    res.status(401).send({ msg: 'Invalid Authentication:' + err });
+    res.status(401).send({ msg: 'Invalid Authentication' });
   }
 };
diff --git a/examples/redis-todo/package.json b/examples/redis-todo/package.json
@@ -25,14 +25,16 @@
   "homepage": "https://github.com/usama-asfar/redis-todo#readme",
   "dependencies": {
     "bcryptjs": "^2.4.3",
-    "express": "^4.17.1",
+    "express": "^4.18.1",
+    "express-rate-limit": "^6.4.0",
     "jsonwebtoken": "^8.5.1",
-    "mongoose": "^5.6.5",
+    "mongoose": "^6.3.5",
     "redis": "^4.1.0"
   },
   "devDependencies": {
+    "nodemon": "^2.0.16",
     "morgan": "^1.9.1",
-    "snazzy": "^8.0.0",
-    "standard": "^13.0.2"
+    "snazzy": "^9.0.0",
+    "standard": "^17.0.0"
   }
 }
diff --git a/examples/redis-todo/routers/todoRouter.js b/examples/redis-todo/routers/todoRouter.js
@@ -15,7 +15,7 @@ Router.get('/all', auth, async function({ userId }, res) {
     res.status(200).json({ todos: await Todo.find({ userId }).sort({ createdAt: -1 }).cache({ key: userId }) });
   } catch (err) {
     console.log(err);
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
@@ -26,11 +26,15 @@ Router.get('/all', auth, async function({ userId }, res) {
  */
 Router.post('/create', auth, clearCache, async function({ userId, body }, res) {
   try {
-    const todo = new Todo({ ...body, userId });
+    const todo = new Todo({
+      text: body.text,
+      completed: body.completed,
+      userId
+    });
     await todo.save();
     res.status(201).json({ todo });
   } catch (err) {
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
@@ -49,7 +53,7 @@ Router.post('/update', auth, async function({ userId, body }, res) {
     await updatedTodo.save();
     res.status(200).json({ todo: updatedTodo });
   } catch (err) {
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
@@ -62,7 +66,7 @@ Router.delete('/delete', auth, async function({ userId, body: { todoId } }, res)
     await Todo.findOneAndDelete({ $and: [{ userId }, { _id: todoId }] });
     res.status(200).send({ msg: 'Todo deleted' });
   } catch (err) {
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
diff --git a/examples/redis-todo/routers/userRouter.js b/examples/redis-todo/routers/userRouter.js
@@ -15,7 +15,12 @@ Router.post('/create', async function({ body }, res) {
   try {
     // storing password
     const password = new Password({ password: body.password });
-    const user = new User({ ...body, passwordId: password._id }); // body = user data
+    const user = new User({
+      name: body.name,
+      username: body.username,
+      email: body.email,
+      passwordId: password._id
+    }); // body = user data
 
     // gen auth token
     const token = await user.genAuthToken();
@@ -26,7 +31,7 @@ Router.post('/create', async function({ body }, res) {
     res.status(201).json({ token });
   } catch (err) {
     console.log(err);
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
@@ -48,7 +53,7 @@ Router.post('/login', async function({ body }, res) {
     const token = user.genAuthToken();
     res.status(201).json({ token });
   } catch (err) {
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
@@ -73,7 +78,7 @@ Router.post('/update', auth, async function({ userId, body }, res) {
 
     res.status(200).json({ user: updatedUser });
   } catch (err) {
-    res.status(500).send('Server Error: ' + err);
+    res.status(500).send('Server Error');
   }
 });
 
@@ -86,7 +91,7 @@ Router.delete('/delete', auth, async function({ userId }, res) {
     await Todo.deleteMany({ userId });
     res.status(200).send({ msg: 'User deleted' });
   } catch (err) {
-    res.status(501).send('Server Error: ' + err);
+    res.status(501).send('Server Error');
   }
 });
 
diff --git a/examples/redis-todo/server.js b/examples/redis-todo/server.js
@@ -2,14 +2,22 @@
 
 const http = require('http');
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 // DB
 require('./db');
 require('./services/cache');
 
+const limiter = rateLimit({
+  windowMs: 1 * 60 * 1000, // 1 minute
+  max: 100
+});
+
 const app = express();
 app.use(express.json());
 
+app.use(limiter);
+
 // morgan test
 app.use(require('morgan')('dev'));
 
diff --git a/lgtm.yml b/lgtm.yml
@@ -0,0 +1,12 @@
+path_classifiers:
+  src:
+    - lib
+  types:
+    - types
+  test:
+    - test
+  docs:
+    - docs
+queries:
+  - exclude: "*"
+  - include: lib
diff --git a/lib/cast/objectid.js b/lib/cast/objectid.js
@@ -1,18 +1,19 @@
 'use strict';
 
+const isBsonType = require('../helpers/isBsonType');
 const ObjectId = require('../driver').get().ObjectId;
 
 module.exports = function castObjectId(value) {
   if (value == null) {
     return value;
   }
 
-  if (value instanceof ObjectId) {
+  if (isBsonType(value, 'ObjectID')) {
     return value;
   }
 
   if (value._id) {
-    if (value._id instanceof ObjectId) {
+    if (isBsonType(value._id, 'ObjectID')) {
       return value._id;
     }
     if (value._id.toString instanceof Function) {
diff --git a/lib/index.js b/lib/index.js
@@ -34,6 +34,7 @@ const PromiseProvider = require('./promise_provider');
 const shardingPlugin = require('./plugins/sharding');
 const trusted = require('./helpers/query/trusted').trusted;
 const sanitizeFilter = require('./helpers/query/sanitizeFilter');
+const isBsonType = require('./helpers/isBsonType');
 
 const defaultMongooseSymbol = Symbol.for('mongoose:default');
 
@@ -995,8 +996,7 @@ Mongoose.prototype.isValidObjectId = function(v) {
  */
 
 Mongoose.prototype.isObjectIdOrHexString = function(v) {
-  const _mongoose = this instanceof Mongoose ? this : mongoose;
-  return v instanceof _mongoose.Types.ObjectId || (typeof v === 'string' && objectIdHexRegexp.test(v));
+  return isBsonType(v, 'ObjectID') || (typeof v === 'string' && objectIdHexRegexp.test(v));
 };
 
 /**
diff --git a/lib/schema/string.js b/lib/schema/string.js
@@ -4,12 +4,12 @@
  * Module dependencies.
  */
 
-const { BSONRegExp } = require('bson');
 const SchemaType = require('../schematype');
 const MongooseError = require('../error/index');
 const SchemaStringOptions = require('../options/SchemaStringOptions');
 const castString = require('../cast/string');
 const utils = require('../utils');
+const isBsonType = require('../helpers/isBsonType');
 
 const CastError = SchemaType.CastError;
 
@@ -677,7 +677,7 @@ SchemaString.prototype.castForQuery = function($conditional, val) {
     return handler.call(this, val);
   }
   val = $conditional;
-  if (Object.prototype.toString.call(val) === '[object RegExp]' || val instanceof BSONRegExp) {
+  if (Object.prototype.toString.call(val) === '[object RegExp]' || isBsonType(val, 'BSONRegExp')) {
     return val;
   }
 
diff --git a/package.json b/package.json
diff --git a/static.js b/static.js
