[dsch] added support for mongoose@7

DScheglov · Jul 12, 2023 · a84e29a · a84e29a
1 parent 6ac31cd
commit a84e29a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,13 @@
 language: node_js
 node_js:
-  - "10"
-  - "12"
   - "14"
+  - "16"
+  - "18"
 
 env:
   - MONGOOSE_VERSION=5
   - MONGOOSE_VERSION=6
+  - MONGOOSE_VERSION=7
 
 install:
   - npm install

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -83,11 +83,26 @@ const hasProperty = Function.prototype.call.bind(
 
 const readConstraint = constraint => (Array.isArray(constraint) ? constraint[0] : constraint);
 
+const normalizeSelection = fields => Object.keys(fields).reduce(
+  (target, key) => Object.defineProperty(
+    target,
+    key.replace(/^-/, ''),
+    {
+      value: fields[key],
+      enumerable: true,
+      writable: true,
+      configurable: true,
+    },
+  ),
+  {},
+);
+
 module.exports = {
   findPath,
   ensurePath,
   compose,
   idX,
   hasProperty,
   readConstraint,
+  normalizeSelection,
 };
diff --git a/lib/model.js b/lib/model.js
@@ -1,4 +1,4 @@
-const { findPath } = require('./helpers');
+const { findPath, normalizeSelection } = require('./helpers');
 
 module.exports = model_jsonSchema;
 
@@ -139,6 +139,8 @@ function __excludedPaths(schema, selection) {
     }, {});
   }
 
+  selection = normalizeSelection(selection);
+
   const needToAddVirtuals = schema.options && schema.options.toJSON
       && (schema.options.toJSON.virtuals || schema.options.toJSON.getters);