elm-pages 3.0.0-beta.8 → 3.0.0

package/src/Pages/Internal/Platform.elm

@@ -20,34 +20,29 @@ import BuildError exposing (BuildError)
 import Bytes exposing (Bytes)
 import Bytes.Decode
 import Dict exposing (Dict)
-import Form.FormData exposing (FormData, Method(..))
-import FormDecoder
+import Form
 import Html exposing (Html)
 import Html.Attributes as Attr
 import Http
 import Json.Decode as Decode
 import Json.Encode
+import Pages.ConcurrentSubmission
 import Pages.ContentCache as ContentCache
 import Pages.Fetcher
 import Pages.Flags
-import Pages.FormState
+import Pages.Internal.Msg
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.ResponseSketch as ResponseSketch exposing (ResponseSketch)
 import Pages.Internal.String as String
-import Pages.Msg
+import Pages.Navigation
 import Pages.ProgramConfig exposing (ProgramConfig)
 import Pages.StaticHttpRequest as StaticHttpRequest
-import Pages.Transition
-import Path exposing (Path)
+import PagesMsg exposing (PagesMsg)
 import QueryParams
 import Task
 import Time
 import Url exposing (Url)
-
-
-type Transition
-    = Loading Int Path
-    | Submitting FormData
+import UrlPath exposing (UrlPath)
 
 
 {-| -}
@@ -58,7 +53,7 @@ type alias Program userModel userMsg pageData actionData sharedData errorPage =
 mainView :
     ProgramConfig userMsg userModel route pageData actionData sharedData effect (Msg userMsg pageData actionData sharedData errorPage) errorPage
     -> Model userModel pageData actionData sharedData
-    -> { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
+    -> { title : String, body : List (Html (PagesMsg userMsg)) }
 mainView config model =
     case model.notFound of
         Just info ->
@@ -81,7 +76,7 @@ mainView config model =
                     (config.view model.pageFormState
                         (model.inFlightFetchers |> toFetcherState)
                         (model.transition |> Maybe.map Tuple.second)
-                        { path = ContentCache.pathForUrl urls |> Path.join
+                        { path = ContentCache.pathForUrl urls |> UrlPath.join
                         , route = config.urlToRoute { currentUrl | path = model.currentPath }
                         }
                         Nothing
@@ -101,14 +96,14 @@ mainView config model =
 
 urlsToPagePath :
     { currentUrl : Url, basePath : List String }
-    -> Path
+    -> UrlPath
 urlsToPagePath urls =
     urls.currentUrl.path
         |> String.chopForwardSlashes
         |> String.split "/"
         |> List.filter ((/=) "")
         |> List.drop (List.length urls.basePath)
-        |> Path.join
+        |> UrlPath.join
 
 
 {-| -}
@@ -150,7 +145,7 @@ type alias Flags =
 
 type InitKind shared page actionData errorPage
     = OkPage shared page (Maybe actionData)
-    | NotFound { reason : NotFoundReason, path : Path }
+    | NotFound { reason : NotFoundReason, path : UrlPath }
 
 
 {-| -}
@@ -204,7 +199,7 @@ init config flags url key =
                     , basePath = config.basePath
                     }
 
-                pagePath : Path
+                pagePath : UrlPath
                 pagePath =
                     urlsToPagePath urls
 
@@ -230,7 +225,7 @@ init config flags url key =
                                 , host = url.host
                                 , port_ = url.port_
                                 , path = pagePath
-                                , query = url.query |> Maybe.map QueryParams.fromString
+                                , query = url.query |> Maybe.map QueryParams.fromString |> Maybe.withDefault Dict.empty
                                 , fragment = url.fragment
                                 }
                         }
@@ -274,7 +269,7 @@ init config flags url key =
               , url = url
               , currentPath = url.path
               , pageData = Err "Not found"
-              , ariaNavigationAnnouncement = "Error" -- TODO use error page title for announcement?
+              , ariaNavigationAnnouncement = "Page Not Found" -- TODO use error page title for announcement?
               , userFlags = flags
               , notFound = Just info
               , transition = Nothing
@@ -313,16 +308,23 @@ init config flags url key =
 type Msg userMsg pageData actionData sharedData errorPage
     = LinkClicked Browser.UrlRequest
     | UrlChanged Url
-    | UserMsg (Pages.Msg.Msg userMsg)
-    | SetField { formId : String, name : String, value : String }
+      -- TODO rename to PagesMsg
+    | UserMsg (PagesMsg userMsg)
+      --| SetField { formId : String, name : String, value : String }
+    | FormMsg (Form.Msg (Msg userMsg pageData actionData sharedData errorPage))
     | UpdateCacheAndUrlNew Bool Url (Maybe userMsg) (Result Http.Error ( Url, ResponseSketch pageData actionData sharedData ))
