Move input handling

kevinkace · Sep 15, 2016 · 69e1f93 · 69e1f93
1 parent 1b9c541
commit 69e1f93
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/lib/addClassNames.js b/lib/addClassNames.js
@@ -4,11 +4,14 @@ const pseudoRegexp = require("./pseudoRegexp"),
 
     groups = require("./groups"),
 
-    uniq = require("lodash/uniq");
+    flatten = require("lodash/flatten"),
+    uniq    = require("lodash/uniq");
 
 
 module.exports = function addClassNames(classNames, include) {
-    include.forEach((inc) => {
+    include = typeof include === "string" ? [ include ] : include;
+
+    flatten(include).forEach((inc) => {
         if(pseudoRegexp.test(inc)) {
             return classNames.push(inc);
         }

diff --git a/lib/getClassNameFns.js b/lib/getClassNameFns.js
@@ -3,27 +3,13 @@
 const classNameFunctions = require("./classNameFunctions"),
 
     addClassNames    = require("./addClassNames"),
-    removeClassNames = require("./removeClassNames"),
-
-    flatten = require("lodash/flatten");
-
-
-function shallowArray(item) {
-    if(!Array.isArray(item)) {
-        item = [ item ];
-    }
-
-    return flatten(item);
-}
+    removeClassNames = require("./removeClassNames");
 
 
 module.exports = function(config) {
     let classNames     = [],
         classFunctions = {};
 
-    config.include = shallowArray(config.include);
-    config.exclude = shallowArray(config.exclude);
-
     classNames = addClassNames(classNames, config.include);
     classNames = removeClassNames(classNames, config.exclude);
 

diff --git a/lib/removeClassNames.js b/lib/removeClassNames.js
@@ -4,11 +4,14 @@ const pseudoRegexp = require("./pseudoRegexp"),
 
     groups = require("./groups"),
 
-    pull = require("lodash/pull");
+    flatten = require("lodash/flatten"),
+    pull    = require("lodash/pull");
 
 
 module.exports = function(classNames, exclude) {
-    exclude.forEach((exc) => {
+    exclude = typeof exclude === "string" ? [ exclude ] : exclude;
+
+    flatten(exclude).forEach((exc) => {
         if(pseudoRegexp.test(exc)) {
             return pull(classNames, exc);
         }