Update compiler options

Author: garyb

README.md

@@ -34,7 +34,7 @@ There is also [a more complete example](#full-example) that makes use of all the
 
 Refer to the PureScript [compiler usage](https://github.com/purescript/purescript/wiki/Language-Guide:-Getting-Started#compiler-usage) section of the Github wiki for additional details on the behaviour of each option below.
 
-Options can be passed to the Haskell runtime system for `psc` by passing a `--psc-rts-flags` argument to `gulp`. Any values that follow this flag will be passed through to the runtime. There is no need to include `+RTS`/`-RTS` options as these are inserted automatically. See [the GHC documentation](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/runtime-control.html#rts-opts-cmdline) for information on the available RTS options.
+Options can be passed to the Haskell runtime system for `purs` by passing a `--purs-rts-flags` argument to `gulp`. Any values that follow this flag will be passed through to the runtime. There is no need to include `+RTS`/`-RTS` options as these are inserted automatically. See [the GHC documentation](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/runtime-control.html#rts-opts-cmdline) for information on the available RTS options.
 
 ### `purescript.psc(options)`
 
@@ -44,17 +44,9 @@ Invokes the `psc` command. The following options are supported.
 
 Files to compile. Glob syntax is supported.
 
-###### `noTco` (Boolean)
-
-Toggles `--no-tco` that disables tail-call optimizations.
-
-###### `noMagicDo` (Boolean)
-
-Toggles `--no-magic-do` that disables optimizations overloading the do keyword generating efficient code for the `Eff` monad.
-
-###### `noOpts` (Boolean)
+###### `output` (String)
 
-Toggles `--no-opts` that skips the optimization phase.
+Sets `--output=<string>` the specifies the output directory, `output` by default.
 
 ###### `verboseErrors` (Boolean)
 
@@ -64,25 +56,25 @@ Toggles `--verbose-errors` that displays verbose error messages.
 
 Toggles `--comments` that includes comments in generated code.
 
-###### `output` (String)
+###### `sourceMaps` (Boolean)
 
-Sets `--output=<string>` the specifies the output directory, `output` by default.
+Toggles `--source-maps` that generates source maps.
 
-###### `noPrefix` (Boolean)
+###### `dumpCoreFn` (Boolean)
 
-Toggles `--no-prefix` that does not include the comment header.
+Toggles `--dump-corefn` that generates dumps the (functional) core representation of the compiled code at `output/*/corefn.json`.
 
-###### `sourceMaps` (Boolean)
+###### `noPrefix` (Boolean)
 
-Toggles `--source-maps` that generates source maps.
+Toggles `--no-prefix` that does not include the comment header.
 
 ###### `jsonErrors` (Boolean)
 
 Toggles `--json-errors` that prints errors to stderr as JSON.
 
 ### `purescript.pscBundle(options)`
 
-Invokes the `psc-bundle` command. The following options are supported.
+Invokes the `purs compile` command. The following options are supported.
 
 ###### `src` (String or String Array)
 
@@ -104,9 +96,13 @@ Toggles `--main` or sets `--main=<string>` that generates code to run the `main`
 
 Sets `--namespace=<string>` that specifies the namespace that PureScript modules will be exported to when running in the browser.
 
+###### `sourceMaps` (Boolean)
+
+Toggles `--source-maps` that generates source maps.
+
 ### `purescript.pscDocs(options)`
 
-Invokes the `psc-docs` command. The following options are supported.
+Invokes the `purs docs` command. The following options are supported.
 
 ###### `src` (String or String Array)
 

src/GulpPurescript/Options.purs

@@ -34,12 +34,6 @@ noMagicDoOpt = "no-magic-do"
 noMagicDoKey :: String
 noMagicDoKey = camelcaseFn noMagicDoOpt
 
-noTcoOpt :: String
-noTcoOpt = "no-tco"
-
-noTcoKey :: String
-noTcoKey = camelcaseFn noTcoOpt
-
 verboseErrorsOpt :: String
 verboseErrorsOpt = "verbose-errors"
 
@@ -76,6 +70,12 @@ sourceMapsOpt = "source-maps"
 sourceMapsKey :: String
 sourceMapsKey = camelcaseFn sourceMapsOpt
 
+dumpCoreFnOpt :: String
+dumpCoreFnOpt = "dump-corefn"
+
+dumpCoreFnKey :: String
+dumpCoreFnKey = "dumpCoreFn"
+
 jsonErrorsOpt :: String
 jsonErrorsOpt = "json-errors"
 
@@ -109,13 +109,11 @@ docgenKey = docgenOpt
 newtype Psc
   = Psc { src :: Either String (Array String)
         , output :: Maybe String
-        , noTco :: Maybe Boolean
-        , noMagicDo :: Maybe Boolean
-        , noOpts :: Maybe Boolean
         , verboseErrors :: Maybe Boolean
         , comments :: Maybe Boolean
-        , noPrefix :: Maybe Boolean
         , sourceMaps :: Maybe Boolean
+        , dumpCoreFn :: Maybe Boolean
+        , noPrefix :: Maybe Boolean
         , jsonErrors :: Maybe Boolean
         }
 
@@ -125,6 +123,7 @@ newtype PscBundle
               , "module" :: Maybe (Either String (Array String))
               , main :: Maybe (Either Boolean String)
               , namespace :: Maybe String
+              , sourceMaps :: Maybe Boolean
               }
 
 newtype PscDocs
@@ -146,15 +145,13 @@ readPsc :: Foreign -> F Psc
 readPsc obj = do
   src <- readSources =<< readProp srcKey obj
   output <- readPropNU readString outputKey obj
-  noTco <- readPropNU readBoolean noTcoKey obj
-  noMagicDo <- readPropNU readBoolean noMagicDoKey obj
-  noOpts <- readPropNU readBoolean noOptsKey obj
   verboseErrors <- readPropNU readBoolean verboseErrorsKey obj
   comments <- readPropNU readBoolean commentsKey obj
-  noPrefix <- readPropNU readBoolean noPrefixKey obj
   sourceMaps <- readPropNU readBoolean sourceMapsKey obj
+  dumpCoreFn <- readPropNU readBoolean dumpCoreFnKey obj
+  noPrefix <- readPropNU readBoolean noPrefixKey obj
   jsonErrors <- readPropNU readBoolean jsonErrorsKey obj
-  pure $ Psc { src, output, noTco, noMagicDo, noOpts, verboseErrors, comments, noPrefix, sourceMaps, jsonErrors }
+  pure $ Psc { src, output, verboseErrors, comments, sourceMaps, dumpCoreFn, noPrefix, jsonErrors }
 
 readPscBundle :: Foreign -> F PscBundle
 readPscBundle obj = do
@@ -163,7 +160,8 @@ readPscBundle obj = do
   mod <- readPropNU readSources moduleKey obj
   main <- readPropNU (readEither readBoolean readString) mainKey obj
   namespace <- readPropNU readString namespaceKey obj
-  pure $ PscBundle { src, output, "module": mod, main, namespace }
+  sourceMaps <- readPropNU readBoolean sourceMapsKey obj
+  pure $ PscBundle { src, output, "module": mod, main, namespace, sourceMaps }
 
 readPscDocs :: Foreign -> F PscDocs
 readPscDocs obj = do
@@ -243,13 +241,11 @@ pscOptions opts = fold <$> parsed
   fold :: Psc -> Array String
   fold (Psc a) = either pure id a.src <>
                  opt outputOpt a.output <>
-                 opt noTcoOpt a.noTco <>
-                 opt noMagicDoOpt a.noMagicDo <>
-                 opt noOptsOpt a.noOpts <>
                  opt verboseErrorsOpt a.verboseErrors <>
                  opt commentsOpt a.comments <>
-                 opt noPrefixOpt a.noPrefix <>
                  opt sourceMapsOpt a.sourceMaps <>
+                 opt dumpCoreFnOpt a.dumpCoreFn <>
+                 opt noPrefixOpt a.noPrefix <>
                  opt jsonErrorsOpt a.jsonErrors
 
 pscBundleOptions :: Foreign -> F (Array String)
@@ -263,7 +259,8 @@ pscBundleOptions opts = fold <$> parsed
                        opt outputOpt a.output <>
                        opt moduleOpt a."module" <>
                        opt mainOpt a.main <>
-                       opt namespaceOpt a.namespace
+                       opt namespaceOpt a.namespace <>
+                       opt sourceMapsOpt a.sourceMaps
 
 pscDocsOptions :: Foreign -> F (Array String)
 pscDocsOptions opts = fold <$> parsed

src/GulpPurescript/Plugin.purs

@@ -42,7 +42,7 @@ foreign import argv :: Array String
 
 rtsOpts :: Array String
 rtsOpts =
-  let startIndex = Array.elemIndex "--psc-rts-flags" argv
+  let startIndex = Array.elemIndex "--purs-rts-flags" argv
   in case startIndex of
     Just i -> ["+RTS"] <> Array.drop (i + 1) argv <> ["-RTS"]
     _ -> []