ES6 refactor: ModelManager (#6045)

* Make ModelManager an ES6 class

* ES6 refactor of ModelManager

lib/model-manager.js

 'use strict';
 'use strict';
 
 
-var Toposort = require('toposort-class')
-  , _ = require('lodash');
-
-var ModelManager = function(sequelize) {
-  this.models = [];
-  this.sequelize = sequelize;
-};
-
-ModelManager.prototype.addModel = function(model) {
-  this.models.push(model);
-  this.sequelize.models[model.name] = model;
-
-  return model;
-};
-
-ModelManager.prototype.removeModel = function(model) {
-  this.models = this.models.filter(function($model) {
-    return $model.name !== model.name;
-  });
-
-  delete this.sequelize.models[model.name];
-};
-
-ModelManager.prototype.getModel = function(against, options) {
-  options = _.defaults(options || {}, {
-    attribute: 'name'
-  });
-
-  var model = this.models.filter(function(model) {
-    return model[options.attribute] === against;
-  });
-
-  return !!model ? model[0] : null;
-};
-
-ModelManager.prototype.__defineGetter__('all', function() {
-  return this.models;
-});
-
-/**
- * Iterate over Models in an order suitable for e.g. creating tables. Will
- * take foreign key constraints into account so that dependencies are visited
- * before dependents.
- */
-ModelManager.prototype.forEachModel = function(iterator, options) {
-  var models = {}
-    , sorter = new Toposort()
-    , sorted
-    , dep;
-
-  options = _.defaults(options || {}, {
-    reverse: true
-  });
-
-  this.models.forEach(function(model) {
-    var deps = []
-      , tableName = model.getTableName();
-
-    if (_.isObject(tableName)) {
-      tableName = tableName.schema + '.' + tableName.tableName;
-    }
+const Toposort = require('toposort-class');
+const _ = require('lodash');
 
 
-    models[tableName] = model;
+class ModelManager {
+  constructor(sequelize) {
+    this.models = [];
+    this.sequelize = sequelize;
+  }
 
 
-    for (var attrName in model.rawAttributes) {
-      if (model.rawAttributes.hasOwnProperty(attrName)) {
-        var attribute = model.rawAttributes[attrName];
+  addModel(model) {
+    this.models.push(model);
+    this.sequelize.models[model.name] = model;
 
 
-        if (attribute.references) {
-          dep = attribute.references.model;
+    return model;
+  }
 
 
-          if (_.isObject(dep)) {
-            dep = dep.schema + '.' + dep.tableName;
-          }
+  removeModel(model) {
+    this.models = this.models.filter($model => $model.name !== model.name);
+
+    delete this.sequelize.models[model.name];
+  }
+
+  getModel(against, options) {
+    options = _.defaults(options || {}, {
+      attribute: 'name'
+    });
+
+    const model = this.models.filter(model => model[options.attribute] === against);
+
+    return !!model ? model[0] : null;
+  }
+
+  get all() {
+    return this.models;
+  }
+
+  /**
+   * Iterate over Models in an order suitable for e.g. creating tables. Will
+   * take foreign key constraints into account so that dependencies are visited
+   * before dependents.
+   */
+  forEachModel(iterator, options) {
+    const models = {};
+    const sorter = new Toposort();
+    let sorted;
+    let dep;
+
+    options = _.defaults(options || {}, {
+      reverse: true
+    });
+
+    for (const model of this.models) {
+      let deps = [];
+      let tableName = model.getTableName();
+
+      if (_.isObject(tableName)) {
+        tableName = tableName.schema + '.' + tableName.tableName;
+      }
+
+      models[tableName] = model;
+
+      for (const attrName in model.rawAttributes) {
+        if (model.rawAttributes.hasOwnProperty(attrName)) {
+          const attribute = model.rawAttributes[attrName];
+
+          if (attribute.references) {
+            dep = attribute.references.model;
 
 
-          deps.push(dep);
+            if (_.isObject(dep)) {
+              dep = dep.schema + '.' + dep.tableName;
+            }
+
+            deps.push(dep);
+          }
         }
         }
       }
       }
-    }
 
 
-    deps = deps.filter(function(dep) {
-      return tableName !== dep;
-    });
+      deps = deps.filter(dep => tableName !== dep);
 
 
-    sorter.add(tableName, deps);
-  });
+      sorter.add(tableName, deps);
+    }
 
 
-  sorted = sorter.sort();
-  if (options.reverse) {
-    sorted = sorted.reverse();
+    sorted = sorter.sort();
+    if (options.reverse) {
+      sorted = sorted.reverse();
+    }
+    for (const name of sorted) {
+      iterator(models[name], name);
+    }
   }
   }
-  sorted.forEach(function(name) {
-    iterator(models[name], name);
-  });
-};
+}
 
 
 module.exports = ModelManager;
 module.exports = ModelManager;
+module.exports.ModelManager = ModelManager;
+module.exports.default = ModelManager;