-    | FetcherComplete Bool String Int (Result Http.Error ( Maybe userMsg, Maybe actionData ))
+    | FetcherComplete Bool String Int (Result Http.Error ( Maybe userMsg, ActionDataOrRedirect actionData ))
     | FetcherStarted String Int FormData Time.Posix
     | PageScrollComplete
     | HotReloadCompleteNew Bytes
     | ProcessFetchResponse Int (Result Http.Error ( Url, ResponseSketch pageData actionData sharedData )) (Result Http.Error ( Url, ResponseSketch pageData actionData sharedData ) -> Msg userMsg pageData actionData sharedData errorPage)
 
 
+type ActionDataOrRedirect action
+    = ActionResponse (Maybe action)
+    | RedirectResponse String
+
+
 {-| -}
 type alias Model userModel pageData actionData sharedData =
     { key : Maybe Browser.Navigation.Key
@@ -337,12 +339,12 @@ type alias Model userModel pageData actionData sharedData =
             , sharedData : sharedData
             , actionData : Maybe actionData
             }
-    , notFound : Maybe { reason : NotFoundReason, path : Path }
+    , notFound : Maybe { reason : NotFoundReason, path : UrlPath }
     , userFlags : Decode.Value
-    , transition : Maybe ( Int, Pages.Transition.Transition )
+    , transition : Maybe ( Int, Pages.Navigation.Navigation )
     , nextTransitionKey : Int
-    , inFlightFetchers : Dict String ( Int, Pages.Transition.FetcherState actionData )
-    , pageFormState : Pages.FormState.PageFormState
+    , inFlightFetchers : Dict String ( Int, Pages.ConcurrentSubmission.ConcurrentSubmission actionData )
+    , pageFormState : Form.Model
     , pendingRedirect : Bool
     , pendingData : Maybe ( pageData, sharedData, Maybe actionData )
     }
@@ -361,6 +363,7 @@ type Effect userMsg pageData actionData sharedData userEffect errorPage
     | Batch (List (Effect userMsg pageData actionData sharedData userEffect errorPage))
     | UserCmd userEffect
     | CancelRequest Int
+    | RunCmd (Cmd (Msg userMsg pageData actionData sharedData errorPage))
 
 
 {-| -}
@@ -371,6 +374,18 @@ update :
     -> ( Model userModel pageData actionData sharedData, Effect userMsg pageData actionData sharedData userEffect errorPage )
 update config appMsg model =
     case appMsg of
+        FormMsg formMsg ->
+            let
+                -- TODO trigger formCmd
+                ( newModel, formCmd ) =
+                    Form.update formMsg model.pageFormState
+            in
+            ( { model
+                | pageFormState = newModel
+              }
+            , RunCmd formCmd
+            )
+
         LinkClicked urlRequest ->
             case urlRequest of
                 Browser.Internal url ->
@@ -396,11 +411,6 @@ update config appMsg model =
                     , BrowserLoadUrl href
                     )
 
-        SetField info ->
-            ( { model | pageFormState = Pages.FormState.setField info model.pageFormState }
-            , NoEffect
-            )
-
         UrlChanged url ->
             case model.pendingData of
                 Just ( newPageData, newSharedData, newActionData ) ->
@@ -414,7 +424,7 @@ update config appMsg model =
                         model
 
                 Nothing ->
