Merge pull request #10 from ethul/topic/issue-9

Topic/issue 9

3 files changed, 16 insertions, 8 deletions

diff --git a/bower.json b/bower.json
index dddddf9..2ee2486 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,7 @@
     "purescript-tuples": "~0.3.4",
     "purescript-maps": "~0.3.3",
     "purescript-arrays": "~0.3.7",
-    "purescript-monad-eff": "~0.1.0"
+    "purescript-monad-eff": "~0.1.0",
+    "purescript-sets": "0.3.2"
   }
 }
diff --git a/package.json b/package.json
index 9ecfd17..1e823ae 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "del": "^1.1.1",
     "gulp": "^3.8.11",
     "gulp-plumber": "^1.0.0",
-    "gulp-purescript": "^0.3.1",
+    "gulp-purescript": "^0.4.2",
     "gulp-util": "^3.0.4",
     "run-sequence": "^1.0.2",
     "webpack": "^1.8.4"
diff --git a/src/Loader.purs b/src/Loader.purs
index 523aa7a..aae51c0 100644
--- a/src/Loader.purs
+++ b/src/Loader.purs
@@ -9,9 +9,11 @@ import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Class (liftEff)
 import Control.Monad.Eff.Exception (error)
 
-import Data.Array ((!!), catMaybes, concat, nub, null)
+import Data.Array ((!!), catMaybes, concat, filter, null)
+import Data.Foldable (foldl)
 import Data.Function (Fn2(), mkFn2)
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
+import Data.Set (Set(), empty, insert, member, toList, unions)
 import Data.String (joinWith, split)
 import Data.String.Regex (Regex(), match, noFlags, regex)
 import Data.StrMap (StrMap(), fromList, lookup)
@@ -60,11 +62,16 @@ mkGraph files = (fromList <<< catMaybes) <$> sequence (parse <$> files)
                         return $ (\a -> tuple2 a { file: file, imports: imports }) <$> key
 
 mkDeps :: forall eff. String -> Graph -> [String]
-mkDeps key graph = nub $ go [] key
-  where go acc key =
-    maybe acc (\a -> if null a.imports
-                       then acc
-                       else concat $ go (acc <> a.imports) <$> a.imports) (lookup key graph)
+mkDeps key graph = toList $ go empty key
+  where
+    go :: Set String -> String -> Set String
+    go acc key =
+      let node = fromMaybe {file: "", imports: []} (lookup key graph)
+          uniq = filter (not <<< flip member acc) node.imports
+          acc' = foldl (flip insert) acc node.imports
+       in if null uniq
+             then acc'
+             else unions $ go acc' <$> uniq
 
 addDeps :: forall eff. LoaderRef -> Graph -> [String] -> Eff (loader :: Loader | eff) Unit
 addDeps ref graph deps = const unit <$> (sequence $ add <$> deps)