git.iko.soy/elk
on master help sign in
Do better on the TODO for compiling Elm in the reactor
6ff0c83Evan Czaplicki
ui/terminal/src/Develop.hs+41−21
compare with master
unifiedsplit
@@ -5,22 +5,32 @@ module Develop
5 )
5 )
6 where
6 where
7
7
8+
8import Control.Applicative ((<|>))
9import Control.Applicative ((<|>))
10+import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
9−import Control.Monad (guard)
11+import Control.Monad (guard, void)
10import Control.Monad.Trans (MonadIO(liftIO))
12import Control.Monad.Trans (MonadIO(liftIO))
11import qualified Data.ByteString.Builder as B
13import qualified Data.ByteString.Builder as B
12import qualified Data.ByteString as BS
14import qualified Data.ByteString as BS
13import qualified Data.HashMap.Strict as HashMap
15import qualified Data.HashMap.Strict as HashMap
14import Data.Monoid ((<>))
16import Data.Monoid ((<>))
15import qualified System.Directory as Dir
17import qualified System.Directory as Dir
16−import System.FilePath
18+import System.FilePath as FP
17import Snap.Core
19import Snap.Core
18import Snap.Http.Server
20import Snap.Http.Server
19import Snap.Util.FileServe
21import Snap.Util.FileServe
20
22
23+import qualified Elm.Compiler.Objects as Obj
24+import qualified Elm.Project as Project
21import qualified Develop.Generate.Help as Generate
25import qualified Develop.Generate.Help as Generate
22import qualified Develop.Generate.Index as Index
26import qualified Develop.Generate.Index as Index
23import qualified Develop.StaticFiles as StaticFiles
27import qualified Develop.StaticFiles as StaticFiles
28+import qualified Generate.Output as Output
29+import qualified Json.Encode as Encode
30+import qualified Reporting.Exit as Exit
31+import qualified Reporting.Progress as Progress
32+import qualified Reporting.Task as Task
33+import qualified Stuff.Paths as Path
24
34
25
35
26
36
@@ -83,23 +93,6 @@ directoryConfig =
83
93
84
94
85
95
86−-- COMPILE
87−
88−
89−_compile :: Snap ()
90−_compile =
91− do file <- getSafePath
92− guard =<< liftIO (Dir.doesFileExist file)
93− modifyResponse (setContentType "text/javascript")
94− writeBS =<< liftIO (toJavaScript file)
95−
96−
97−toJavaScript :: FilePath -> IO BS.ByteString
98−toJavaScript filePath =
99− error "TODO toJavaScript" filePath
100−
101−
102−
103-- NOT FOUND
96-- NOT FOUND
104
97
105
98
@@ -163,8 +156,35 @@ serveCode file =
163serveElm :: FilePath -> Snap ()
156serveElm :: FilePath -> Snap ()
164serveElm file =
157serveElm file =
165 do guard (takeExtension file == ".elm")
158 do guard (takeExtension file == ".elm")
159+
160+ result <- liftIO $
161+ do mvar <- newEmptyMVar
162+
163+ let reporter = Progress.Reporter (\_ -> return ()) (putMVar mvar)
164+
165+ void $ Task.run reporter $
166+ do summary <- Project.getRoot
167+ Project.compile options Nothing summary [file]
168+
169+ takeMVar mvar
170+
171+ case result of
172+ Just exit ->
166− modifyResponse (setContentType "text/html")
173+ do modifyResponse (setContentType "text/html")
167− writeBuilder (error "TODO")
174+ writeBuilder $
175+ Generate.makePageHtml "Errors" (Encode.encode (Exit.toJson exit))
176+
177+ Nothing ->
178+ serveFileAs "text/html" (Path.temp "html")
179+
180+
181+options :: Output.Options
182+options =
183+ let
184+ (directory, filePath) = FP.splitFileName (Path.temp "html")
185+ output = Output.Html (Just directory) filePath
186+ in
187+ Output.Options Obj.Dev Obj.Client (Just output)
168
188
169
189
170
190