Cleanup

node_modules/mongoose/lib/helpers/query/selectPopulatedFields.js

@@ -1,28 +1,31 @@
 'use strict';
 
+const isExclusive = require('../projection/isExclusive');
+const isInclusive = require('../projection/isInclusive');
+
 /*!
  * ignore
  */
 
-module.exports = function selectPopulatedFields(query) {
-  const opts = query._mongooseOptions;
+module.exports = function selectPopulatedFields(fields, userProvidedFields, populateOptions) {
+  if (populateOptions == null) {
+    return;
+  }
 
-  if (opts.populate != null) {
-    const paths = Object.keys(opts.populate);
-    const userProvidedFields = query._userProvidedFields || {};
-    if (query.selectedInclusively()) {
-      for (const path of paths) {
-        if (!isPathInFields(userProvidedFields, path)) {
-          query.select(path);
-        } else if (userProvidedFields[path] === 0) {
-          delete query._fields[path];
-        }
+  const paths = Object.keys(populateOptions);
+  userProvidedFields = userProvidedFields || {};
+  if (isInclusive(fields)) {
+    for (const path of paths) {
+      if (!isPathInFields(userProvidedFields, path)) {
+        fields[path] = 1;
+      } else if (userProvidedFields[path] === 0) {
+        delete fields[path];
       }
-    } else if (query.selectedExclusively()) {
-      for (const path of paths) {
-        if (userProvidedFields[path] == null) {
-          delete query._fields[path];
-        }
+    }
+  } else if (isExclusive(fields)) {
+    for (const path of paths) {
+      if (userProvidedFields[path] == null) {
+        delete fields[path];
       }
     }
   }
@@ -37,10 +40,10 @@ function isPathInFields(userProvidedFields, path) {
   const len = pieces.length;
   let cur = pieces[0];
   for (let i = 1; i < len; ++i) {
-    if (userProvidedFields[cur] != null) {
+    if (userProvidedFields[cur] != null || userProvidedFields[cur + '.$'] != null) {
       return true;
     }
     cur += '.' + pieces[i];
   }
-  return userProvidedFields[cur] != null;
+  return userProvidedFields[cur] != null || userProvidedFields[cur + '.$'] != null;
 }