refactor: convert more loops to for-of

AbdelrahmanHafez · AbdelrahmanHafez · commit 87b3f0421372 · 2020-04-23T04:31:10.000+02:00
diff --git a/lib/model.js b/lib/model.js
@@ -4515,9 +4515,8 @@ function _assign(model, vals, mod, assignmentOpts) {
       _val = utils.getValue(foreignField, val);
       if (Array.isArray(_val)) {
         _val = utils.array.flatten(_val);
-        const _valLength = _val.length;
-        for (let j = 0; j < _valLength; ++j) {
-          let __val = _val[j];
+
+        for (let __val of _val) {
           if (__val instanceof Document) {
             __val = __val._id;
           }
diff --git a/lib/query.js b/lib/query.js
@@ -70,9 +70,8 @@ function Query(conditions, options, model, collection) {
   // this is the case where we have a CustomQuery, we need to check if we got
   // options passed in, and if we did, merge them in
   const keys = Object.keys(options);
-  for (let i = 0; i < keys.length; ++i) {
-    const k = keys[i];
-    this._mongooseOptions[k] = options[k];
+  for (const key of keys) {
+    this._mongooseOptions[key] = options[key];
   }
 
   if (collection) {
@@ -4604,14 +4603,14 @@ Query.prototype.populate = function() {
     const readConcern = this.options.readConcern;
     const readPref = this.options.readPreference;
 
-    for (let i = 0; i < res.length; ++i) {
-      if (readConcern != null && get(res[i], 'options.readConcern') == null) {
-        res[i].options = res[i].options || {};
-        res[i].options.readConcern = readConcern;
+    for (const populateOptions of res) {
+      if (readConcern != null && get(populateOptions, 'options.readConcern') == null) {
+        populateOptions.options = populateOptions.options || {};
+        populateOptions.options.readConcern = readConcern;
       }
-      if (readPref != null && get(res[i], 'options.readPreference') == null) {
-        res[i].options = res[i].options || {};
-        res[i].options.readPreference = readPref;
+      if (readPref != null && get(populateOptions, 'options.readPreference') == null) {
+        populateOptions.options = populateOptions.options || {};
+        populateOptions.options.readPreference = readPref;
       }
     }
   }
@@ -4620,10 +4619,10 @@ Query.prototype.populate = function() {
 
   if (opts.lean != null) {
     const lean = opts.lean;
-    for (let i = 0; i < res.length; ++i) {
-      if (get(res[i], 'options.lean') == null) {
-        res[i].options = res[i].options || {};
-        res[i].options.lean = lean;
+    for (const populateOptions of res) {
+      if (get(populateOptions, 'options.lean') == null) {
+        populateOptions.options = populateOptions.options || {};
+        populateOptions.options.lean = lean;
       }
     }
   }
@@ -4634,12 +4633,13 @@ Query.prototype.populate = function() {
 
   const pop = opts.populate;
 
-  for (let i = 0; i < res.length; ++i) {
-    const path = res[i].path;
-    if (pop[path] && pop[path].populate && res[i].populate) {
-      res[i].populate = pop[path].populate.concat(res[i].populate);
+  for (const populateOptions of res) {
+    const path = populateOptions.path;
+    if (pop[path] && pop[path].populate && populateOptions.populate) {
+      populateOptions.populate = pop[path].populate.concat(populateOptions.populate);
     }
-    pop[res[i].path] = res[i];
+
+    pop[populateOptions.path] = populateOptions;
   }
 
   return this;
@@ -5326,12 +5326,7 @@ Query.prototype.selectedExclusively = function selectedExclusively() {
   }
 
   const keys = Object.keys(this._fields);
-  if (keys.length === 0) {
-    return false;
-  }
-
-  for (let i = 0; i < keys.length; ++i) {
-    const key = keys[i];
+  for (const key of keys) {
     if (key === '_id') {
       continue;
     }
diff --git a/lib/queryhelpers.js b/lib/queryhelpers.js
@@ -174,8 +174,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
     // check for parent exclusions
     const pieces = path.split('.');
     let cur = '';
-    for (let i = 0; i < pieces.length; ++i) {
-      cur += cur.length ? '.' + pieces[i] : pieces[i];
+    for (const piece of pieces) {
+      cur += cur.length ? '.' + piece : piece;
       if (excluded.indexOf(cur) !== -1) {
         return;
       }
@@ -186,8 +186,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
     // project out everything else under the parent path
     if (!exclude && get(type, 'options.$skipDiscriminatorCheck', false)) {
       let cur = '';
-      for (let i = 0; i < pieces.length; ++i) {
-        cur += (cur.length === 0 ? '' : '.') + pieces[i];
+      for (const piece of pieces) {
+        cur += (cur.length === 0 ? '' : '.') + piece;
         const projection = get(fields, cur, false);
         if (projection && typeof projection !== 'object') {
           return;
@@ -203,8 +203,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
 
   switch (exclude) {
     case true:
-      for (let i = 0; i < excluded.length; ++i) {
-        fields[excluded[i]] = 0;
+      for (const fieldName of excluded) {
+        fields[fieldName] = 0;
       }
       break;
     case false:
@@ -214,8 +214,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
           schema.paths['_id'].options.select === false) {
         fields._id = 0;
       }
-      for (let i = 0; i < selected.length; ++i) {
-        fields[selected[i]] = 1;
+      for (const fieldName of selected) {
+        fields[fieldName] = 1;
       }
       break;
     case undefined:
@@ -231,8 +231,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
 
       // user didn't specify fields, implies returning all fields.
       // only need to apply excluded fields and delete any plus paths
-      for (let i = 0; i < excluded.length; ++i) {
-        fields[excluded[i]] = 0;
+      for (const fieldName of excluded) {
+        fields[fieldName] = 0;
       }
       break;
   }
diff --git a/lib/schema.js b/lib/schema.js
@@ -460,8 +460,7 @@ Schema.prototype.add = function add(obj, prefix) {
   prefix = prefix || '';
   const keys = Object.keys(obj);
 
-  for (let i = 0; i < keys.length; ++i) {
-    const key = keys[i];
+  for (const key of keys) {
     const fullPath = prefix + key;
 
     if (obj[key] == null) {
@@ -1486,10 +1485,9 @@ Schema.prototype.plugin = function(fn, opts) {
       'got "' + (typeof fn) + '"');
   }
 
-  if (opts &&
-      opts.deduplicate) {
-    for (let i = 0; i < this.plugins.length; ++i) {
-      if (this.plugins[i].fn === fn) {
+  if (opts && opts.deduplicate) {
+    for (const plugin of this.plugins) {
+      if (plugin.fn === fn) {
         return this;
       }
     }
@@ -1908,10 +1906,13 @@ Schema.prototype.remove = function(path) {
 function _deletePath(schema, name) {
   const pieces = name.split('.');
   const last = pieces.pop();
+
   let branch = schema.tree;
-  for (let i = 0; i < pieces.length; ++i) {
-    branch = branch[pieces[i]];
+
+  for (const piece of pieces) {
+    branch = branch[piece];
   }
+
   delete branch[last];
 }
 
diff --git a/lib/schematype.js b/lib/schematype.js
@@ -972,17 +972,17 @@ SchemaType.prototype.getDefault = function(scope, init) {
 SchemaType.prototype._applySetters = function(value, scope, init, priorVal) {
   let v = value;
   const setters = this.setters;
-  let len = setters.length;
   const caster = this.caster;
 
-  while (len--) {
-    v = setters[len].call(scope, v, this);
+  for (const setter of setters) {
+    v = setter.call(scope, v, this);
   }
 
   if (Array.isArray(v) && caster && caster.setters) {
     const newVal = [];
-    for (let i = 0; i < v.length; i++) {
-      newVal.push(caster.applySetters(v[i], scope, init, priorVal));
+
+    for (const value of v) {
+      newVal.push(caster.applySetters(value, scope, init, priorVal));
     }
     v = newVal;
   }
