elm-pages 3.0.0-beta.15 → 3.0.0-beta.16

package/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm

@@ -15,7 +15,7 @@ all =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -70,7 +70,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -100,7 +100,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = BackendTask.fail (Exception.fromString "")
+       , data = BackendTask.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -115,7 +115,7 @@ data =
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
@@ -169,7 +169,7 @@ data =
                                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
@@ -200,7 +200,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = DS.fail (Exception.fromString "")
+       , data = DS.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -217,7 +217,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -272,7 +272,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -301,7 +301,7 @@ type alias Data =
 route : StatelessRoute RouteParams Data ActionData
 route =
     RouteBuilder.preRender
-        { data = \\_ -> BackendTask.fail (Exception.fromString "")
+        { data = \\_ -> BackendTask.fail (FatalError.fromString "")
         , head = head
         , pages = pages
         }
@@ -318,7 +318,7 @@ data =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -355,7 +355,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -390,7 +390,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -419,7 +419,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -456,7 +456,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -491,7 +491,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -520,7 +520,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -549,7 +549,7 @@ route =
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import BackendTask exposing (BackendTask)
 import RouteBuilder exposing (Page, StaticPayload)
@@ -581,7 +581,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    RouteBuilder.single
        { head = head
-       , data = BackendTask.fail (Exception.fromString "")
+       , data = BackendTask.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -597,7 +597,7 @@ data =
                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import Browser.Navigation
 import BackendTask
@@ -648,7 +648,7 @@ type alias Model =
                                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import Browser.Navigation
 import BackendTask
@@ -669,7 +669,7 @@ template =
     { init = init
     , update = update
     , view = view
-    , data = BackendTask.fail (Exception.fromString "")
+    , data = BackendTask.fail (FatalError.fromString "")
     , subscriptions = subscriptions
     , onPageChange = Just OnPageChange
     }

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 1951305281, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 4260939212, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1951305281,
+  initialSeed: 4260939212,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/RouteBuilder.elm

@@ -89,7 +89,7 @@ import BackendTask exposing (BackendTask)
 import Dict exposing (Dict)
 import Effect exposing (Effect)
 import ErrorPage exposing (ErrorPage)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 import Http
 import Json.Decode
@@ -109,9 +109,9 @@ import View exposing (View)
 
 {-| -}
 type alias StatefulRoute routeParams data action model msg =
-    { data : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-    , action : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response action ErrorPage)
-    , staticRoutes : BackendTask Throwable (List routeParams)
+    { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+    , staticRoutes : BackendTask FatalError (List routeParams)
     , view :
         Maybe PageUrl
         -> Shared.Model
@@ -124,7 +124,7 @@ type alias StatefulRoute routeParams data action model msg =
     , init : Maybe PageUrl -> Shared.Model -> StaticPayload data action routeParams -> ( model, Effect msg )
     , update : PageUrl -> StaticPayload data action routeParams -> msg -> model -> Shared.Model -> ( model, Effect msg, Maybe Shared.Msg )
     , subscriptions : Maybe PageUrl -> routeParams -> Path -> model -> Shared.Model -> Sub msg
-    , handleRoute : { moduleName : List String, routePattern : RoutePattern } -> (routeParams -> List ( String, String )) -> routeParams -> BackendTask Throwable (Maybe NotFoundReason)
+    , handleRoute : { moduleName : List String, routePattern : RoutePattern } -> (routeParams -> List ( String, String )) -> routeParams -> BackendTask FatalError (Maybe NotFoundReason)
     , kind : String
     , onAction : Maybe (action -> msg)
     }
@@ -154,9 +154,9 @@ type alias StaticPayload data action routeParams =
 {-| -}
 type Builder routeParams data action
     = WithData
-        { data : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-        , action : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response action ErrorPage)
-        , staticRoutes : BackendTask Throwable (List routeParams)
+        { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+        , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+        , staticRoutes : BackendTask FatalError (List routeParams)
         , head :
             StaticPayload data action routeParams
             -> List Head.Tag
@@ -165,7 +165,7 @@ type Builder routeParams data action
             { moduleName : List String, routePattern : RoutePattern }
             -> (routeParams -> List ( String, String ))
             -> routeParams
-            -> BackendTask Throwable (Maybe NotFoundReason)
+            -> BackendTask FatalError (Maybe NotFoundReason)
         , kind : String
         }
 
@@ -292,14 +292,14 @@ buildWithSharedState config builderState =
 
 {-| -}
 single :
-    { data : BackendTask Throwable data
+    { data : BackendTask FatalError data
     , head : StaticPayload data action {} -> List Head.Tag
     }
     -> Builder {} data action
 single { data, head } =
     WithData
         { data = \_ _ -> data |> BackendTask.map Server.Response.render
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = BackendTask.succeed [ {} ]
         , head = head
         , serverless = False
@@ -310,15 +310,15 @@ single { data, head } =
 
 {-| -}
 preRender :
-    { data : routeParams -> BackendTask Throwable data
-    , pages : BackendTask Throwable (List routeParams)
+    { data : routeParams -> BackendTask FatalError data
+    , pages : BackendTask FatalError (List routeParams)
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
 preRender { data, head, pages } =
     WithData
         { data = \_ -> data >> BackendTask.map Server.Response.render
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = pages
         , head = head
         , serverless = False
@@ -348,15 +348,15 @@ preRender { data, head, pages } =
 
 {-| -}
 preRenderWithFallback :
-    { data : routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-    , pages : BackendTask Throwable (List routeParams)
+    { data : routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , pages : BackendTask FatalError (List routeParams)
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
 preRenderWithFallback { data, head, pages } =
     WithData
         { data = \_ -> data
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = pages
         , head = head
         , serverless = False
@@ -369,8 +369,8 @@ preRenderWithFallback { data, head, pages } =
 
 {-| -}
 serverRender :
-    { data : routeParams -> Server.Request.Parser (BackendTask Throwable (Server.Response.Response data ErrorPage))
-    , action : routeParams -> Server.Request.Parser (BackendTask Throwable (Server.Response.Response action ErrorPage))
+    { data : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response data ErrorPage))
+    , action : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response action ErrorPage))
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
@@ -386,7 +386,7 @@ serverRender { data, action, head } =
                                 |> Result.mapError Json.Decode.errorToString
                                 |> BackendTask.fromResult
                                 -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (Exception.fromString error))
+                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
                        )
                 )
                     |> BackendTask.andThen
@@ -397,7 +397,7 @@ serverRender { data, action, head } =
 
                                 Err error ->
                                     Server.Request.errorsToString error
-                                        |> Exception.fromString
+                                        |> FatalError.fromString
                                         |> BackendTask.fail
                         )
         , action =
@@ -410,7 +410,7 @@ serverRender { data, action, head } =
                                 |> Result.mapError Json.Decode.errorToString
                                 |> BackendTask.fromResult
                                 -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (Exception.fromString error))
+                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
                        )
                 )
                     |> BackendTask.andThen
@@ -421,7 +421,7 @@ serverRender { data, action, head } =
 
                                 Err error ->
                                     Server.Request.errorsToString error
-                                        |> Exception.fromString
+                                        |> FatalError.fromString
                                         |> BackendTask.fail
                         )
         , staticRoutes = BackendTask.succeed []

