Merge pull request #28 from kratiahuja/master

Avoid double walking of all modules
ember-cli · Jun 20, 2016 · 1b0d7e4 · 1b0d7e4
2 parents d2cf267 + 03ded75
commit 1b0d7e4
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/addon/index.js b/addon/index.js
@@ -3,31 +3,26 @@ import Ember from 'ember';
 export default function(app, prefix) {
   var regex = new RegExp('^' + prefix + '\/((?:instance-)?initializers)\/');
   var getKeys = (Object.keys || Ember.keys);
+  var moduleNames = getKeys(requirejs._eak_seen);
 
-  getKeys(requirejs._eak_seen).map(function (moduleName) {
-    return {
-      moduleName: moduleName,
-      matches: regex.exec(moduleName)
-    };
-  })
-  .filter(function(dep) {
-    return dep.matches && dep.matches.length === 2;
-  })
-  .forEach(function(dep) {
-    var moduleName = dep.moduleName;
+  for (var i = 0; i < moduleNames.length; i++) {
+    var moduleName = moduleNames[i];
+    var matches = regex.exec(moduleName);
 
-    var module = require(moduleName, null, null, true);
-    if (!module) { throw new Error(moduleName + ' must export an initializer.'); }
+    if (matches && matches.length === 2) {
+      var module = require(moduleName, null, null, true);
+      if (!module) { throw new Error(moduleName + ' must export an initializer.'); }
 
-    var initializerType = Ember.String.camelize(dep.matches[1].substring(0, dep.matches[1].length - 1));
-    var initializer = module['default'];
-    if (!initializer.name) {
-      var initializerName = moduleName.match(/[^\/]+\/?$/)[0];
-      initializer.name = initializerName;
-    }
+      var initializerType = Ember.String.camelize(matches[1].substring(0, matches[1].length - 1));
+      var initializer = module['default'];
+      if (!initializer.name) {
+        var initializerName = moduleName.match(/[^\/]+\/?$/)[0];
+        initializer.name = initializerName;
+      }
 
-    if (app[initializerType]) {
-      app[initializerType](initializer);
+      if (app[initializerType]) {
+        app[initializerType](initializer);
+      }
     }
-  });
+  }
 }