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

package/src/Pages/Internal/Platform/Cli.elm

@@ -12,7 +12,7 @@ import Bytes exposing (Bytes)
 import Bytes.Encode
 import Codec
 import Dict
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head exposing (Tag)
 import Html exposing (Html)
 import HtmlPrinter
@@ -51,7 +51,7 @@ currentCompatibilityKey =
 
 {-| -}
 type alias Model route =
-    { staticResponses : BackendTask Throwable Effect
+    { staticResponses : BackendTask FatalError Effect
     , errors : List BuildError
     , maybeRequestJson : RenderRequest route
     , isDevServer : Bool
@@ -376,11 +376,11 @@ initLegacy :
     -> ( Model route, Effect )
 initLegacy site ((RenderRequest.SinglePage includeHtml singleRequest _) as renderRequest) { isDevServer } config =
     let
-        globalHeadTags : BackendTask Throwable (List Tag)
+        globalHeadTags : BackendTask FatalError (List Tag)
         globalHeadTags =
             (config.globalHeadTags |> Maybe.withDefault (\_ -> BackendTask.succeed [])) HtmlPrinter.htmlToString
 
-        staticResponsesNew : BackendTask Throwable Effect
+        staticResponsesNew : BackendTask FatalError Effect
         staticResponsesNew =
             StaticResponses.renderApiRequest
                 (case singleRequest of

package/src/Pages/Internal/Platform/CompatibilityKey.elm

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    5
+    6

package/src/Pages/Internal/Platform/GeneratorApplication.elm

@@ -11,7 +11,7 @@ import BuildError exposing (BuildError)
 import Cli.Program as Program exposing (FlagsIncludingArgv)
 import Codec
 import Dict
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import HtmlPrinter
 import Json.Decode as Decode
 import Json.Encode as Encode
@@ -33,7 +33,7 @@ type alias Flags =
 
 {-| -}
 type alias Model =
-    { staticResponses : BackendTask Throwable ()
+    { staticResponses : BackendTask FatalError ()
     , errors : List BuildError
     }
 
@@ -47,10 +47,10 @@ type Msg
 {-| -}
 app :
     GeneratorProgramConfig
-    -> Program.StatefulProgram Model Msg (BackendTask Throwable ()) Flags
+    -> Program.StatefulProgram Model Msg (BackendTask FatalError ()) Flags
 app config =
     let
-        cliConfig : Program.Config (BackendTask Throwable ())
+        cliConfig : Program.Config (BackendTask FatalError ())
         cliConfig =
             case config.data of
                 Pages.Internal.Script.Script theCliConfig ->
@@ -246,7 +246,7 @@ perform config effect =
 
 {-| -}
 init :
-    BackendTask Throwable ()
+    BackendTask FatalError ()
     -> FlagsIncludingArgv Flags
     -> ( Model, Effect )
 init execute flags =
@@ -282,11 +282,11 @@ init execute flags =
 
 
 initLegacy :
-    BackendTask Throwable ()
+    BackendTask FatalError ()
     -> ( Model, Effect )
 initLegacy execute =
     let
-        staticResponses : BackendTask Throwable ()
+        staticResponses : BackendTask FatalError ()
         staticResponses =
             StaticResponses.renderApiRequest execute
 

package/src/Pages/Internal/Platform/StaticResponses.elm

@@ -2,35 +2,36 @@ module Pages.Internal.Platform.StaticResponses exposing (NextStep(..), empty, ne
 
 import BackendTask exposing (BackendTask)
 import BuildError exposing (BuildError)
-import Exception exposing (Exception(..), Throwable)
+import FatalError exposing (FatalError, Recoverable)
 import List.Extra
+import Pages.Internal.FatalError
 import Pages.StaticHttp.Request as HashRequest
 import Pages.StaticHttpRequest as StaticHttpRequest
 import RequestsAndPending exposing (RequestsAndPending)
 import TerminalText
 
 
-empty : a -> BackendTask Throwable a
+empty : a -> BackendTask FatalError a
 empty a =
     BackendTask.succeed a
 
 
 renderApiRequest :
-    BackendTask Throwable response
-    -> BackendTask Throwable response
+    BackendTask FatalError response
+    -> BackendTask FatalError response
 renderApiRequest request =
     request
 
 
 type NextStep route value
-    = Continue (List HashRequest.Request) (StaticHttpRequest.RawRequest Throwable value)
+    = Continue (List HashRequest.Request) (StaticHttpRequest.RawRequest FatalError value)
     | Finish value
     | FinishedWithErrors (List BuildError)
 
 
 nextStep :
     RequestsAndPending
-    -> BackendTask Throwable a
+    -> BackendTask FatalError a
     ->
         { model
             | errors : List BuildError
@@ -38,7 +39,7 @@ nextStep :
     -> NextStep route a
 nextStep allRawResponses staticResponses { errors } =
     let
-        staticRequestsStatus : StaticHttpRequest.Status Throwable a
+        staticRequestsStatus : StaticHttpRequest.Status FatalError a
         staticRequestsStatus =
             allRawResponses
                 |> StaticHttpRequest.cacheRequestResolution staticResponses
@@ -63,7 +64,7 @@ nextStep allRawResponses staticResponses { errors } =
                 StaticHttpRequest.HasPermanentError _ ->
                     ( ( False, Nothing )
                     , []
-                    , BackendTask.fail (Exception.fromString "TODO this shouldn't happen")
+                    , BackendTask.fail (FatalError.fromString "TODO this shouldn't happen")
                     )
     in
     if pendingRequests then
@@ -111,7 +112,7 @@ nextStep allRawResponses staticResponses { errors } =
                 Just (Ok completed) ->
                     Finish completed
 
-                Just (Err (Exception () buildError)) ->
+                Just (Err (Pages.Internal.FatalError.FatalError buildError)) ->
                     FinishedWithErrors
                         [ { title = buildError.title |> String.toUpper
                           , path = "" -- TODO include path here

package/src/Pages/Internal/Script.elm

@@ -2,7 +2,7 @@ module Pages.Internal.Script exposing (Script(..))
 
 import BackendTask exposing (BackendTask)
 import Cli.Program as Program
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Html exposing (Html)
 
 
@@ -13,5 +13,5 @@ type Script
           -> Html Never
           -> String
          )
-         -> Program.Config (BackendTask Throwable ())
+         -> Program.Config (BackendTask FatalError ())
         )

package/src/Pages/Manifest.elm

@@ -68,7 +68,7 @@ import BackendTask exposing (BackendTask)
 import Color exposing (Color)
 import Color.Convert
 import Dict exposing (Dict)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 import Json.Encode as Encode
 import LanguageTag exposing (LanguageTag, emptySubtags)
@@ -345,7 +345,7 @@ nonEmptyList list =
 
 {-| A generator for Api.elm to include a manifest.json.
 -}
-generator : String -> BackendTask Throwable Config -> ApiRoute.ApiRoute ApiRoute.Response
+generator : String -> BackendTask FatalError Config -> ApiRoute.ApiRoute ApiRoute.Response
 generator canonicalSiteUrl config =
     ApiRoute.succeed
         (config

package/src/Pages/ProgramConfig.elm

@@ -7,7 +7,7 @@ import Bytes exposing (Bytes)
 import Bytes.Decode
 import Bytes.Encode
 import Dict exposing (Dict)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Form.FormData exposing (FormData)
 import Head
 import Html exposing (Html)
@@ -49,9 +49,9 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
         -> ( userModel, effect )
     , update : Pages.FormState.PageFormState -> Dict String (Pages.Transition.FetcherState actionData) -> Maybe Pages.Transition.Transition -> sharedData -> pageData -> Maybe Browser.Navigation.Key -> userMsg -> userModel -> ( userModel, effect )
     , subscriptions : route -> Path -> userModel -> Sub userMsg
-    , sharedData : BackendTask Throwable sharedData
-    , data : Decode.Value -> route -> BackendTask Throwable (PageServerResponse pageData errorPage)
-    , action : Decode.Value -> route -> BackendTask Throwable (PageServerResponse actionData errorPage)
+    , sharedData : BackendTask FatalError sharedData
+    , data : Decode.Value -> route -> BackendTask FatalError (PageServerResponse pageData errorPage)
+    , action : Decode.Value -> route -> BackendTask FatalError (PageServerResponse actionData errorPage)
     , onActionData : actionData -> Maybe userMsg
     , view :
         Pages.FormState.PageFormState
@@ -69,8 +69,8 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
             { view : userModel -> { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
             , head : List Head.Tag
             }
-    , handleRoute : route -> BackendTask Throwable (Maybe NotFoundReason)
-    , getStaticRoutes : BackendTask Throwable (List route)
+    , handleRoute : route -> BackendTask FatalError (Maybe NotFoundReason)
+    , getStaticRoutes : BackendTask FatalError (List route)
     , urlToRoute : Url -> route
     , routeToPath : route -> List String
     , site : Maybe SiteConfig
@@ -102,7 +102,7 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
     , encodeResponse : ResponseSketch pageData actionData sharedData -> Bytes.Encode.Encoder
     , encodeAction : actionData -> Bytes.Encode.Encoder
     , decodeResponse : Bytes.Decode.Decoder (ResponseSketch pageData actionData sharedData)
-    , globalHeadTags : Maybe ((Maybe { indent : Int, newLines : Bool } -> Html Never -> String) -> BackendTask Throwable (List Head.Tag))
+    , globalHeadTags : Maybe ((Maybe { indent : Int, newLines : Bool } -> Html Never -> String) -> BackendTask FatalError (List Head.Tag))
     , cmdToEffect : Cmd userMsg -> effect
     , perform :
         { fetchRouteData :

package/src/Pages/Script.elm

@@ -34,7 +34,7 @@ import BackendTask.Http
 import BackendTask.Internal.Request
 import Cli.OptionsParser as OptionsParser
 import Cli.Program as Program
-import Exception exposing (Exception, Throwable)
+import FatalError exposing (FatalError, Recoverable)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import Pages.Internal.Script
@@ -52,7 +52,7 @@ type Error
 
 
 {-| -}
-writeFile : { path : String, body : String } -> BackendTask (Exception Error) ()
+writeFile : { path : String, body : String } -> BackendTask (Recoverable Error) ()
 writeFile { path, body } =
     BackendTask.Internal.Request.request
         { name = "write-file"
@@ -85,7 +85,7 @@ log message =
 
 
 {-| -}
-withoutCliOptions : BackendTask Throwable () -> Script
+withoutCliOptions : BackendTask FatalError () -> Script
 withoutCliOptions execute =
     Pages.Internal.Script.Script
         (\_ ->
@@ -100,7 +100,7 @@ withoutCliOptions execute =
 
 
 {-| -}
-withCliOptions : Program.Config cliOptions -> (cliOptions -> BackendTask Throwable ()) -> Script
+withCliOptions : Program.Config cliOptions -> (cliOptions -> BackendTask FatalError ()) -> Script
 withCliOptions config execute =
     Pages.Internal.Script.Script
         (\_ ->

package/src/Pages/SiteConfig.elm

@@ -1,11 +1,11 @@
 module Pages.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/src/Server/Request.elm

@@ -89,7 +89,7 @@ module Server.Request exposing
 import BackendTask exposing (BackendTask)
 import CookieParser
 import Dict exposing (Dict)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Form
 import Form.Validation as Validation
 import FormData
@@ -882,8 +882,8 @@ fileField_ name =
 
 {-| -}
 formDataWithServerValidation :
-    Form.ServerForms error (BackendTask Throwable (Validation.Validation error combined kind constraints))
-    -> Parser (BackendTask Throwable (Result (Form.Response error) ( Form.Response error, combined )))
+    Form.ServerForms error (BackendTask FatalError (Validation.Validation error combined kind constraints))
+    -> Parser (BackendTask FatalError (Result (Form.Response error) ( Form.Response error, combined )))
 formDataWithServerValidation formParsers =
     rawFormData
         |> andThen