Merge branch 'fix/plugins_deps'

1 files changed, 13 insertions, 30 deletions

diff --git a/lib/plugins/listAll.js b/lib/plugins/listAll.js
index d7ce5f3..9b2a96b 100644
--- a/lib/plugins/listAll.js
+++ b/lib/plugins/listAll.js
@@ -1,4 +1,3 @@
-var is = require('is');
 var Immutable = require('immutable');
 var Plugin = require('../models/plugin');
 
@@ -8,43 +7,27 @@ var DEFAULT_PLUGINS = require('../constants/defaultPlugins');
 /**
     List all plugins for a book
 
-    @param {List<Plugin|String>}
+    @param {List<PluginDependency>} deps
     @return {OrderedMap<Plugin>}
 */
-function listAll(plugins) {
-    if (is.string(plugins)) {
-        plugins = Immutable.List(plugins.split(','));
-    }
-
-    // Convert to an ordered map
-    plugins = plugins.map(function(plugin) {
-        if (is.string(plugin)) {
-            plugin = Plugin.createFromString(plugin);
-        } else {
-            plugin = new Plugin(plugin);
-        }
-
-        return [plugin.getName(), plugin];
-    });
-    plugins = Immutable.OrderedMap(plugins);
-
+function listAll(deps) {
     // Extract list of plugins to disable (starting with -)
-    var toRemove = plugins.toList()
+    var toRemove = deps
         .filter(function(plugin) {
-            return plugin.getName()[0] === '-';
+            return !plugin.isEnabled();
         })
         .map(function(plugin) {
-            return plugin.getName().slice(1);
+            return plugin.getName();
         });
 
-    // Remove the '-'
-    plugins = plugins.mapKeys(function(name) {
-        if (name[0] === '-') {
-            return name.slice(1);
-        } else {
-            return name;
-        }
-    });
+    // Convert to an ordered map of Plugin
+    var plugins = deps
+        .map(function(dep) {
+            var plugin = Plugin.createFromDep(dep);
+
+            return [dep.getName(), plugin];
+        });
+    plugins = Immutable.OrderedMap(plugins);
 
     // Append default plugins
     DEFAULT_PLUGINS.forEach(function(pluginName) {