Simplify some type signatures. Provide default completion. Better handling of events.

Author: paf31

README.md

@@ -4,7 +4,7 @@
 
 ### Types
 
-    type Completer eff = String -> Eff eff (Tuple [String] String)
+    type Completer eff = String -> Eff eff { matched :: String, completions :: [String] }
 
     data Console :: !
 
@@ -21,6 +21,8 @@
 
     createInterface :: forall eff. InputStream -> OutputStream -> Completer eff -> Eff (console :: Console | eff) Interface
 
+    noCompletion :: forall eff. Completer eff
+
     process :: { stdin :: InputStream, stdout :: OutputStream, stderr :: OutputStream }
 
     prompt :: forall eff. Interface -> Eff (console :: Console | eff) Interface

bower.json

@@ -15,8 +15,5 @@
     "bower.json",
     "Gruntfile.js",
     "package.json"
-  ],
-  "dependencies": {
-    "purescript-tuples": "*"
-  }
+  ]
 }

examples/Examples.purs.hs

@@ -1,19 +1,17 @@
 module Main where
 
-import Prelude
-import Control.Monad
 import Control.Monad.Eff
 import Node.ReadLine
 import Debug.Trace
-import Data.Tuple
-
-completion :: forall eff. Completer eff
-completion s = return $ Tuple [] s
-
-lineHandler s = trace $ "You typed: " ++ s
 
 main = do
-  interface <- createInterface process.stdin process.stdout completion
+  interface <- createInterface process.stdin process.stdout noCompletion
+  
+  let
+    lineHandler s = do
+      trace $ "You typed: " ++ s
+      prompt interface
+  
   setPrompt "? " 2 interface
   prompt interface
   setLineHandler lineHandler interface

src/Node/ReadLine.purs

@@ -1,6 +1,5 @@
 module Node.ReadLine where
 
-import Data.Tuple
 import Control.Monad.Eff
 
 foreign import data Console :: !
@@ -13,21 +12,22 @@ foreign import data OutputStream :: *
 
 foreign import process :: { stderr :: OutputStream, stdout :: OutputStream, stdin :: InputStream }
 
-type Completer eff = String -> Eff eff (Tuple [String] String)
+type Completer eff = String -> Eff eff { completions :: [String], matched :: String }
 
-type LineHandler eff = String -> Eff eff Unit
+type LineHandler eff a = String -> Eff eff a 
 
 foreign import setLineHandler 
   "function setLineHandler(callback) {\
   \  return function(readline) {\
   \    return function() {\
+  \      readline.removeAllListeners('line');\
   \      readline.on('line', function (line) {\
   \        callback(line)();\
   \      });\
   \      return readline;\
   \    };\
   \  };\
-  \};" :: forall eff. LineHandler eff -> Interface -> Eff (console :: Console | eff) Interface
+  \};" :: forall eff a. LineHandler eff a -> Interface -> Eff (console :: Console | eff) Interface
 
 foreign import prompt 
   "function prompt(readline) {\
@@ -59,13 +59,15 @@ foreign import createInterface
   \          input: input,\
   \          output: output,\
   \          completer: function(line) {\
-  \            var completions = completer(line)();\
-  \            return completions.values;\
+  \            var res = completer(line)();\
+  \            return [res.completions, res.suffix];\
   \          }\
   \        });\
   \      };\
   \    };\
   \  };\
   \}" :: forall eff. InputStream -> OutputStream -> Completer eff -> Eff (console :: Console | eff) Interface
 
+noCompletion :: forall eff. Completer eff
+noCompletion s = return { completions: [], matched: s }