-                    if model.url.path == url.path then
+                    if model.url.path == url.path && model.url.query == url.query then
                         ( { model
                             | -- update the URL in case query params or fragment changed
                               url = url
@@ -430,37 +440,50 @@ update config appMsg model =
                             -- parallel to the browser behavior
                             |> startNewGetLoad url (UpdateCacheAndUrlNew True url Nothing)
 
-        FetcherComplete forPageReload fetcherKey transitionId___ userMsgResult ->
+        FetcherComplete _ fetcherKey _ userMsgResult ->
             case userMsgResult of
-                Ok ( userMsg, maybeFetcherDoneActionData ) ->
-                    ( { model
-                        | inFlightFetchers =
-                            model.inFlightFetchers
-                                |> Dict.update fetcherKey
-                                    (Maybe.map
-                                        (\( transitionId, fetcherState ) ->
-                                            ( transitionId
-                                            , { fetcherState
-                                                | status =
-                                                    maybeFetcherDoneActionData
-                                                        |> Maybe.map Pages.Transition.FetcherReloading
-                                                        -- TODO remove this bad default, FetcherSubmitting is incorrect
-                                                        |> Maybe.withDefault Pages.Transition.FetcherSubmitting
-                                              }
+                Ok ( userMsg, actionOrRedirect ) ->
+                    case actionOrRedirect of
+                        ActionResponse maybeFetcherDoneActionData ->
+                            ( { model
+                                | inFlightFetchers =
+                                    model.inFlightFetchers
+                                        |> Dict.update fetcherKey
+                                            (Maybe.map
+                                                (\( transitionId, fetcherState ) ->
+                                                    ( transitionId
+                                                    , { fetcherState
+                                                        | status =
+                                                            maybeFetcherDoneActionData
+                                                                |> Maybe.map Pages.ConcurrentSubmission.Reloading
+                                                                -- TODO remove this bad default, FetcherSubmitting is incorrect
+                                                                |> Maybe.withDefault Pages.ConcurrentSubmission.Submitting
+                                                      }
+                                                    )
+                                                )
                                             )
-                                        )
-                                    )
-                      }
-                    , NoEffect
-                    )
-                        |> (case userMsg of
-                                Just justUserMsg ->
-                                    performUserMsg justUserMsg config
-
-                                Nothing ->
-                                    identity
-                           )
-                        |> startNewGetLoad (currentUrlWithPath model.url.path model) (UpdateCacheAndUrlNew False model.url Nothing)
+                              }
+                            , NoEffect
+                            )
+                                |> (case userMsg of
+                                        Just justUserMsg ->
+                                            performUserMsg justUserMsg config
+
+                                        Nothing ->
+                                            identity
+                                   )
+                                |> startNewGetLoad (currentUrlWithPath model.url.path model) (UpdateCacheAndUrlNew False model.url Nothing)
+
+                        RedirectResponse redirectTo ->
+                            ( { model
+                                | inFlightFetchers =
+                                    model.inFlightFetchers
+                                        |> Dict.remove fetcherKey
+                                , pendingRedirect = True
+                              }
+                            , NoEffect
+                            )
+                                |> startNewGetLoad (currentUrlWithPath redirectTo model) (UpdateCacheAndUrlNew False model.url Nothing)
 
                 Err _ ->
                     -- TODO how to handle error?
@@ -478,74 +501,70 @@ update config appMsg model =
 
         UserMsg userMsg_ ->
             case userMsg_ of
-                Pages.Msg.UserMsg userMsg ->
+                Pages.Internal.Msg.UserMsg userMsg ->
                     ( model, NoEffect )
                         |> performUserMsg userMsg config
 
-                Pages.Msg.Submit fields ->
-                    ( { model
-                        | transition =
-                            Just
-                                ( -- TODO remove hardcoded number
-                                  -1
-                                , Pages.Transition.Submitting fields
-                                )
-                      }
-                    , Submit fields
-                    )
-
-                Pages.Msg.SubmitIfValid formId fields isValid ->
-                    if isValid then
-                        ( { model
-                            -- TODO should I setSubmitAttempted here, too?
-                            | transition =
-                                Just
-                                    ( -- TODO remove hardcoded number
-                                      -1
-                                    , Pages.Transition.Submitting fields
-                                    )
-                          }
-                        , Submit fields
-                        )
-
-                    else
-                        ( { model
-                            | pageFormState =
-                                model.pageFormState
-                                    |> Pages.FormState.setSubmitAttempted formId
-                          }
-                        , NoEffect
-                        )
-
-                Pages.Msg.SubmitFetcher fetcherKey fields isValid maybeUserMsg ->
-                    if isValid then
-                        -- TODO should I setSubmitAttempted here, too?
-                        ( { model | nextTransitionKey = model.nextTransitionKey + 1 }
-                        , SubmitFetcher fetcherKey model.nextTransitionKey fields
-                        )
-                            |> (case maybeUserMsg of
-                                    Just justUserMsg ->
-                                        performUserMsg justUserMsg config
+                Pages.Internal.Msg.Submit fields ->
+                    if fields.valid then
+                        let
+                            payload : { fields : List ( String, String ), method : Form.Method, action : String, id : Maybe String }
+                            payload =
+                                { fields = fields.fields
+                                , method = fields.method
+                                , action = fields.action
+                                , id = Just fields.id
+                                }
+                        in
+                        if fields.useFetcher then
+                            ( { model | nextTransitionKey = model.nextTransitionKey + 1 }
+                            , SubmitFetcher fields.id model.nextTransitionKey payload
+                            )
+                                |> (case fields.msg of
+                                        Just justUserMsg ->
+                                            performUserMsg justUserMsg config
+
+                                        Nothing ->
+                                            identity
+                                   )
+
+                        else
+                            ( { model
+                                -- TODO should I setSubmitAttempted here, too?
+                                | transition =
+                                    Just
+                                        ( -- TODO remove hardcoded number
+                                          -1
+                                        , Pages.Navigation.Submitting payload
+                                        )
+                              }
+                            , Submit payload
+                            )
+                                |> (case fields.msg of
+                                        Just justUserMsg ->
+                                            performUserMsg justUserMsg config
 
-                                    Nothing ->
-                                        identity
-                               )
+                                        Nothing ->
+                                            identity
+                                   )
 
                     else
-                        ( { model
-                            | pageFormState =
-                                model.pageFormState
-                                    |> Pages.FormState.setSubmitAttempted fetcherKey
-                          }
-                        , NoEffect
-                        )
+                        -- TODO should the user msg still be run if the form is invalid?
+                        ( model, NoEffect )
 
-                Pages.Msg.FormFieldEvent value ->
+                Pages.Internal.Msg.FormMsg formMsg ->
                     -- TODO when init is called for a new page, also need to clear out client-side `pageFormState`
-                    ( { model | pageFormState = Pages.FormState.update value model.pageFormState }
-                    , NoEffect
+                    let
+                        ( formModel, formCmd ) =
+                            Form.update formMsg model.pageFormState
+                    in
+                    ( { model | pageFormState = formModel }
+                    , RunCmd (Cmd.map UserMsg formCmd)
                     )
 
+                Pages.Internal.Msg.NoOp ->
+                    ( model, NoEffect )
+
         UpdateCacheAndUrlNew scrollToTopWhenDone urlWithoutRedirectResolution maybeUserMsg updateResult ->
             -- TODO remove all fetchers that are in the state `FetcherReloading` here -- I think that's the right logic?
             case
@@ -685,10 +704,10 @@ update config appMsg model =
                 Err _ ->
                     {-
                        When there is an error loading the content.dat, we are either
-                       1) in the dev server, and should show the relevant DataSource error for the page
+                       1) in the dev server, and should show the relevant BackendTask error for the page
                           we're navigating to. This could be done more cleanly, but it's simplest to just
                           do a fresh page load and use the code path for presenting an error for a fresh page.
-                       2) In a production app. That means we had a successful build, so there were no DataSource failures,
+                       2) In a production app. That means we had a successful build, so there were no BackendTask failures,
                           so the app must be stale (unless it's in some unexpected state from a bug). In the future,
                           it probably makes sense to include some sort of hash of the app version we are fetching, match
                           it with the current version that's running, and perform this logic when we see there is a mismatch.
@@ -751,7 +770,86 @@ update config appMsg model =
                             _ ->
                                 ( model, NoEffect )
                     )
-                |> Result.withDefault ( model, NoEffect )
+                |> Result.withDefault
+                    (let
+                        pageDataResult : Maybe (InitKind sharedData pageData actionData errorPage)
+                        pageDataResult =
+                            case Bytes.Decode.decode config.decodeResponse pageDataBytes of
+                                Just (ResponseSketch.RenderPage _ _) ->
+                                    Nothing
+
+                                Just (ResponseSketch.HotUpdate pageData shared actionData) ->
+                                    OkPage shared pageData actionData
+                                        |> Just
+
+                                Just (ResponseSketch.NotFound notFound) ->
+                                    NotFound notFound
+                                        |> Just
+
+                                _ ->
+                                    Nothing
+                     in
+                     case pageDataResult of
+                        Just (OkPage sharedData pageData actionData) ->
+                            let
+                                urls : { currentUrl : Url, basePath : List String }
+                                urls =
+                                    { currentUrl = model.url
+                                    , basePath = config.basePath
+                                    }
+
+                                pagePath : UrlPath
+                                pagePath =
+                                    urlsToPagePath urls
+
+                                userFlags : Pages.Flags.Flags
+                                userFlags =
+                                    model.userFlags
+                                        |> Decode.decodeValue
+                                            (Decode.field "userFlags" Decode.value)
+                                        |> Result.withDefault Json.Encode.null
+                                        |> Pages.Flags.BrowserFlags
+
+                                ( userModel, userCmd ) =
+                                    Just
+                                        { path =
+                                            { path = pagePath
+                                            , query = model.url.query
+                                            , fragment = model.url.fragment
+                                            }
+                                        , metadata = config.urlToRoute model.url
+                                        , pageUrl =
+                                            Just
+                                                { protocol = model.url.protocol
+                                                , host = model.url.host
+                                                , port_ = model.url.port_
+                                                , path = pagePath
+                                                , query = model.url.query |> Maybe.map QueryParams.fromString |> Maybe.withDefault Dict.empty
+                                                , fragment = model.url.fragment
+                                                }
+                                        }
+                                        |> config.init userFlags sharedData pageData actionData
+
+                                cmd : Effect userMsg pageData actionData sharedData userEffect errorPage
+                                cmd =
+                                    UserCmd userCmd
+                            in
+                            ( { model
+                                | pageData =
+                                    Ok
+                                        { userModel = userModel
+                                        , sharedData = sharedData
+                                        , pageData = pageData
+                                        , actionData = actionData
+                                        }
+                                , notFound = Nothing
+                              }
+                            , cmd
+                            )
+
+                        _ ->
+                            ( model, NoEffect )
+                    )
 
         FetcherStarted fetcherKey transitionId fetcherData initiatedAt ->
             ( { model
@@ -760,7 +858,7 @@ update config appMsg model =
                         |> Dict.insert fetcherKey
                             ( transitionId
                             , { payload = fetcherData
-                              , status = Pages.Transition.FetcherSubmitting
+                              , status = Pages.ConcurrentSubmission.Submitting
                               , initiatedAt = initiatedAt
                               }
                             )
@@ -769,10 +867,10 @@ update config appMsg model =
             )
 
 
-toFetcherState : Dict String ( Int, Pages.Transition.FetcherState actionData ) -> Dict String (Pages.Transition.FetcherState actionData)
+toFetcherState : Dict String ( Int, Pages.ConcurrentSubmission.ConcurrentSubmission actionData ) -> Dict String (Pages.ConcurrentSubmission.ConcurrentSubmission actionData)
 toFetcherState inFlightFetchers =
     inFlightFetchers
-        |> Dict.map (\_ ( index, fetcherState ) -> fetcherState)
+        |> Dict.map (\_ ( _, fetcherState ) -> fetcherState)
 
 
 performUserMsg :
@@ -806,6 +904,9 @@ perform config model effect =
         NoEffect ->
             Cmd.none
 
+        RunCmd cmd ->
+            cmd
+
         Batch effects ->
             effects
                 |> List.map (perform config model)
@@ -834,10 +935,10 @@ perform config model effect =
                 |> Maybe.withDefault Cmd.none
 
         FetchPageData transitionKey maybeRequestInfo url toMsg ->
-            fetchRouteData True transitionKey toMsg config url maybeRequestInfo
+            fetchRouteData transitionKey toMsg config url maybeRequestInfo
 
         Submit fields ->
-            if fields.method == Get then
+            if fields.method == Form.Get then
                 model.key
                     |> Maybe.map (\key -> Browser.Navigation.pushUrl key (appendFormQueryParams fields))
                     |> Maybe.withDefault Cmd.none
@@ -849,7 +950,7 @@ perform config model effect =
                         -- TODO add optional path parameter to Submit variant to allow submitting to other routes
                         model.url
                 in
-                fetchRouteData False -1 (UpdateCacheAndUrlNew False model.url Nothing) config urlToSubmitTo (Just fields)
+                fetchRouteData -1 (UpdateCacheAndUrlNew False model.url Nothing) config urlToSubmitTo (Just fields)
 
         SubmitFetcher fetcherKey transitionId formData ->
             startFetcher2 config False fetcherKey transitionId formData model
@@ -869,7 +970,7 @@ perform config model effect =
                         |> config.perform
                             { fetchRouteData =
                                 \fetchInfo ->
-                                    fetchRouteData False
+                                    fetchRouteData
                                         -1
                                         (prepare fetchInfo.toMsg)
                                         config
@@ -879,15 +980,19 @@ perform config model effect =
                             ---- TODO map the Msg with the wrapper type (like in the PR branch)
                             , submit =
                                 \fetchInfo ->
-                                    fetchRouteData False -1 (prepare fetchInfo.toMsg) config (fetchInfo.values.action |> Url.fromString |> Maybe.withDefault model.url) (Just fetchInfo.values)
+                                    fetchRouteData -1 (prepare fetchInfo.toMsg) config (fetchInfo.values.action |> Url.fromString |> Maybe.withDefault model.url) (Just fetchInfo.values)
                             , runFetcher =
                                 \(Pages.Fetcher.Fetcher options) ->
                                     -- TODO need to get the fetcherId here
                                     -- TODO need to increment and pass in the transitionId
                                     startFetcher "TODO" -1 options model
-                            , fromPageMsg = Pages.Msg.UserMsg >> UserMsg
+                            , fromPageMsg = Pages.Internal.Msg.UserMsg >> UserMsg
                             , key = key
-                            , setField = \info -> Task.succeed (SetField info) |> Task.perform identity
+                            , setField =
+                                \_ ->
+                                    --Task.succeed (SetField info) |> Task.perform identity
+                                    -- TODO
+                                    Cmd.none
                             }
 
                 Nothing ->
@@ -902,21 +1007,12 @@ startFetcher fetcherKey transitionId options model =
     let
         encodedBody : String
         encodedBody =
-            FormDecoder.encodeFormData
-                { fields = options.fields
-
-                -- TODO remove hardcoding
-                , action = ""
-
-                -- TODO remove hardcoding
-                , method = Post
-                , id = Nothing
-                }
+            encodeFormData options.fields
 
-        formData : { method : Method, action : String, fields : List ( String, String ), id : Maybe String }
+        formData : { method : Form.Method, action : String, fields : List ( String, String ), id : Maybe String }
         formData =
             { -- TODO remove hardcoding
-              method = Get
+              method = Form.Get
 
             -- TODO pass FormData directly
             , action = options.url |> Maybe.withDefault model.url.path
@@ -933,10 +1029,10 @@ startFetcher fetcherKey transitionId options model =
                 Http.expectBytesResponse (FetcherComplete False fetcherKey model.nextTransitionKey)
                     (\bytes ->
                         case bytes of
-                            Http.GoodStatus_ metadata bytesBody ->
+                            Http.GoodStatus_ _ bytesBody ->
                                 ( options.decoder (Ok bytesBody)
                                     |> Just
-                                , Nothing
+                                , ActionResponse Nothing
                                 )
                                     |> Ok
 
@@ -949,13 +1045,13 @@ startFetcher fetcherKey transitionId options model =
                             Http.NetworkError_ ->
                                 Err <| Http.NetworkError
 
-                            Http.BadStatus_ metadata body ->
+                            Http.BadStatus_ metadata _ ->
                                 Err <| Http.BadStatus metadata.statusCode
                     )
             , tracker = Nothing
             , body = Http.stringBody "application/x-www-form-urlencoded" encodedBody
             , headers = options.headers |> List.map (\( name, value ) -> Http.header name value)
-            , url = options.url |> Maybe.withDefault (Path.join [ model.url.path, "content.dat" ] |> Path.toAbsolute)
+            , url = options.url |> Maybe.withDefault (UrlPath.join [ model.url.path, "content.dat" ] |> UrlPath.toAbsolute)
             , method = "POST"
             , timeout = Nothing
             }
@@ -974,13 +1070,13 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
     let
         encodedBody : String
         encodedBody =
-            FormDecoder.encodeFormData formData
+            encodeFormData formData.fields
     in
     -- TODO make sure that `actionData` isn't updated in Model for fetchers
     Cmd.batch
         [ cancelStaleFetchers model
         , case Dict.get fetcherKey model.inFlightFetchers of
-            Just ( inFlightId, inFlightFetcher ) ->
+            Just ( inFlightId, _ ) ->
                 Http.cancel (String.fromInt inFlightId)
 
             Nothing ->
@@ -991,22 +1087,26 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
                 Http.expectBytesResponse (FetcherComplete fromPageReload fetcherKey model.nextTransitionKey)
                     (\bytes ->
                         case bytes of
-                            Http.GoodStatus_ metadata bytesBody ->
+                            Http.GoodStatus_ _ bytesBody ->
                                 let
-                                    decodedAction : Maybe actionData
+                                    decodedAction : ActionDataOrRedirect actionData
                                     decodedAction =
                                         case Bytes.Decode.decode config.decodeResponse bytesBody of
+                                            -- @@@
+                                            Just (ResponseSketch.Redirect redirectTo) ->
+                                                RedirectResponse redirectTo
+
                                             Just (ResponseSketch.RenderPage _ maybeAction) ->
-                                                maybeAction
+                                                ActionResponse maybeAction
 
-                                            Just (ResponseSketch.HotUpdate pageData shared maybeAction) ->
-                                                maybeAction
+                                            Just (ResponseSketch.HotUpdate _ _ maybeAction) ->
+                                                ActionResponse maybeAction
 
-                                            Just (ResponseSketch.NotFound notFound) ->
-                                                Nothing
+                                            Just (ResponseSketch.NotFound _) ->
+                                                ActionResponse Nothing
 
                                             _ ->
-                                                Nothing
+                                                ActionResponse Nothing
                                 in
                                 -- TODO maybe have an optional way to pass the bytes through?
                                 Ok ( Nothing, decodedAction )
@@ -1020,7 +1120,7 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
                             Http.NetworkError_ ->
                                 Err <| Http.NetworkError
 
-                            Http.BadStatus_ metadata body ->
+                            Http.BadStatus_ metadata _ ->
                                 Err <| Http.BadStatus metadata.statusCode
                     )
             , tracker = Just (String.fromInt transitionId)
@@ -1030,8 +1130,8 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
             , headers = []
 
             -- TODO use formData.method to do either query params or POST body
-            , url = formData.action |> Url.fromString |> Maybe.map (\{ path } -> Path.join [ path, "content.dat" ] |> Path.toAbsolute) |> Maybe.withDefault "/"
-            , method = formData.method |> FormDecoder.methodToString
+            , url = formData.action |> Url.fromString |> Maybe.map (\{ path } -> UrlPath.join [ path, "content.dat" ] |> UrlPath.toAbsolute) |> Maybe.withDefault "/"
+            , method = formData.method |> methodToString
             , timeout = Nothing
             }
         ]
@@ -1042,16 +1142,16 @@ cancelStaleFetchers model =
     model.inFlightFetchers
         |> Dict.toList
         |> List.filterMap
-            (\( fetcherKey, ( id, fetcher ) ) ->
+            (\( _, ( id, fetcher ) ) ->
                 case fetcher.status of
-                    Pages.Transition.FetcherReloading _ ->
+                    Pages.ConcurrentSubmission.Reloading _ ->
                         Http.cancel (String.fromInt id)
                             |> Just
 
-                    Pages.Transition.FetcherSubmitting ->
+                    Pages.ConcurrentSubmission.Submitting ->
                         Nothing
 
-                    Pages.Transition.FetcherComplete _ ->
+                    Pages.ConcurrentSubmission.Complete _ ->
                         Nothing
             )
         |> Cmd.batch
@@ -1065,10 +1165,10 @@ appendFormQueryParams fields =
         |> Maybe.withDefault "/"
     )
         ++ (case fields.method of
-                Get ->
-                    "?" ++ FormDecoder.encodeFormData fields
+                Form.Get ->
+                    "?" ++ encodeFormData fields.fields
 
-                Post ->
+                Form.Post ->
                     ""
            )
 
@@ -1108,9 +1208,9 @@ application config =
                         in
                         Sub.batch
                             [ config.subscriptions (model.url |> config.urlToRoute)
-                                (urls.currentUrl |> config.urlToRoute |> config.routeToPath |> Path.join)
+                                (urls.currentUrl |> config.urlToRoute |> config.routeToPath |> UrlPath.join)
                                 pageData.userModel
-                                |> Sub.map (Pages.Msg.UserMsg >> UserMsg)
+                                |> Sub.map (Pages.Internal.Msg.UserMsg >> UserMsg)
                             , config.hotReloadData
                                 |> Sub.map HotReloadCompleteNew
                             ]
@@ -1157,20 +1257,19 @@ withUserMsg config userMsg ( model, effect ) =
             ( model, effect )
 
 
-urlPathToPath : Url -> Path
+urlPathToPath : Url -> UrlPath
 urlPathToPath urls =
-    urls.path |> Path.fromString
+    urls.path |> UrlPath.fromString
 
 
 fetchRouteData :
-    Bool
-    -> Int
+    Int
     -> (Result Http.Error ( Url, ResponseSketch pageData actionData sharedData ) -> Msg userMsg pageData actionData sharedData errorPage)
     -> ProgramConfig userMsg userModel route pageData actionData sharedData effect (Msg userMsg pageData actionData sharedData errorPage) errorPage
     -> Url
     -> Maybe FormData
     -> Cmd (Msg userMsg pageData actionData sharedData errorPage)
-fetchRouteData forPageDataReload transitionKey toMsg config url details =
+fetchRouteData transitionKey toMsg config url details =
     {-
        TODO:
        - [X] `toMsg` needs a parameter for the callback Msg so it can pass it on if there is a Redirect response
@@ -1184,14 +1283,14 @@ fetchRouteData forPageDataReload transitionKey toMsg config url details =
 
     -}
     let
-        formMethod : Method
+        formMethod : Form.Method
         formMethod =
             details
                 |> Maybe.map .method
-                |> Maybe.withDefault Get
+                |> Maybe.withDefault Form.Get
     in
     Http.request
-        { method = details |> Maybe.map (.method >> FormDecoder.methodToString) |> Maybe.withDefault "GET"
+        { method = details |> Maybe.map (.method >> methodToString) |> Maybe.withDefault "GET"
         , headers = []
         , url =
             "/"
@@ -1209,34 +1308,34 @@ fetchRouteData forPageDataReload transitionKey toMsg config url details =
                         |> String.join "/"
                    )
                 ++ (case formMethod of
-                        Post ->
+                        Form.Post ->
                             "/"
 
-                        Get ->
+                        Form.Get ->
                             details
-                                |> Maybe.map FormDecoder.encodeFormData
+                                |> Maybe.map (.fields >> encodeFormData)
                                 |> Maybe.map (\encoded -> "?" ++ encoded)
                                 |> Maybe.withDefault ""
                    )
                 ++ (case formMethod of
                         -- TODO extract this to something unit testable
                         -- TODO make states mutually exclusive for submissions and direct URL requests (shouldn't be possible to append two query param strings)
-                        Post ->
+                        Form.Post ->
                             ""
 
-                        Get ->
+                        Form.Get ->
                             url.query
                                 |> Maybe.map (\encoded -> "?" ++ encoded)
                                 |> Maybe.withDefault ""
                    )
         , body =
             case formMethod of
-                Post ->
+                Form.Post ->
                     let
                         urlEncodedFields : Maybe String
                         urlEncodedFields =
                             details
-                                |> Maybe.map FormDecoder.encodeFormData
+                                |> Maybe.map (.fields >> encodeFormData)
                     in
                     urlEncodedFields
                         |> Maybe.map (\encoded -> Http.stringBody "application/x-www-form-urlencoded" encoded)
@@ -1257,7 +1356,7 @@ fetchRouteData forPageDataReload transitionKey toMsg config url details =
                         Http.NetworkError_ ->
                             Err Http.NetworkError
 
-                        Http.BadStatus_ metadata body ->
+                        Http.BadStatus_ _ body ->
                             body
                                 |> Bytes.Decode.decode config.decodeResponse
                                 |> Result.fromMaybe "Decoding error"
@@ -1309,7 +1408,7 @@ startNewGetLoad urlToGet toMsg ( model, effect ) =
         cancelIfStale : Effect userMsg pageData actionData sharedData userEffect errorPage
         cancelIfStale =
             case model.transition of
-                Just ( transitionKey, Pages.Transition.Loading path loadingKind ) ->
+                Just ( transitionKey, Pages.Navigation.Loading _ _ ) ->
                     CancelRequest transitionKey
 
                 _ ->
@@ -1320,22 +1419,22 @@ startNewGetLoad urlToGet toMsg ( model, effect ) =
         , transition =
             ( model.nextTransitionKey
             , case model.transition of
-                Just ( transitionKey, Pages.Transition.LoadAfterSubmit submitData _ _ ) ->
-                    Pages.Transition.LoadAfterSubmit
+                Just ( _, Pages.Navigation.LoadAfterSubmit submitData _ _ ) ->
+                    Pages.Navigation.LoadAfterSubmit
                         submitData
-                        (urlToGet.path |> Path.fromString)
-                        Pages.Transition.Load
+                        (urlToGet.path |> UrlPath.fromString)
+                        Pages.Navigation.Load
 
-                Just ( transitionKey, Pages.Transition.Submitting submitData ) ->
-                    Pages.Transition.LoadAfterSubmit
+                Just ( _, Pages.Navigation.Submitting submitData ) ->
+                    Pages.Navigation.LoadAfterSubmit
                         submitData
-                        (urlToGet.path |> Path.fromString)
-                        Pages.Transition.Load
+                        (urlToGet.path |> UrlPath.fromString)
+                        Pages.Navigation.Load
 
                 _ ->
-                    Pages.Transition.Loading
-                        (urlToGet.path |> Path.fromString)
-                        Pages.Transition.Load
+                    Pages.Navigation.Loading
+                        (urlToGet.path |> UrlPath.fromString)
+                        Pages.Navigation.Load
             )
                 |> Just
       }
@@ -1361,9 +1460,9 @@ clearLoadingFetchersAfterDataLoad completedTransitionId model =
                         -- TODO fetchers are never removed from the list. Need to decide how and when to remove them.
                         --(fetcherState.status /= Pages.Transition.FetcherReloading) || (transitionId > completedTransitionId)
                         case ( transitionId > completedTransitionId, fetcherState.status ) of
-                            ( False, Pages.Transition.FetcherReloading actionData ) ->
+                            ( False, Pages.ConcurrentSubmission.Reloading actionData ) ->
                                 ( transitionId
-                                , { fetcherState | status = Pages.Transition.FetcherComplete actionData }
+                                , { fetcherState | status = Pages.ConcurrentSubmission.Complete actionData }
                                 )
 
                             _ ->
@@ -1399,7 +1498,7 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
                     }
 
                 -- TODO use userEffect here?
-                ( userModel, userEffect ) =
+                ( userModel, _ ) =
                     -- TODO if urlWithoutRedirectResolution is different from the url with redirect resolution, then
                     -- instead of calling update, call pushUrl (I think?)
                     -- TODO include user Cmd
@@ -1474,10 +1573,10 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
         Err _ ->
             {-
                When there is an error loading the content.dat, we are either
-               1) in the dev server, and should show the relevant DataSource error for the page
+               1) in the dev server, and should show the relevant BackendTask error for the page
                   we're navigating to. This could be done more cleanly, but it's simplest to just
                   do a fresh page load and use the code path for presenting an error for a fresh page.
-               2) In a production app. That means we had a successful build, so there were no DataSource failures,
+               2) In a production app. That means we had a successful build, so there were no BackendTask failures,
                   so the app must be stale (unless it's in some unexpected state from a bug). In the future,
                   it probably makes sense to include some sort of hash of the app version we are fetching, match
                   it with the current version that's running, and perform this logic when we see there is a mismatch.
@@ -1490,3 +1589,31 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
                 |> Url.toString
                 |> BrowserLoadUrl
             )
+
+
+methodToString : Form.Method -> String
+methodToString method =
+    case method of
+        Form.Get ->
+            "GET"
+
+        Form.Post ->
+            "POST"
+
+
+encodeFormData : List ( String, String ) -> String
+encodeFormData fields =
+    fields
+        |> List.map
+            (\( name, value ) ->
+                Url.percentEncode name ++ "=" ++ Url.percentEncode value
+            )
+        |> String.join "&"
+
+
+type alias FormData =
+    { fields : List ( String, String )
+    , method : Form.Method
+    , action : String
+    , id : Maybe String
+    }