@@ -34,7 +34,6 @@ import GHC.Generics (Generic)
34
34
import qualified Language.PureScript as P
35
35
import qualified Language.PureScript.CST as CST
36
36
import qualified Language.PureScript.CST.Monad as CSTM
37
- import qualified Language.PureScript.Bundle as Bundle
38
37
import qualified Language.PureScript.CodeGen.JS as J
39
38
import qualified Language.PureScript.CodeGen.JS.Printer as P
40
39
import qualified Language.PureScript.CoreFn as CF
@@ -60,8 +59,8 @@ data Error
60
59
61
60
instance A. ToJSON Error
62
61
63
- server :: TL. Text -> [P. ExternsFile ] -> P. Environment -> Int -> IO ()
64
- server bundled externs initEnv port = do
62
+ server :: [P. ExternsFile ] -> P. Environment -> Int -> IO ()
63
+ server externs initEnv port = do
65
64
let compile :: Text -> IO (Either Error ([P. JSONError ], JS ))
66
65
compile input
67
66
| T. length input > 20000 = return (Left (OtherError " Please limit your input to 20000 characters" ))
@@ -92,10 +91,6 @@ server bundled externs initEnv port = do
92
91
scotty port $ do
93
92
get " /" $
94
93
Scotty. text " POST api.purescript.org/compile"
95
- get " /bundle" $ do
96
- Scotty. setHeader " Access-Control-Allow-Origin" " *"
97
- Scotty. setHeader " Content-Type" " text/javascript"
98
- Scotty. text bundled
99
94
post " /compile" $ do
100
95
code <- T. decodeUtf8 . BL. toStrict <$> body
101
96
response <- lift $ compile code
@@ -164,26 +159,15 @@ tryParseType = hush . fmap (CST.convertType "<file>") . runParser CST.parseTypeP
164
159
. CST. runTokenParser (p <* CSTM. token CST. TokEof )
165
160
. CST. lexTopLevel
166
161
167
- bundle :: IO (Either Bundle. ErrorMessage String )
168
- bundle = runExceptT $ do
169
- inputFiles <- liftIO (glob (" .psci_modules" </> " node_modules" </> " *" </> " *.js" ))
170
- input <- for inputFiles $ \ filename -> do
171
- js <- liftIO (readUTF8File filename)
172
- mid <- Bundle. guessModuleIdentifier filename
173
- length js `seq` return (mid, js)
174
- Bundle. bundle input [] Nothing " PS"
175
-
176
162
main :: IO ()
177
163
main = do
178
164
(portString : inputGlobs) <- getArgs
179
165
let port = read portString
180
166
inputFiles <- concat <$> traverse glob inputGlobs
181
167
let onError f = either (Left . f) Right
182
168
e <- runExceptT $ do
183
- modules <- ExceptT (fmap (onError Right ) (I. loadAllModules inputFiles))
184
- (exts, env) <- ExceptT . fmap (onError Right ) . I. runMake . I. make . map (second CST. pureResult) $ modules
185
- js <- ExceptT (fmap (onError Left ) bundle)
186
- return (fromString js, exts, env)
169
+ modules <- ExceptT $ I. loadAllModules inputFiles
170
+ ExceptT . I. runMake . I. make $ map (second CST. pureResult) modules
187
171
case e of
188
172
Left err -> print err >> exitFailure
189
- Right (js, exts, env) -> server js exts env port
173
+ Right (exts, env) -> server exts env port
0 commit comments