package/generator/src/SharedTemplate.elm

@@ -2,7 +2,7 @@ module SharedTemplate exposing (SharedTemplate)
 
 import BackendTask
 import Effect exposing (Effect)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Html exposing (Html)
 import Pages.Flags exposing (Flags)
 import Pages.PageUrl exposing (PageUrl)
@@ -36,7 +36,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         -> (msg -> mappedMsg)
         -> View mappedMsg
         -> { body : List (Html mappedMsg), title : String }
-    , data : BackendTask.BackendTask Throwable sharedData
+    , data : BackendTask.BackendTask FatalError sharedData
     , subscriptions : Path -> sharedModel -> Sub msg
     , onPageChange :
         Maybe

package/generator/src/SiteConfig.elm

@@ -1,11 +1,11 @@
 module SiteConfig exposing (SiteConfig)
 
 import BackendTask exposing (BackendTask)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 
 
 type alias SiteConfig =
     { canonicalUrl : String
-    , head : BackendTask Throwable (List Head.Tag)
+    , head : BackendTask FatalError (List Head.Tag)
     }

package/generator/src/cli.js

@@ -270,7 +270,7 @@ function generatorWrapperFile(moduleName) {
 
 import Bytes
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import Cli.Program as Program
 import Json.Decode as Decode
 import Json.Encode as Encode
@@ -278,7 +278,7 @@ import Pages.Internal.Platform.GeneratorApplication
 import ${moduleName}
 
 
-main : Program.StatefulProgram Pages.Internal.Platform.GeneratorApplication.Model Pages.Internal.Platform.GeneratorApplication.Msg (BackendTask Exception.Throwable ()) Pages.Internal.Platform.GeneratorApplication.Flags
+main : Program.StatefulProgram Pages.Internal.Platform.GeneratorApplication.Model Pages.Internal.Platform.GeneratorApplication.Msg (BackendTask FatalError.FatalError ()) Pages.Internal.Platform.GeneratorApplication.Flags
 main =
     Pages.Internal.Platform.GeneratorApplication.app
         { data = ${moduleName}.run

package/generator/src/compatibility-key.js

@@ -1 +1 @@
-module.exports = { compatibilityKey: 5 };
+module.exports = { compatibilityKey: 6 };

package/generator/src/render.js

@@ -642,11 +642,11 @@ function flushIfDone(app) {
 
 function flushQueue(app) {
   // TODO - could the case where flush is called with size 0 be avoided on the Elm side?
-  if (pendingBackendTaskResponses.size > 0) {
-    // console.log("@@@ FLUSHING", pendingBackendTaskResponses.size);
-    app.ports.gotBatchSub.send(Object.fromEntries(pendingBackendTaskResponses));
-    pendingBackendTaskResponses = new Map();
-  }
+  // if (pendingBackendTaskResponses.size > 0) {
+  // console.log("@@@ FLUSHING", pendingBackendTaskResponses.size);
+  app.ports.gotBatchSub.send(Object.fromEntries(pendingBackendTaskResponses));
+  pendingBackendTaskResponses = new Map();
+  // }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0-beta.16",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",

package/src/ApiRoute.elm

@@ -173,7 +173,7 @@ You define your ApiRoute's in `app/Api.elm`. Here's a simple example:
 -}
 
 import BackendTask exposing (BackendTask)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 import Internal.ApiRoute exposing (ApiRoute(..), ApiRouteBuilder(..))
 import Json.Decode as Decode
@@ -192,14 +192,14 @@ type alias ApiRoute response =
 {-| Same as [`preRender`](#preRender), but for an ApiRoute that has no dynamic segments. This is just a bit simpler because
 since there are no dynamic segments, you don't need to provide a BackendTask with the list of dynamic segments to pre-render because there is only a single possible route.
 -}
-single : ApiRouteBuilder (BackendTask Throwable String) (List String) -> ApiRoute Response
+single : ApiRouteBuilder (BackendTask FatalError String) (List String) -> ApiRoute Response
 single handler =
     handler
         |> preRender (\constructor -> BackendTask.succeed [ constructor ])
 
 
 {-| -}
-serverRender : ApiRouteBuilder (Server.Request.Parser (BackendTask Throwable (Server.Response.Response Never Never))) constructor -> ApiRoute Response
+serverRender : ApiRouteBuilder (Server.Request.Parser (BackendTask FatalError (Server.Response.Response Never Never))) constructor -> ApiRoute Response
 serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
     ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
@@ -218,7 +218,7 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
                                 |> BackendTask.onError
                                     (\stringError ->
                                         -- TODO make error with title and better context/formatting
-                                        Exception.fromString stringError |> BackendTask.fail
+                                        FatalError.fromString stringError |> BackendTask.fail
                                     )
                                 |> BackendTask.andThen
                                     (\rendered ->
@@ -260,10 +260,10 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
 
 
 {-| -}
-preRenderWithFallback : (constructor -> BackendTask Throwable (List (List String))) -> ApiRouteBuilder (BackendTask Throwable (Server.Response.Response Never Never)) constructor -> ApiRoute Response
+preRenderWithFallback : (constructor -> BackendTask FatalError (List (List String))) -> ApiRouteBuilder (BackendTask FatalError (Server.Response.Response Never Never)) constructor -> ApiRoute Response
 preRenderWithFallback buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
     let
-        buildTimeRoutes__ : BackendTask Throwable (List String)
+        buildTimeRoutes__ : BackendTask FatalError (List String)
         buildTimeRoutes__ =
             buildUrls (constructor [])
                 |> BackendTask.map (List.map toString)
@@ -302,15 +302,15 @@ encodeStaticFileBody fileBody =
 
 
 {-| -}
-preRender : (constructor -> BackendTask Throwable (List (List String))) -> ApiRouteBuilder (BackendTask Throwable String) constructor -> ApiRoute Response
+preRender : (constructor -> BackendTask FatalError (List (List String))) -> ApiRouteBuilder (BackendTask FatalError String) constructor -> ApiRoute Response
 preRender buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
     let
-        buildTimeRoutes__ : BackendTask Throwable (List String)
+        buildTimeRoutes__ : BackendTask FatalError (List String)
         buildTimeRoutes__ =
             buildUrls (constructor [])
                 |> BackendTask.map (List.map toString)
 
-        preBuiltMatches : BackendTask Throwable (List (List String))
+        preBuiltMatches : BackendTask FatalError (List (List String))
         preBuiltMatches =
             buildUrls (constructor [])
     in
@@ -323,7 +323,7 @@ preRender buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) a
                     matches =
                         Internal.ApiRoute.pathToMatches path fullHandler
 
-                    routeFound : BackendTask Throwable Bool
+                    routeFound : BackendTask FatalError Bool
                     routeFound =
                         preBuiltMatches
                             |> BackendTask.map (List.member matches)
@@ -431,19 +431,19 @@ capture (ApiRouteBuilder patterns pattern previousHandler toString constructor)
 
 {-| For internal use by generated code. Not so useful in user-land.
 -}
-getBuildTimeRoutes : ApiRoute response -> BackendTask Throwable (List String)
+getBuildTimeRoutes : ApiRoute response -> BackendTask FatalError (List String)
 getBuildTimeRoutes (ApiRoute handler) =
     handler.buildTimeRoutes
 
 
 {-| Include head tags on every page's HTML.
 -}
-withGlobalHeadTags : BackendTask Throwable (List Head.Tag) -> ApiRoute response -> ApiRoute response
+withGlobalHeadTags : BackendTask FatalError (List Head.Tag) -> ApiRoute response -> ApiRoute response
 withGlobalHeadTags globalHeadTags (ApiRoute handler) =
     ApiRoute { handler | globalHeadTags = Just globalHeadTags }
 
 
 {-| -}
-getGlobalHeadTagsBackendTask : ApiRoute response -> Maybe (BackendTask Throwable (List Head.Tag))
+getGlobalHeadTagsBackendTask : ApiRoute response -> Maybe (BackendTask FatalError (List Head.Tag))
 getGlobalHeadTagsBackendTask (ApiRoute handler) =
     handler.globalHeadTags

package/src/BackendTask/Env.elm

@@ -8,23 +8,23 @@ down into the final `Data` value, it won't end up in the client!
 
     import BackendTask exposing (BackendTask)
     import BackendTask.Env
-    import Exception exposing (Throwable)
+    import FatalError exposing (FatalError)
 
     type alias EnvVariables =
         { sendGridKey : String
         , siteUrl : String
         }
 
-    sendEmail : Email -> BackendTask Throwable ()
+    sendEmail : Email -> BackendTask FatalError ()
     sendEmail email =
         BackendTask.map2 EnvVariables
-            (BackendTask.Env.expect "SEND_GRID_KEY" |> BackendTask.throw)
+            (BackendTask.Env.expect "SEND_GRID_KEY" |> BackendTask.allowFatal)
             (BackendTask.Env.get "BASE_URL"
                 |> BackendTask.map (Maybe.withDefault "http://localhost:1234")
             )
             |> BackendTask.andThen (sendEmailBackendTask email)
 
-    sendEmailBackendTask : Email -> EnvVariables -> BackendTask Throwable ()
+    sendEmailBackendTask : Email -> EnvVariables -> BackendTask FatalError ()
     sendEmailBackendTask email envVariables =
         Debug.todo "Not defined here"
 
@@ -40,7 +40,7 @@ down into the final `Data` value, it won't end up in the client!
 import BackendTask exposing (BackendTask)
 import BackendTask.Http
 import BackendTask.Internal.Request
-import Exception exposing (Exception)
+import FatalError exposing (FatalError)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import TerminalText
@@ -65,9 +65,9 @@ get envVariableName =
         }
 
 
-{-| Get an environment variable, or a BackendTask Exception if there is no environment variable matching that name.
+{-| Get an environment variable, or a BackendTask FatalError if there is no environment variable matching that name.
 -}
-expect : String -> BackendTask (Exception Error) String
+expect : String -> BackendTask { fatal : FatalError, recoverable : Error } String
 expect envVariableName =
     envVariableName
         |> get
@@ -75,7 +75,7 @@ expect envVariableName =
             (\maybeValue ->
                 maybeValue
                     |> Result.fromMaybe
-                        (Exception.Exception (MissingEnvVariable envVariableName)
+                        (FatalError.recoverable
                             { title = "Missing Env Variable"
                             , body =
                                 [ TerminalText.text "BackendTask.Env.expect was expecting a variable `"
@@ -84,6 +84,7 @@ expect envVariableName =
                                 ]
                                     |> TerminalText.toString
                             }
+                            (MissingEnvVariable envVariableName)
                         )
                     |> BackendTask.fromResult
             )