Merge pull request #6 from ethul/topic/bower-components

Topic/bower components

1 files changed, 10 insertions, 2 deletions

diff --git a/index.js b/index.js
index 07988a2..4a74d15 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,8 @@ var cp = require('child_process')
   , chalk = require('chalk')
   , lu = require('loader-utils')
   , cwd = process.cwd()
+  , MODULE_RE = /^module\s+([\w\.]+)\s+/i
+  , BOWER_PATTERN = path.join('bower_components', 'purescript-*', 'src')
   , PSC_MAKE = 'psc-make'
   , OUTPUT = 'output'
   , OPTIONS = {
@@ -18,6 +20,11 @@ var cp = require('child_process')
     }
 ;
 
+function pattern(root) {
+  var as = [ BOWER_PATTERN, root ];
+  return path.join('{' + as.join(',') + '}', '**', '*.purs');
+}
+
 module.exports = function(source){
   var callback = this.async()
     , request = lu.getRemainingRequest(this)
@@ -29,14 +36,15 @@ module.exports = function(source){
         else return h(OPTIONS[k]);
       }, [])
   ;
-  glob(path.join(root, '**', '*.purs'), function(e, files){
+  glob(pattern(root), function(e, files){
     if (e !== null) callback(e);
     else {
       var cmd = cp.spawn(PSC_MAKE, opts.concat(files));
       cmd.on('close', function(e){
         if (e) callback(e);
         else {
-          var module = path.basename(request, '.purs');
+          var result = MODULE_RE.exec(source);
+          var module = result.length > 1 ? result[1] : '';
           fs.readFile(path.join(query[OUTPUT] || OUTPUT, module, 'index.js'), 'utf-8', function(e, output){
             if (e) callback(e);
             else callback(e, output);