aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authoreric <thul.eric@gmail.com>2015-08-11 21:23:46 -0400
committereric <thul.eric@gmail.com>2015-08-11 21:23:46 -0400
commit7226ff961c104037e8e5d3705949e2e9d58a6727 (patch)
tree555547366ccadfe71689b95a6b16b855b6173364 /src
parenteae2e182cec2d521166e5775294b52300c42f069 (diff)
parent07de44be15efb0ca9a2d1443ab1e91076a25409c (diff)
downloadpurs-loader-7226ff961c104037e8e5d3705949e2e9d58a6727.tar.gz
purs-loader-7226ff961c104037e8e5d3705949e2e9d58a6727.tar.zst
purs-loader-7226ff961c104037e8e5d3705949e2e9d58a6727.zip
Merge pull request #27 from ethul/topic/issue-26
Topic/issue 26
Diffstat (limited to 'src')
-rw-r--r--src/FS.purs67
-rw-r--r--src/Glob.purs33
-rw-r--r--src/LoaderRef.purs74
-rw-r--r--src/LoaderUtil.purs13
-rw-r--r--src/PursLoader/ChildProcess.js (renamed from src/ChildProcess.purs)28
-rw-r--r--src/PursLoader/ChildProcess.purs23
-rw-r--r--src/PursLoader/FS.js36
-rw-r--r--src/PursLoader/FS.purs38
-rw-r--r--src/PursLoader/Glob.js18
-rw-r--r--src/PursLoader/Glob.purs22
-rw-r--r--src/PursLoader/Loader.js19
-rw-r--r--src/PursLoader/Loader.purs (renamed from src/Loader.purs)23
-rw-r--r--src/PursLoader/LoaderRef.js56
-rw-r--r--src/PursLoader/LoaderRef.purs40
-rw-r--r--src/PursLoader/LoaderUtil.js7
-rw-r--r--src/PursLoader/LoaderUtil.purs9
-rw-r--r--src/PursLoader/Options.purs (renamed from src/Options.purs)16
17 files changed, 294 insertions, 228 deletions
diff --git a/src/FS.purs b/src/FS.purs
deleted file mode 100644
index 6955a63..0000000
--- a/src/FS.purs
+++ /dev/null
@@ -1,67 +0,0 @@
1module PursLoader.FS
2 ( FS()
3 , writeFileUtf8
4 , findFileUtf8
5 ) where
6
7import Control.Monad.Aff (Aff(), makeAff)
8import Control.Monad.Eff (Eff())
9import Control.Monad.Eff.Exception (Error())
10
11import Data.Maybe (Maybe(..))
12import Data.String.Regex (Regex())
13
14import Data.Function
15
16foreign import data FS :: !
17
18writeFileUtf8 :: forall eff. String -> String -> Aff (fs :: FS | eff) Unit
19writeFileUtf8 filepath contents = makeAff $ runFn4 writeFileUtf8Fn filepath contents
20
21foreign import writeFileUtf8Fn """
22function writeFileUtf8Fn(filepath, contents, errback, callback) {
23 return function(){
24 var fs = require('fs');
25
26 fs.writeFile(filepath, contents, function(error){
27 if (error) errback(error)();
28 else callback()();
29 });
30 };
31}
32""" :: forall eff. Fn4 String
33 String
34 (Error -> Eff (fs :: FS | eff) Unit)
35 (Unit -> Eff (fs :: FS | eff) Unit)
36 (Eff (fs :: FS | eff) Unit)
37
38findFileUtf8 :: forall eff. Regex -> [String] -> Aff (fs :: FS | eff) (Maybe String)
39findFileUtf8 regexp filepaths = makeAff $ runFn6 findFileUtf8Fn Nothing Just regexp filepaths
40
41foreign import findFileUtf8Fn """
42function findFileUtf8Fn(nothing, just, regex, filepaths, errback, callback) {
43 return function(){
44 var fs = require('fs');
45
46 var async = require('async');
47
48 function findFile(filepath, callback) {
49 fs.readFile(filepath, {encoding: 'utf-8'}, function(error, result){
50 if (error) callback(false);
51 else callback(regex.test(result));
52 });
53 }
54
55 async.detect(filepaths, findFile, function(result){
56 if (!result) callback(nothing)();
57 else callback(just(result))();
58 });
59 };
60}
61""" :: forall eff. Fn6 (Maybe String)
62 (String -> Maybe String)
63 Regex
64 [String]
65 (Error -> Eff (fs :: FS | eff) Unit)
66 (Maybe String -> Eff (fs :: FS | eff) Unit)
67 (Eff (fs :: FS | eff) Unit)
diff --git a/src/Glob.purs b/src/Glob.purs
deleted file mode 100644
index 392d9e4..0000000
--- a/src/Glob.purs
+++ /dev/null
@@ -1,33 +0,0 @@
1module PursLoader.Glob
2 ( Glob()
3 , globAll
4 ) where
5
6import Control.Monad.Aff (Aff(), makeAff)
7import Control.Monad.Eff (Eff())
8import Control.Monad.Eff.Exception (Error())
9
10import Data.Function
11
12foreign import data Glob :: !
13
14globAll :: forall eff. [String] -> Aff (glob :: Glob | eff) [[String]]
15globAll patterns = makeAff $ runFn3 globAllFn patterns
16
17foreign import globAllFn """
18function globAllFn(patterns, errback, callback) {
19 return function(){
20 var glob = require('glob');
21
22 var async = require('async');
23
24 async.map(patterns, glob, function(error, result){
25 if (error) errback(new Error(error))();
26 else callback(result)();
27 });
28 };
29}
30""" :: forall eff. Fn3 [String]
31 (Error -> Eff (glob :: Glob | eff) Unit)
32 ([[String]] -> Eff (glob :: Glob | eff) Unit)
33 (Eff (glob :: Glob | eff) Unit)
diff --git a/src/LoaderRef.purs b/src/LoaderRef.purs
deleted file mode 100644
index f1efa04..0000000
--- a/src/LoaderRef.purs
+++ /dev/null
@@ -1,74 +0,0 @@
1module PursLoader.LoaderRef
2 ( LoaderRef()
3 , Loader()
4 , async
5 , cacheable
6 , query
7 , clearDependencies
8 , addDependency
9 , resourcePath
10 ) where
11
12import Control.Monad.Eff (Eff())
13import Control.Monad.Eff.Exception (Error())
14
15import Data.Function (Fn3(), runFn3)
16import Data.Maybe (Maybe(), fromMaybe, isJust)
17
18data LoaderRef
19
20foreign import data Loader :: !
21
22foreign import asyncFn """
23function asyncFn(isJust, fromMaybe, ref){
24 return function(){
25 var callback = ref.async();
26 return function(error){
27 return function(value){
28 return function(){
29 return isJust(error) ? callback(fromMaybe(new Error())(error))
30 : callback(null, value);
31 };
32 };
33 };
34 };
35}""" :: forall eff a. Fn3 (Maybe Error -> Boolean)
36 (Error -> Maybe Error -> Error)
37 LoaderRef
38 (Eff (loader :: Loader | eff) (Maybe Error -> a -> Eff (loader :: Loader | eff) Unit))
39
40async :: forall eff a. LoaderRef -> Eff (loader :: Loader | eff) (Maybe Error -> a -> Eff (loader :: Loader | eff) Unit)
41async ref = runFn3 asyncFn isJust fromMaybe ref
42
43foreign import cacheable """
44function cacheable(ref){
45 return function(){
46 return ref.cacheable && ref.cacheable();
47 };
48}""" :: forall eff. LoaderRef -> Eff (loader :: Loader | eff) Unit
49
50foreign import query """
51function query(ref){
52 return ref.query;
53}""" :: LoaderRef -> String
54
55foreign import clearDependencies """
56function clearDependencies(ref){
57 return function(){
58 return ref.clearDependencies();
59 };
60}""" :: forall eff. LoaderRef -> Eff (loader :: Loader | eff) Unit
61
62foreign import resourcePath """
63function resourcePath(ref){
64 return ref.resourcePath;
65}""" :: LoaderRef -> String
66
67foreign import addDependency """
68function addDependency(ref){
69 return function(dep){
70 return function(){
71 return ref.addDependency(dep);
72 };
73 };
74}""" :: forall eff. LoaderRef -> String -> Eff (loader :: Loader | eff) Unit
diff --git a/src/LoaderUtil.purs b/src/LoaderUtil.purs
deleted file mode 100644
index 86be124..0000000
--- a/src/LoaderUtil.purs
+++ /dev/null
@@ -1,13 +0,0 @@
1module PursLoader.LoaderUtil
2 ( parseQuery
3 ) where
4
5import Data.Foreign (Foreign())
6
7import PursLoader.LoaderRef (LoaderRef())
8
9foreign import parseQuery """
10function parseQuery(query){
11 var loaderUtils = require('loader-utils');
12 return loaderUtils.parseQuery(query);
13}""" :: String -> Foreign
diff --git a/src/ChildProcess.purs b/src/PursLoader/ChildProcess.js
index 34558fa..d62aef6 100644
--- a/src/ChildProcess.purs
+++ b/src/PursLoader/ChildProcess.js
@@ -1,24 +1,13 @@
1module PursLoader.ChildProcess 1'use strict';
2 ( ChildProcess()
3 , spawn
4 ) where
5 2
6import Control.Monad.Aff (Aff(), makeAff) 3// module PursLoader.ChildProcess
7import Control.Monad.Eff (Eff())
8import Control.Monad.Eff.Exception (Error())
9 4
10import Data.Function 5var child_process = require('child_process');
11 6
12foreign import data ChildProcess :: ! 7var chalk = require('chalk');
13 8
14spawn :: forall eff. String -> [String] -> Aff (cp :: ChildProcess | eff) String
15spawn command args = makeAff $ runFn4 spawnFn command args
16
17foreign import spawnFn """
18function spawnFn(command, args, errback, callback) { 9function spawnFn(command, args, errback, callback) {
19 return function(){ 10 return function(){
20 var child_process = require('child_process');
21
22 var process = child_process.spawn(command, args); 11 var process = child_process.spawn(command, args);
23 12
24 var stdout = new Buffer(0); 13 var stdout = new Buffer(0);
@@ -34,8 +23,6 @@ function spawnFn(command, args, errback, callback) {
34 }); 23 });
35 24
36 process.on('close', function(code){ 25 process.on('close', function(code){
37 var chalk = require('chalk');
38
39 var output = stdout.toString('utf-8'); 26 var output = stdout.toString('utf-8');
40 27
41 var error = stderr.toString('utf-8'); 28 var error = stderr.toString('utf-8');
@@ -49,8 +36,5 @@ function spawnFn(command, args, errback, callback) {
49 }); 36 });
50 }; 37 };
51} 38}
52""" :: forall eff. Fn4 String 39
53 [String] 40exports.spawnFn = spawnFn;
54 (Error -> Eff (cp :: ChildProcess | eff) Unit)
55 (String -> Eff (cp :: ChildProcess | eff) Unit)
56 (Eff (cp :: ChildProcess | eff) Unit)
diff --git a/src/PursLoader/ChildProcess.purs b/src/PursLoader/ChildProcess.purs
new file mode 100644
index 0000000..3bd960b
--- /dev/null
+++ b/src/PursLoader/ChildProcess.purs
@@ -0,0 +1,23 @@
1module PursLoader.ChildProcess
2 ( ChildProcess()
3 , spawn
4 ) where
5
6import Prelude (Unit(), ($))
7
8import Control.Monad.Aff (Aff(), makeAff)
9import Control.Monad.Eff (Eff())
10import Control.Monad.Eff.Exception (Error())
11
12import Data.Function
13
14foreign import data ChildProcess :: !
15
16spawn :: forall eff. String -> Array String -> Aff (cp :: ChildProcess | eff) String
17spawn command args = makeAff $ runFn4 spawnFn command args
18
19foreign import spawnFn :: forall eff. Fn4 String
20 (Array String)
21 (Error -> Eff (cp :: ChildProcess | eff) Unit)
22 (String -> Eff (cp :: ChildProcess | eff) Unit)
23 (Eff (cp :: ChildProcess | eff) Unit)
diff --git a/src/PursLoader/FS.js b/src/PursLoader/FS.js
new file mode 100644
index 0000000..1a7f5b0
--- /dev/null
+++ b/src/PursLoader/FS.js
@@ -0,0 +1,36 @@
1'use strict';
2
3// module PursLoader.FS
4
5var fs = require('fs');
6
7var async = require('async');
8
9function writeFileUtf8Fn(filepath, contents, errback, callback) {
10 return function(){
11 fs.writeFile(filepath, contents, function(error){
12 if (error) errback(error)();
13 else callback()();
14 });
15 };
16}
17
18function findFileUtf8Fn(nothing, just, regex, filepaths, errback, callback) {
19 return function(){
20 function findFile(filepath, callback) {
21 fs.readFile(filepath, {encoding: 'utf-8'}, function(error, result){
22 if (error) callback(false);
23 else callback(regex.test(result));
24 });
25 }
26
27 async.detect(filepaths, findFile, function(result){
28 if (!result) callback(nothing)();
29 else callback(just(result))();
30 });
31 };
32}
33
34exports.writeFileUtf8Fn = writeFileUtf8Fn;
35
36exports.findFileUtf8Fn = findFileUtf8Fn;
diff --git a/src/PursLoader/FS.purs b/src/PursLoader/FS.purs
new file mode 100644
index 0000000..969e3d0
--- /dev/null
+++ b/src/PursLoader/FS.purs
@@ -0,0 +1,38 @@
1module PursLoader.FS
2 ( FS()
3 , writeFileUtf8
4 , findFileUtf8
5 ) where
6
7import Prelude (Unit(), ($))
8
9import Control.Monad.Aff (Aff(), makeAff)
10import Control.Monad.Eff (Eff())
11import Control.Monad.Eff.Exception (Error())
12
13import Data.Maybe (Maybe(..))
14import Data.String.Regex (Regex())
15
16import Data.Function
17
18foreign import data FS :: !
19
20writeFileUtf8 :: forall eff. String -> String -> Aff (fs :: FS | eff) Unit
21writeFileUtf8 filepath contents = makeAff $ runFn4 writeFileUtf8Fn filepath contents
22
23foreign import writeFileUtf8Fn :: forall eff. Fn4 String
24 String
25 (Error -> Eff (fs :: FS | eff) Unit)
26 (Unit -> Eff (fs :: FS | eff) Unit)
27 (Eff (fs :: FS | eff) Unit)
28
29findFileUtf8 :: forall eff. Regex -> Array String -> Aff (fs :: FS | eff) (Maybe String)
30findFileUtf8 regexp filepaths = makeAff $ runFn6 findFileUtf8Fn Nothing Just regexp filepaths
31
32foreign import findFileUtf8Fn :: forall eff. Fn6 (Maybe String)
33 (String -> Maybe String)
34 Regex
35 (Array String)
36 (Error -> Eff (fs :: FS | eff) Unit)
37 (Maybe String -> Eff (fs :: FS | eff) Unit)
38 (Eff (fs :: FS | eff) Unit)
diff --git a/src/PursLoader/Glob.js b/src/PursLoader/Glob.js
new file mode 100644
index 0000000..960ae9a
--- /dev/null
+++ b/src/PursLoader/Glob.js
@@ -0,0 +1,18 @@
1'use strict';
2
3// module PursLoader.Glob
4
5var glob = require('glob');
6
7var async = require('async');
8
9function globAllFn(patterns, errback, callback) {
10 return function(){
11 async.map(patterns, glob, function(error, result){
12 if (error) errback(new Error(error))();
13 else callback(result)();
14 });
15 };
16}
17
18exports.globAllFn = globAllFn;
diff --git a/src/PursLoader/Glob.purs b/src/PursLoader/Glob.purs
new file mode 100644
index 0000000..45eeb56
--- /dev/null
+++ b/src/PursLoader/Glob.purs
@@ -0,0 +1,22 @@
1module PursLoader.Glob
2 ( Glob()
3 , globAll
4 ) where
5
6import Prelude (Unit(), ($))
7
8import Control.Monad.Aff (Aff(), makeAff)
9import Control.Monad.Eff (Eff())
10import Control.Monad.Eff.Exception (Error())
11
12import Data.Function
13
14foreign import data Glob :: !
15
16globAll :: forall eff. Array String -> Aff (glob :: Glob | eff) (Array (Array String))
17globAll patterns = makeAff $ runFn3 globAllFn patterns
18
19foreign import globAllFn :: forall eff. Fn3 (Array String)
20 (Error -> Eff (glob :: Glob | eff) Unit)
21 ((Array (Array String)) -> Eff (glob :: Glob | eff) Unit)
22 (Eff (glob :: Glob | eff) Unit)
diff --git a/src/PursLoader/Loader.js b/src/PursLoader/Loader.js
new file mode 100644
index 0000000..98459b6
--- /dev/null
+++ b/src/PursLoader/Loader.js
@@ -0,0 +1,19 @@
1'use strict'
2
3// module PursLoader.Loader
4
5var path = require('path');
6
7var cwd = process.cwd();
8
9function relative(from) {
10 return function(to){
11 return path.relative(from, to);
12 };
13}
14
15exports.cwd = cwd;
16
17exports.relative = relative;
18
19exports.resolve = path.resolve;
diff --git a/src/Loader.purs b/src/PursLoader/Loader.purs
index e9e03c4..3cb99cd 100644
--- a/src/Loader.purs
+++ b/src/PursLoader/Loader.purs
@@ -4,6 +4,8 @@ module PursLoader.Loader
4 , loaderFn 4 , loaderFn
5 ) where 5 ) where
6 6
7import Prelude (Unit(), ($), (<>), (>>=), (<$>), (++), bind, flip, id, pure, return, unit)
8
7import Control.Monad.Aff (Aff(), runAff) 9import Control.Monad.Aff (Aff(), runAff)
8import Control.Monad.Eff (Eff()) 10import Control.Monad.Eff (Eff())
9import Control.Monad.Eff.Class (liftEff) 11import Control.Monad.Eff.Class (liftEff)
@@ -14,6 +16,7 @@ import Data.Function (Fn2(), mkFn2)
14import Data.Maybe (Maybe(..), fromMaybe, maybe) 16import Data.Maybe (Maybe(..), fromMaybe, maybe)
15import Data.String (joinWith) 17import Data.String (joinWith)
16import Data.String.Regex (match, noFlags, regex, test) 18import Data.String.Regex (match, noFlags, regex, test)
19import Data.Traversable (sequence)
17 20
18import PursLoader.ChildProcess (ChildProcess(), spawn) 21import PursLoader.ChildProcess (ChildProcess(), spawn)
19import PursLoader.FS (FS(), writeFileUtf8, findFileUtf8) 22import PursLoader.FS (FS(), writeFileUtf8, findFileUtf8)
@@ -36,18 +39,13 @@ psciFilename = ".psci"
36 39
37(!!!) = flip (!!) 40(!!!) = flip (!!)
38 41
39foreign import cwd "var cwd = process.cwd();" :: String 42foreign import cwd :: String
43
44foreign import relative :: String -> String -> String
40 45
41foreign import relative """ 46foreign import resolve :: String -> String
42function relative(from) {
43 return function(to){
44 var path = require('path');
45 return path.relative(from, to);
46 };
47}
48""" :: String -> String -> String
49 47
50mkPsci :: [[String]] -> [[String]] -> String 48mkPsci :: Array (Array String) -> Array (Array String) -> String
51mkPsci srcs ffis = joinWith "\n" ((loadModule <$> concat srcs) <> (loadForeign <$> concat ffis)) 49mkPsci srcs ffis = joinWith "\n" ((loadModule <$> concat srcs) <> (loadForeign <$> concat ffis))
52 where 50 where
53 loadModule :: String -> String 51 loadModule :: String -> String
@@ -56,7 +54,7 @@ mkPsci srcs ffis = joinWith "\n" ((loadModule <$> concat srcs) <> (loadForeign <
56 loadForeign :: String -> String 54 loadForeign :: String -> String
57 loadForeign a = ":f " ++ relative cwd a 55 loadForeign a = ":f " ++ relative cwd a
58 56
59findFFI :: forall eff. [[String]] -> String -> Aff (fs :: FS | eff) (Maybe String) 57findFFI :: forall eff. Array (Array String) -> String -> Aff (fs :: FS | eff) (Maybe String)
60findFFI ffiss name = findFileUtf8 re (concat ffiss) 58findFFI ffiss name = findFileUtf8 re (concat ffiss)
61 where 59 where
62 re = regex ("(?:^|\\n)//\\s*module\\s*" ++ name ++ "\\s*\\n") noFlags 60 re = regex ("(?:^|\\n)//\\s*module\\s*" ++ name ++ "\\s*\\n") noFlags
@@ -79,12 +77,13 @@ loader' ref source = do
79 77
80 writeFileUtf8 psciFilename psciFile 78 writeFileUtf8 psciFilename psciFile
81 79
82 let moduleName = match moduleRegex source >>= (!!!) 1 80 let moduleName = match moduleRegex source >>= (!!!) 1 >>= id
83 hasForeign = test foreignRegex source 81 hasForeign = test foreignRegex source
84 result = (\a -> "module.exports = require('" ++ a ++ "');") <$> moduleName 82 result = (\a -> "module.exports = require('" ++ a ++ "');") <$> moduleName
85 83
86 liftEff (clearDependencies ref) 84 liftEff (clearDependencies ref)
87 liftEff (addDependency ref (resourcePath ref)) 85 liftEff (addDependency ref (resourcePath ref))
86 liftEff (sequence $ (\src -> addDependency ref (resolve src)) <$> concat srcss)
88 87
89 foreignPath <- if hasForeign 88 foreignPath <- if hasForeign
90 then fromMaybe (pure Nothing) (findFFI ffiss <$> moduleName) 89 then fromMaybe (pure Nothing) (findFFI ffiss <$> moduleName)
diff --git a/src/PursLoader/LoaderRef.js b/src/PursLoader/LoaderRef.js
new file mode 100644
index 0000000..3ce0970
--- /dev/null
+++ b/src/PursLoader/LoaderRef.js
@@ -0,0 +1,56 @@
1'use strict';
2
3// module PursLoader.LoaderRef
4
5function asyncFn(isJust, fromMaybe, ref){
6 return function(){
7 var callback = ref.async();
8 return function(error){
9 return function(value){
10 return function(){
11 return isJust(error) ? callback(fromMaybe(new Error())(error))
12 : callback(null, value);
13 };
14 };
15 };
16 };
17}
18function cacheable(ref){
19 return function(){
20 return ref.cacheable && ref.cacheable();
21 };
22}
23
24function query(ref){
25 return ref.query;
26}
27
28function clearDependencies(ref){
29 return function(){
30 return ref.clearDependencies();
31 };
32}
33
34function resourcePath(ref){
35 return ref.resourcePath;
36}
37
38function addDependency(ref){
39 return function(dep){
40 return function(){
41 return ref.addDependency(dep);
42 };
43 };
44}
45
46exports.asyncFn = asyncFn;
47
48exports.cacheable = cacheable;
49
50exports.query = query;
51
52exports.clearDependencies = clearDependencies;
53
54exports.resourcePath = resourcePath;
55
56exports.addDependency = addDependency;
diff --git a/src/PursLoader/LoaderRef.purs b/src/PursLoader/LoaderRef.purs
new file mode 100644
index 0000000..33c4f7e
--- /dev/null
+++ b/src/PursLoader/LoaderRef.purs
@@ -0,0 +1,40 @@
1module PursLoader.LoaderRef
2 ( LoaderRef()
3 , Loader()
4 , async
5 , cacheable
6 , query
7 , clearDependencies
8 , addDependency
9 , resourcePath
10 ) where
11
12import Prelude (Unit())
13
14import Control.Monad.Eff (Eff())
15import Control.Monad.Eff.Exception (Error())
16
17import Data.Function (Fn3(), runFn3)
18import Data.Maybe (Maybe(), fromMaybe, isJust)
19
20data LoaderRef
21
22foreign import data Loader :: !
23
24foreign import asyncFn :: forall eff a. Fn3 (Maybe Error -> Boolean)
25 (Error -> Maybe Error -> Error)
26 LoaderRef
27 (Eff (loader :: Loader | eff) (Maybe Error -> a -> Eff (loader :: Loader | eff) Unit))
28
29async :: forall eff a. LoaderRef -> Eff (loader :: Loader | eff) (Maybe Error -> a -> Eff (loader :: Loader | eff) Unit)
30async ref = runFn3 asyncFn isJust fromMaybe ref
31
32foreign import cacheable :: forall eff. LoaderRef -> Eff (loader :: Loader | eff) Unit
33
34foreign import query :: LoaderRef -> String
35
36foreign import clearDependencies :: forall eff. LoaderRef -> Eff (loader :: Loader | eff) Unit
37
38foreign import resourcePath :: LoaderRef -> String
39
40foreign import addDependency :: forall eff. LoaderRef -> String -> Eff (loader :: Loader | eff) Unit
diff --git a/src/PursLoader/LoaderUtil.js b/src/PursLoader/LoaderUtil.js
new file mode 100644
index 0000000..45f2703
--- /dev/null
+++ b/src/PursLoader/LoaderUtil.js
@@ -0,0 +1,7 @@
1'use strict';
2
3// module PursLoader.LoaderUtil
4
5var loaderUtils = require('loader-utils');
6
7exports.parseQuery = loaderUtils.parseQuery;
diff --git a/src/PursLoader/LoaderUtil.purs b/src/PursLoader/LoaderUtil.purs
new file mode 100644
index 0000000..3e5a7bc
--- /dev/null
+++ b/src/PursLoader/LoaderUtil.purs
@@ -0,0 +1,9 @@
1module PursLoader.LoaderUtil
2 ( parseQuery
3 ) where
4
5import Data.Foreign (Foreign())
6
7import PursLoader.LoaderRef (LoaderRef())
8
9foreign import parseQuery :: String -> Foreign
diff --git a/src/Options.purs b/src/PursLoader/Options.purs
index 51e9be5..e3957eb 100644
--- a/src/Options.purs
+++ b/src/PursLoader/Options.purs
@@ -4,6 +4,8 @@ module PursLoader.Options
4 , loaderFFIOption 4 , loaderFFIOption
5 ) where 5 ) where
6 6
7import Prelude (Unit(), (<>), (<$>), (<<<), (++), (<*>), const)
8
7import Data.Array (concat) 9import Data.Array (concat)
8import Data.Either (either) 10import Data.Either (either)
9 11
@@ -45,8 +47,8 @@ newtype Options
45 , output :: NullOrUndefined String 47 , output :: NullOrUndefined String
46 , noPrefix :: NullOrUndefined Boolean 48 , noPrefix :: NullOrUndefined Boolean
47 , requirePath :: NullOrUndefined String 49 , requirePath :: NullOrUndefined String
48 , src :: NullOrUndefined [String] 50 , src :: NullOrUndefined (Array String)
49 , ffi :: NullOrUndefined [String] 51 , ffi :: NullOrUndefined (Array String)
50 } 52 }
51 53
52instance isForeignOptions :: IsForeign Options where 54instance isForeignOptions :: IsForeign Options where
@@ -74,7 +76,7 @@ instance isForeignOptions :: IsForeign Options where
74 <*> readProp ffiOpt obj) 76 <*> readProp ffiOpt obj)
75 77
76class LoaderOption a where 78class LoaderOption a where
77 opt :: String -> NullOrUndefined a -> [String] 79 opt :: String -> NullOrUndefined a -> Array String
78 80
79instance booleanLoaderOption :: LoaderOption Boolean where 81instance booleanLoaderOption :: LoaderOption Boolean where
80 opt key val = maybe [] (\a -> if a then ["--" ++ key] else []) (runNullOrUndefined val) 82 opt key val = maybe [] (\a -> if a then ["--" ++ key] else []) (runNullOrUndefined val)
@@ -82,11 +84,11 @@ instance booleanLoaderOption :: LoaderOption Boolean where
82instance stringLoaderOption :: LoaderOption String where 84instance stringLoaderOption :: LoaderOption String where
83 opt key val = maybe [] (\a -> ["--" ++ key ++ "=" ++ a]) (runNullOrUndefined val) 85 opt key val = maybe [] (\a -> ["--" ++ key ++ "=" ++ a]) (runNullOrUndefined val)
84 86
85instance arrayLoaderOption :: (LoaderOption a) => LoaderOption [a] where 87instance arrayLoaderOption :: (LoaderOption a) => LoaderOption (Array a) where
86 opt key val = concat (opt key <$> (NullOrUndefined <<< Just) 88 opt key val = concat (opt key <$> (NullOrUndefined <<< Just)
87 <$> (fromMaybe [] (runNullOrUndefined val))) 89 <$> (fromMaybe [] (runNullOrUndefined val)))
88 90
89pscOptions :: Foreign -> [String] 91pscOptions :: Foreign -> Array String
90pscOptions query = either (const []) fold parsed 92pscOptions query = either (const []) fold parsed
91 where parsed = read query :: F Options 93 where parsed = read query :: F Options
92 fold (Options a) = opt noPreludeOpt a.noPrelude <> 94 fold (Options a) = opt noPreludeOpt a.noPrelude <>
@@ -100,8 +102,8 @@ pscOptions query = either (const []) fold parsed
100 opt requirePathOpt a.requirePath <> 102 opt requirePathOpt a.requirePath <>
101 opt ffiOpt a.ffi 103 opt ffiOpt a.ffi
102 104
103loaderSrcOption :: Foreign -> Maybe [String] 105loaderSrcOption :: Foreign -> Maybe (Array String)
104loaderSrcOption query = either (const Nothing) (\(Options a) -> runNullOrUndefined a.src) (read query) 106loaderSrcOption query = either (const Nothing) (\(Options a) -> runNullOrUndefined a.src) (read query)
105 107
106loaderFFIOption :: Foreign -> Maybe [String] 108loaderFFIOption :: Foreign -> Maybe (Array String)
107loaderFFIOption query = either (const Nothing) (\(Options a) -> runNullOrUndefined a.ffi) (read query) 109loaderFFIOption query = either (const Nothing) (\(Options a) -> runNullOrUndefined a.ffi) (read query)