elm-pages 3.0.0-beta.3 → 3.0.0-beta.30

package/src/Form.elm

@@ -1,11 +1,11 @@
 module Form exposing
     ( Form, HtmlForm, StyledHtmlForm, DoneForm
-    , Response(..)
+    , Response
     , init
     , field, hiddenField, hiddenKind
     , Context
     , renderHtml, renderStyledHtml
-    , FinalForm, withGetMethod, toDynamicTransition, toDynamicFetcher
+    , withGetMethod, toDynamicFetcher
     , Errors, errorsForField
     , parse, runServerSide, runOneOfServerSide
     , ServerForms(..)
@@ -23,7 +23,7 @@ module Form exposing
   - Showing validation errors on the client-side
   - Receiving a form submission on the server-side
   - Using the exact same client-side validations on the server-side
-  - Letting you run server-only Validations with DataSource's (things like checking for a unique username)
+  - Letting you run server-only Validations with BackendTask's (things like checking for a unique username)
 
 Because elm-pages is a framework, it has its own internal Model and Msg's. That means you, the user,
 can offload some of the responsibility to elm-pages and build an interactive form with real-time
@@ -64,7 +64,7 @@ them into a type and/or errors.
 
 Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of the fields declared.
 
-    import DataSource exposing (DataSource)
+    import BackendTask exposing (BackendTask)
     import ErrorPage exposing (ErrorPage)
     import Form
     import Form.Field as Field
@@ -176,15 +176,14 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
         { title = "Sign Up"
         , body =
             [ form
-                |> Form.toDynamicTransition "login"
-                |> Form.renderHtml [] Nothing app ()
+                |> Form.renderHtml "login" [] Nothing app ()
             ]
         }
 
 
 ### Step 3 - Handle Server-Side Form Submissions
 
-    action : RouteParams -> Request.Parser (DataSource (Response ActionData ErrorPage))
+    action : RouteParams -> Request.Parser (BackendTask (Response ActionData ErrorPage))
     action routeParams =
         Request.formData [ signupForm ]
             |> Request.map
@@ -192,8 +191,8 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
                     case signupResult of
                         Ok newUser ->
                             newUser
-                                |> myCreateUserDataSource
-                                |> DataSource.map
+                                |> myCreateUserBackendTask
+                                |> BackendTask.map
                                     (\() ->
                                         -- redirect to the home page
                                         -- after successful sign-up
@@ -202,12 +201,12 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
 
                         Err _ ->
                             Route.redirectTo Route.Login
-                                |> DataSource.succeed
+                                |> BackendTask.succeed
                 )
 
-    myCreateUserDataSource : DataSource ()
-    myCreateUserDataSource =
-        DataSource.fail
+    myCreateUserBackendTask : BackendTask ()
+    myCreateUserBackendTask =
+        BackendTask.fail
             "TODO - make a database call to create a new user"
 
 
@@ -234,7 +233,7 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
 
 @docs renderHtml, renderStyledHtml
 
-@docs FinalForm, withGetMethod, toDynamicTransition, toDynamicFetcher
+@docs withGetMethod, toDynamicFetcher
 
 
 ## Showing Errors
@@ -267,12 +266,13 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
 
 -}
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
 import Dict exposing (Dict)
+import FatalError exposing (FatalError)
 import Form.Field as Field exposing (Field(..))
 import Form.FieldStatus as FieldStatus exposing (FieldStatus)
 import Form.FieldView
-import Form.Validation as Validation exposing (Combined, Validation)
+import Form.Validation exposing (Combined)
 import Html exposing (Html)
 import Html.Attributes as Attr
 import Html.Lazy
@@ -280,22 +280,13 @@ import Html.Styled
 import Html.Styled.Attributes as StyledAttr
 import Html.Styled.Lazy
 import Pages.FormState as Form exposing (FormState)
-import Pages.Internal.Form exposing (Validation(..))
-import Pages.Msg
+import Pages.Internal.Form exposing (Validation(..), unwrapResponse)
+import Pages.Internal.Msg
 import Pages.Transition exposing (Transition(..))
+import PagesMsg exposing (PagesMsg)
 import Path exposing (Path)
 
 
-
---{-| -}
---type
---    ParseResult error decoded
---    -- TODO parse into both errors AND a decoded value
---    = Success decoded
---    | DecodedWithErrors (Dict String (List error)) decoded
---    | DecodeFailure (Dict String (List error))
-
-
 {-| -}
 initFormState : FormState
 initFormState =
@@ -314,9 +305,14 @@ type alias Context error data =
 
 
 {-| -}
-init : combineAndView -> Form String combineAndView data
+init : combineAndView -> Form String combineAndView data msg
 init combineAndView =
-    Form []
+    Form
+        { submitStrategy = TransitionStrategy
+        , method = Post
+        , onSubmit = Nothing
+        }
+        []
         (\_ _ ->
             { result = Dict.empty
             , combineAndView = combineAndView
@@ -332,28 +328,36 @@ dynamic :
      ->
         Form
             error
-            { combine : Validation error parsed named constraints1
+            { combine : Form.Validation.Validation error parsed named constraints1
             , view : subView
             }
             data
+            msg
     )
     ->
         Form
             error
             --((decider -> Validation error parsed named) -> combined)
-            ({ combine : decider -> Validation error parsed named constraints1
+            ({ combine : decider -> Form.Validation.Validation error parsed named constraints1
              , view : decider -> subView
              }
              -> combineAndView
             )
             data
+            msg
     ->
         Form
             error
             combineAndView
             data
+            msg
 dynamic forms formBuilder =
-    Form []
+    Form
+        { submitStrategy = TransitionStrategy
+        , method = Post
+        , onSubmit = Nothing
+        }
+        []
         (\maybeData formState ->
             let
                 toParser :
@@ -365,7 +369,7 @@ dynamic forms formBuilder =
                         }
                 toParser decider =
                     case forms decider of
-                        Form _ parseFn _ ->
+                        Form _ _ parseFn _ ->
                             -- TODO need to include hidden form fields from `definitions` (should they be automatically rendered? Does that mean the view type needs to be hardcoded?)
                             parseFn maybeData formState
 
@@ -383,7 +387,7 @@ dynamic forms formBuilder =
                             }
                         newThing =
                             case formBuilder of
-                                Form _ parseFn _ ->
+                                Form _ _ parseFn _ ->
                                     parseFn maybeData formState
 
                         arg : { combine : decider -> Validation error parsed named constraints1, view : decider -> subView }
@@ -502,10 +506,10 @@ Use [`Form.Field`](Form-Field) to define the field and its validations.
 field :
     String
     -> Field error parsed data kind constraints
-    -> Form error (Validation.Field error parsed kind -> combineAndView) data
-    -> Form error combineAndView data
-field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
-    Form
+    -> Form error (Form.Validation.Field error parsed kind -> combineAndView) data msg
+    -> Form error combineAndView data msg
+field name (Field fieldParser kind) (Form renderOptions definitions parseFn toInitialValues) =
+    Form renderOptions
         (( name, RegularField )
             :: definitions
         )
@@ -521,7 +525,7 @@ field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
                             ( Just info.value, info.status )
 
                         Nothing ->
-                            ( Maybe.map2 (|>) maybeData fieldParser.initialValue, FieldStatus.NotVisited )
+                            ( Maybe.map2 (|>) maybeData fieldParser.initialValue |> Maybe.andThen identity, FieldStatus.NotVisited )
 
                 thing : Pages.Internal.Form.ViewField kind
                 thing =
@@ -530,13 +534,13 @@ field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
                     , kind = ( kind, fieldParser.properties )
                     }
 
-                parsedField : Validation.Field error parsed kind
+                parsedField : Form.Validation.Field error parsed kind
                 parsedField =
                     Pages.Internal.Form.Validation (Just thing) (Just name) ( maybeParsed, Dict.empty )
 
                 myFn :
                     { result : Dict String (List error)
-                    , combineAndView : Validation.Field error parsed kind -> combineAndView
+                    , combineAndView : Form.Validation.Field error parsed kind -> combineAndView
                     , isMatchCandidate : Bool
                     }
                     ->
@@ -546,7 +550,7 @@ field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
                         }
                 myFn soFar =
                     let
-                        validationField : Validation.Field error parsed kind
+                        validationField : Form.Validation.Field error parsed kind
                         validationField =
                             parsedField
                     in
@@ -600,10 +604,10 @@ You define the field's validations the same way as for `field`, with the
 hiddenField :
     String
     -> Field error parsed data kind constraints
-    -> Form error (Validation.Field error parsed Form.FieldView.Hidden -> combineAndView) data
-    -> Form error combineAndView data
-hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues) =
-    Form
+    -> Form error (Form.Validation.Field error parsed Form.FieldView.Hidden -> combineAndView) data msg
+    -> Form error combineAndView data msg
+hiddenField name (Field fieldParser _) (Form options definitions parseFn toInitialValues) =
+    Form options
         (( name, HiddenField )
             :: definitions
         )
@@ -618,7 +622,7 @@ hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues
                             ( Just info.value, info.status )
 
                         Nothing ->
-                            ( Maybe.map2 (|>) maybeData fieldParser.initialValue, FieldStatus.NotVisited )
+                            ( Maybe.map2 (|>) maybeData fieldParser.initialValue |> Maybe.andThen identity, FieldStatus.NotVisited )
 
                 thing : Pages.Internal.Form.ViewField Form.FieldView.Hidden
                 thing =
@@ -627,13 +631,13 @@ hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues
                     , kind = ( Form.FieldView.Hidden, fieldParser.properties )
                     }
 
-                parsedField : Validation.Field error parsed Form.FieldView.Hidden
+                parsedField : Form.Validation.Field error parsed Form.FieldView.Hidden
                 parsedField =
                     Pages.Internal.Form.Validation (Just thing) (Just name) ( maybeParsed, Dict.empty )
 
                 myFn :
                     { result : Dict String (List error)
-                    , combineAndView : Validation.Field error parsed Form.FieldView.Hidden -> combineAndView
+                    , combineAndView : Form.Validation.Field error parsed Form.FieldView.Hidden -> combineAndView
                     , isMatchCandidate : Bool
                     }
                     ->
@@ -643,7 +647,7 @@ hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues
                         }
                 myFn soFar =
                     let
-                        validationField : Validation.Field error parsed Form.FieldView.Hidden
+                        validationField : Form.Validation.Field error parsed Form.FieldView.Hidden
                         validationField =
                             parsedField
                     in
@@ -674,18 +678,20 @@ hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues
 toServerForm :
     Form
         error
-        { combine : Validation error combined kind constraints
+        { combine : Form.Validation.Validation error combined kind constraints
         , view : viewFn
         }
         data
+        msg
     ->
         Form
             error
-            { combine : Validation error (DataSource (Validation error combined kind constraints)) kind constraints
+            { combine : Form.Validation.Validation error (BackendTask FatalError (Form.Validation.Validation error combined kind constraints)) kind constraints
             , view : viewFn
             }
             data
-toServerForm (Form a b c) =
+            msg
+toServerForm (Form options a b c) =
     let
         mappedB :
             Maybe data
@@ -694,7 +700,7 @@ toServerForm (Form a b c) =
                 { result : Dict String (List error)
                 , isMatchCandidate : Bool
                 , combineAndView :
-                    { combine : Validation error (DataSource (Validation error combined kind constraints)) kind constraints
+                    { combine : Form.Validation.Validation error (BackendTask FatalError (Form.Validation.Validation error combined kind constraints)) kind constraints
                     , view : viewFn
                     }
                 }
@@ -705,29 +711,29 @@ toServerForm (Form a b c) =
                         , combineAndView =
                             { combine =
                                 thing.combineAndView.combine
-                                    |> DataSource.succeed
-                                    |> Validation.succeed2
+                                    |> BackendTask.succeed
+                                    |> Form.Validation.succeed2
                             , view = thing.combineAndView.view
                             }
                         , isMatchCandidate = thing.isMatchCandidate
                         }
                    )
     in
-    Form a mappedB c
+    Form options a mappedB c
 
 
 {-| -}
 hiddenKind :
     ( String, String )
     -> error
-    -> Form error combineAndView data
-    -> Form error combineAndView data
-hiddenKind ( name, value ) error_ (Form definitions parseFn toInitialValues) =
+    -> Form error combineAndView data msg
+    -> Form error combineAndView data msg
+hiddenKind ( name, value ) error_ (Form options definitions parseFn toInitialValues) =
     let
         (Field fieldParser _) =
             Field.exactValue value error_
     in
-    Form
+    Form options
         (( name, HiddenField )
             :: definitions
         )
@@ -744,6 +750,7 @@ hiddenKind ( name, value ) error_ (Form definitions parseFn toInitialValues) =
 
                         Nothing ->
                             Maybe.map2 (|>) maybeData fieldParser.initialValue
+                                |> Maybe.andThen identity
 
                 myFn :
                     { result : Dict String (List error)
@@ -784,10 +791,10 @@ type Errors error
 
 
 {-| -}
-errorsForField : Validation.Field error parsed kind -> Errors error -> List error
+errorsForField : Form.Validation.Field error parsed kind -> Errors error -> List error
 errorsForField field_ (Errors errorsDict) =
     errorsDict
-        |> Dict.get (Validation.fieldName field_)
+        |> Dict.get (Form.Validation.fieldName field_)
         |> Maybe.withDefault []
 
 
@@ -797,13 +804,13 @@ type alias AppContext app actionData =
         | --, sharedData : Shared.Data
           --, routeParams : routeParams
           path : Path
+        , action : Maybe actionData
 
-        --, action : Maybe action
         --, submit :
         --    { fields : List ( String, String ), headers : List ( String, String ) }
         --    -> Pages.Fetcher.Fetcher (Result Http.Error action)
         , transition : Maybe Transition
-        , fetchers : Dict String (Pages.Transition.FetcherState actionData)
+        , fetchers : Dict String (Pages.Transition.FetcherState (Maybe actionData))
         , pageFormState :
             Dict String { fields : Dict String { value : String, status : FieldStatus }, submitAttempted : Bool }
     }
@@ -844,9 +851,9 @@ parse :
     String
     -> AppContext app actionData
     -> data
-    -> Form error { info | combine : Validation error parsed named constraints } data
+    -> Form error { info | combine : Form.Validation.Validation error parsed named constraints } data msg
     -> ( Maybe parsed, Dict String (List error) )
-parse formId app data (Form _ parser _) =
+parse formId app data (Form _ _ parser _) =
     -- TODO Get transition context from `app` so you can check if the current form is being submitted
     -- TODO either as a transition or a fetcher? Should be easy enough to check for the `id` on either of those?
     let
@@ -883,9 +890,9 @@ insertIfNonempty key values dict =
 {-| -}
 runServerSide :
     List ( String, String )
-    -> Form error (Validation error parsed kind constraints) data
+    -> Form error (Form.Validation.Validation error parsed kind constraints) data msg
     -> ( Bool, ( Maybe parsed, Dict String (List error) ) )
-runServerSide rawFormData (Form _ parser _) =
+runServerSide rawFormData (Form _ _ parser _) =
     let
         parsed :
             { result : Dict String (List error)
@@ -978,257 +985,112 @@ runOneOfServerSideHelp rawFormData firstFoundErrors (ServerForms parsers) =
 
 {-| -}
 renderHtml :
-    List (Html.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
-    -> AppContext app actionData
-    -> data
-    ->
-        FinalForm
-            error
-            (Validation error parsed named constraints)
-            data
-            (Context error data
-             -> List (Html (Pages.Msg.Msg msg))
-            )
-            msg
-    -> Html (Pages.Msg.Msg msg)
-renderHtml attrs maybe app data (FinalForm options a b c) =
-    Html.Lazy.lazy6 renderHelper attrs maybe options app data (FormInternal a b c)
-
-
-{-| -}
-type FinalForm error parsed data view userMsg
-    = FinalForm
-        (RenderOptions userMsg)
-        (List ( String, FieldDefinition ))
-        (Maybe data
-         -> FormState
-         ->
-            { result :
-                ( parsed
-                , Dict String (List error)
-                )
-            , isMatchCandidate : Bool
-            , view : view
-            }
-        )
-        (data -> List ( String, String ))
-
-
-{-| -}
-toDynamicFetcher :
     String
+    -> List (Html.Attribute (PagesMsg msg))
+    -> (actionData -> Maybe (Response error))
+    -> AppContext app actionData
+    -> input
     ->
         Form
             error
-            { combine : Validation error parsed field constraints
-            , view : Context error data -> view
-            }
-            data
-    ->
-        FinalForm
-            error
-            (Validation error parsed field constraints)
-            data
-            (Context error data -> view)
-            userMsg
-toDynamicFetcher name (Form a b c) =
-    let
-        options : { submitStrategy : SubmitStrategy, method : Method, name : Maybe String, onSubmit : Maybe a }
-        options =
-            { submitStrategy = FetcherStrategy
-            , method = Post
-            , name = Just name
-            , onSubmit = Nothing
+            { combine : Form.Validation.Validation error parsed named constraints
+            , view : Context error input -> List (Html (PagesMsg msg))
             }
-
-        transformB :
-            (Maybe data
-             -> FormState
-             ->
-                { result : Dict String (List error)
-                , isMatchCandidate : Bool
-                , combineAndView :
-                    { combine : Validation error parsed field constraints
-                    , view : Context error data -> view
-                    }
-                }
-            )
-            ->
-                (Maybe data
-                 -> FormState
-                 ->
-                    { result :
-                        ( Validation error parsed field constraints
-                        , Dict String (List error)
-                        )
-                    , isMatchCandidate : Bool
-                    , view : Context error data -> view
-                    }
-                )
-        transformB rawB =
-            \maybeData formState ->
-                let
-                    foo :
-                        { result : Dict String (List error)
-                        , isMatchCandidate : Bool
-                        , combineAndView :
-                            { combine : Validation error parsed field constraints
-                            , view : Context error data -> view
-                            }
-                        }
-                    foo =
-                        rawB maybeData formState
-                in
-                { result = ( foo.combineAndView.combine, foo.result )
-                , view = foo.combineAndView.view
-                , isMatchCandidate = foo.isMatchCandidate
-                }
-    in
-    FinalForm options a (transformB b) c
+            input
+            msg
+    -> Html (PagesMsg msg)
+renderHtml formId attrs accessResponse app data form =
+    Html.Lazy.lazy6 renderHelper formId attrs accessResponse app data form
 
 
 {-| -}
-toDynamicTransition :
-    String
+toDynamicFetcher :
+    Form
+        error
+        { combine : Form.Validation.Validation error parsed field constraints
+        , view : Context error data -> view
+        }
+        data
+        userMsg
     ->
         Form
             error
-            { combine : Validation error parsed field constraints
+            { combine : Form.Validation.Validation error parsed field constraints
             , view : Context error data -> view
             }
             data
-    ->
-        FinalForm
-            error
-            (Validation error parsed field constraints)
-            data
-            (Context error data -> view)
             userMsg
-toDynamicTransition name (Form a b c) =
-    let
-        options : { submitStrategy : SubmitStrategy, method : Method, name : Maybe String, onSubmit : Maybe a }
-        options =
-            { submitStrategy = TransitionStrategy
-            , method = Post
-            , name = Just name
-            , onSubmit = Nothing
-            }
-
-        transformB :
-            (Maybe data
-             -> FormState
-             ->
-                { result : Dict String (List error)
-                , isMatchCandidate : Bool
-                , combineAndView :
-                    { combine : Validation error parsed field constraints
-                    , view : Context error data -> view
-                    }
-                }
-            )
-            ->
-                (Maybe data
-                 -> FormState
-                 ->
-                    { result :
-                        ( Validation error parsed field constraints
-                        , Dict String (List error)
-                        )
-                    , isMatchCandidate : Bool
-                    , view : Context error data -> view
-                    }
-                )
-        transformB rawB =
-            \maybeData formState ->
-                let
-                    foo :
-                        { result : Dict String (List error)
-                        , isMatchCandidate : Bool
-                        , combineAndView :
-                            { combine : Validation error parsed field constraints
-                            , view : Context error data -> view
-                            }
-                        }
-                    foo =
-                        rawB maybeData formState
-                in
-                { result = ( foo.combineAndView.combine, foo.result )
-                , view = foo.combineAndView.view
-                , isMatchCandidate = foo.isMatchCandidate
-                }
-    in
-    FinalForm options a (transformB b) c
+toDynamicFetcher (Form renderOptions a b c) =
+    Form { renderOptions | submitStrategy = FetcherStrategy } a b c
 
 
 {-| -}
-withGetMethod : FinalForm error parsed data view userMsg -> FinalForm error parsed data view userMsg
-withGetMethod (FinalForm options a b c) =
-    FinalForm { options | method = Get } a b c
+withGetMethod : Form error combineAndView input userMsg -> Form error combineAndView input userMsg
+withGetMethod (Form options a b c) =
+    Form { options | method = Get } a b c
 
 
 {-| -}
-withOnSubmit : ({ fields : List ( String, String ) } -> userMsg) -> FinalForm error parsed data view userMsg -> FinalForm error parsed data view userMsg
-withOnSubmit onSubmit (FinalForm options a b c) =
-    FinalForm { options | onSubmit = Just onSubmit } a b c
+withOnSubmit : ({ fields : List ( String, String ) } -> userMsg) -> Form error combineAndView input oldMsg -> Form error combineAndView input userMsg
+withOnSubmit onSubmit (Form options a b c) =
+    Form
+        { onSubmit = Just onSubmit
+        , submitStrategy = options.submitStrategy
+        , method = options.method
+        }
+        a
+        b
+        c
 
 
 {-| -}
 renderStyledHtml :
-    List (Html.Styled.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
+    String
+    -> List (Html.Styled.Attribute (PagesMsg msg))
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
-    -> data
+    -> input
     ->
-        FinalForm
+        Form
             error
-            (Validation error parsed named constraints)
-            data
-            (Context error data
-             -> List (Html.Styled.Html (Pages.Msg.Msg msg))
-            )
+            { combine : Form.Validation.Validation error parsed field constraints
+            , view : Context error input -> List (Html.Styled.Html (PagesMsg msg))
+            }
+            input
             msg
-    -> Html.Styled.Html (Pages.Msg.Msg msg)
-renderStyledHtml attrs maybe app data (FinalForm options a b c) =
-    Html.Styled.Lazy.lazy6 renderStyledHelper attrs maybe options app data (FormInternal a b c)
+    -> Html.Styled.Html (PagesMsg msg)
+renderStyledHtml formId attrs accessResponse app data form =
+    Html.Styled.Lazy.lazy6 renderStyledHelper formId attrs accessResponse app data form
 
 
 {-| -}
-type Response error
-    = Response
-        { fields : List ( String, String )
-        , errors : Dict String (List error)
-        }
+type alias Response error =
+    Pages.Internal.Form.Response error
 
 
 renderHelper :
-    List (Html.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
-    -> RenderOptions msg
+    String
+    -> List (Html.Attribute (PagesMsg msg))
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List (Html (Pages.Msg.Msg msg)))
-    -> Html (Pages.Msg.Msg msg)
-renderHelper attrs maybe options formState data form =
+    ->
+        Form
+            error
+            { combine : Form.Validation.Validation error parsed named constraints
+            , view : Context error data -> List (Html (PagesMsg msg))
+            }
+            data
+            msg
+    -> Html (PagesMsg msg)
+renderHelper formId attrs accessResponse formState data ((Form options _ _ _) as form) =
     -- TODO Get transition context from `app` so you can check if the current form is being submitted
     -- TODO either as a transition or a fetcher? Should be easy enough to check for the `id` on either of those?
     let
-        { formId, hiddenInputs, children, isValid } =
-            helperValues toHiddenInput maybe options formState data form
+        { hiddenInputs, children, isValid } =
+            helperValues formId toHiddenInput accessResponse formState data form
 
-        toHiddenInput : List (Html.Attribute (Pages.Msg.Msg msg)) -> Html (Pages.Msg.Msg msg)
+        toHiddenInput : List (Html.Attribute (PagesMsg msg)) -> Html (PagesMsg msg)
         toHiddenInput hiddenAttrs =
             Html.input hiddenAttrs []
     in
@@ -1241,10 +1103,10 @@ renderHelper attrs maybe options formState data form =
                , Attr.action (Path.toAbsolute formState.path)
                , case options.submitStrategy of
                     FetcherStrategy ->
-                        Pages.Msg.fetcherOnSubmit options.onSubmit formId (\_ -> isValid)
+                        Pages.Internal.Msg.fetcherOnSubmit options.onSubmit formId (\_ -> isValid)
 
                     TransitionStrategy ->
-                        Pages.Msg.submitIfValid formId (\_ -> isValid)
+                        Pages.Internal.Msg.submitIfValid options.onSubmit formId (\_ -> isValid)
                ]
             ++ attrs
         )
@@ -1252,25 +1114,28 @@ renderHelper attrs maybe options formState data form =
 
 
 renderStyledHelper :
-    List (Html.Styled.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
-    -> RenderOptions msg
+    String
+    -> List (Html.Styled.Attribute (PagesMsg msg))
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List (Html.Styled.Html (Pages.Msg.Msg msg)))
-    -> Html.Styled.Html (Pages.Msg.Msg msg)
-renderStyledHelper attrs maybe options formState data form =
+    ->
+        Form
+            error
+            { combine : Form.Validation.Validation error parsed field constraints
+            , view : Context error data -> List (Html.Styled.Html (PagesMsg msg))
+            }
+            data
+            msg
+    -> Html.Styled.Html (PagesMsg msg)
+renderStyledHelper formId attrs accessResponse formState data ((Form options _ _ _) as form) =
     -- TODO Get transition context from `app` so you can check if the current form is being submitted
     -- TODO either as a transition or a fetcher? Should be easy enough to check for the `id` on either of those?
     let
-        { formId, hiddenInputs, children, isValid } =
-            helperValues toHiddenInput maybe options formState data form
+        { hiddenInputs, children, isValid } =
+            helperValues formId toHiddenInput accessResponse formState data form
 
-        toHiddenInput : List (Html.Attribute (Pages.Msg.Msg msg)) -> Html.Styled.Html (Pages.Msg.Msg msg)
+        toHiddenInput : List (Html.Attribute (PagesMsg msg)) -> Html.Styled.Html (PagesMsg msg)
         toHiddenInput hiddenAttrs =
             Html.Styled.input (hiddenAttrs |> List.map StyledAttr.fromUnstyled) []
     in
@@ -1282,11 +1147,11 @@ renderStyledHelper attrs maybe options formState data form =
                , case options.submitStrategy of
                     FetcherStrategy ->
                         StyledAttr.fromUnstyled <|
-                            Pages.Msg.fetcherOnSubmit options.onSubmit formId (\_ -> isValid)
+                            Pages.Internal.Msg.fetcherOnSubmit options.onSubmit formId (\_ -> isValid)
 
                     TransitionStrategy ->
                         StyledAttr.fromUnstyled <|
-                            Pages.Msg.submitIfValid formId (\_ -> isValid)
+                            Pages.Internal.Msg.submitIfValid options.onSubmit formId (\_ -> isValid)
                ]
             ++ attrs
         )
@@ -1294,28 +1159,33 @@ renderStyledHelper attrs maybe options formState data form =
 
 
 helperValues :
-    (List (Html.Attribute (Pages.Msg.Msg msg)) -> view)
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
-    -> RenderOptions msg
+    String
+    -> (List (Html.Attribute (PagesMsg msg)) -> view)
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
     -> data
-    ---> Form error parsed data view
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List view)
-    -> { formId : String, hiddenInputs : List view, children : List view, isValid : Bool }
-helperValues toHiddenInput maybe options formState data (FormInternal fieldDefinitions parser toInitialValues) =
+    ->
+        Form
+            error
+            { combine : Form.Validation.Validation error parsed field constraints
+            , view : Context error data -> List view
+            }
+            data
+            msg
+    -> { hiddenInputs : List view, children : List view, isValid : Bool }
+helperValues formId toHiddenInput accessResponse formState data (Form _ fieldDefinitions parser toInitialValues) =
     let
-        formId : String
-        formId =
-            options.name |> Maybe.withDefault ""
-
         initialValues : Dict String Form.FieldState
         initialValues =
             toInitialValues data
-                |> List.map (Tuple.mapSecond (\value -> { value = value, status = FieldStatus.NotVisited }))
+                |> List.filterMap
+                    (\( key, maybeValue ) ->
+                        maybeValue
+                            |> Maybe.map
+                                (\value ->
+                                    ( key, { value = value, status = FieldStatus.NotVisited } )
+                                )
+                    )
                 |> Dict.fromList
 
         part2 : Dict String Form.FieldState
@@ -1323,7 +1193,8 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
             formState.pageFormState
                 |> Dict.get formId
                 |> Maybe.withDefault
-                    (maybe
+                    (formState.action
+                        |> Maybe.andThen (accessResponse >> Maybe.map unwrapResponse)
                         |> Maybe.map
                             (\{ fields } ->
                                 { fields =
@@ -1343,18 +1214,29 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
                 |> Dict.union part2
 
         parsed :
-            { result : ( Validation error parsed named constraints, Dict String (List error) )
+            { result : ( Form.Validation.Validation error parsed field constraints, Dict String (List error) )
             , isMatchCandidate : Bool
             , view : Context error data -> List view
             }
         parsed =
+            { isMatchCandidate = parsed1.isMatchCandidate
+            , view = parsed1.combineAndView.view
+            , result = ( parsed1.combineAndView.combine, parsed1.result )
+            }
+
+        parsed1 :
+            { result : Dict String (List error)
+            , isMatchCandidate : Bool
+            , combineAndView : { combine : Form.Validation.Validation error parsed field constraints, view : Context error data -> List view }
+            }
+        parsed1 =
             parser (Just data) thisFormState
 
-        withoutServerErrors : Validation error parsed named constraints
+        withoutServerErrors : Form.Validation.Validation error parsed named constraints
         withoutServerErrors =
             parsed |> mergeResults
 
-        withServerErrors : Validation error parsed named constraints
+        withServerErrors : Form.Validation.Validation error parsed named constraints
         withServerErrors =
             mergeResults
                 { parsed
@@ -1363,8 +1245,8 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
                             |> Tuple.mapSecond
                                 (\errors1 ->
                                     mergeErrors errors1
-                                        (maybe
-                                            |> Maybe.map .errors
+                                        (formState.action
+                                            |> Maybe.andThen (accessResponse >> Maybe.map (unwrapResponse >> .errors))
                                             |> Maybe.withDefault Dict.empty
                                         )
                                 )
@@ -1375,7 +1257,8 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
             formState.pageFormState
                 |> Dict.get formId
                 |> Maybe.withDefault
-                    (maybe
+                    (formState.action
+                        |> Maybe.andThen (accessResponse >> Maybe.map unwrapResponse)
                         |> Maybe.map
                             (\{ fields } ->
                                 { fields =
@@ -1398,7 +1281,21 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
                     |> Errors
             , isTransitioning =
                 -- TODO instead of isTransitioning : Bool, it would be useful to get a custom type with the exact state
-                (formState.fetchers |> Dict.member formId)
+                (case formState.fetchers |> Dict.get formId of
+                    Just { status } ->
+                        case status of
+                            Pages.Transition.FetcherComplete _ ->
+                                False
+
+                            Pages.Transition.FetcherSubmitting ->
+                                True
+
+                            Pages.Transition.FetcherReloading _ ->
+                                True
+
+                    Nothing ->
+                        False
+                )
                     || (case formState.transition of
                             Just (Submitting formData) ->
                                 formData.id == Just formId
@@ -1452,21 +1349,21 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
                 _ ->
                     False
     in
-    { formId = formId
-    , hiddenInputs = hiddenInputs
+    { hiddenInputs = hiddenInputs
     , children = children
     , isValid = isValid
     }
 
 
 {-| -}
-type alias DoneForm error parsed data view =
+type alias DoneForm error parsed data view msg =
     Form
         error
         { combine : Combined error parsed
         , view : Context error data -> view
         }
         data
+        msg
 
 
 {-| -}
@@ -1474,9 +1371,10 @@ type alias HtmlForm error parsed input msg =
     Form
         error
         { combine : Combined error parsed
-        , view : Context error input -> List (Html (Pages.Msg.Msg msg))
+        , view : Context error input -> List (Html (PagesMsg msg))
         }
         input
+        msg
 
 
 {-| -}
@@ -1487,6 +1385,7 @@ type ServerForms error parsed
                 error
                 (Combined error parsed)
                 Never
+                Never
             )
         )
 
@@ -1498,31 +1397,42 @@ initCombined :
         Form
             error
             { combineAndView
-                | combine : Validation error parsed kind constraints
+                | combine : Form.Validation.Validation error parsed kind constraints
             }
             input
+            msg
     -> ServerForms error combined
-initCombined mapFn (Form _ parseFn _) =
-    ServerForms
-        [ Form
-            []
-            (\_ formState ->
-                let
-                    foo :
-                        { result : Dict String (List error)
-                        , isMatchCandidate : Bool
-                        , combineAndView : { combineAndView | combine : Validation error parsed kind constraints }
-                        }
-                    foo =
-                        parseFn Nothing formState
-                in
-                { result = foo.result
-                , combineAndView = foo.combineAndView.combine |> Validation.mapWithNever mapFn
-                , isMatchCandidate = foo.isMatchCandidate
-                }
-            )
-            (\_ -> [])
-        ]
+initCombined mapFn form =
+    ServerForms [ normalizeServerForm mapFn form ]
+
+
+normalizeServerForm :
+    (parsed -> combined)
+    -> Form error { combineAndView | combine : Form.Validation.Validation error parsed kind constraints } input msg
+    -> Form error (Combined error combined) Never Never
+normalizeServerForm mapFn (Form options _ parseFn _) =
+    Form
+        { onSubmit = Nothing
+        , submitStrategy = options.submitStrategy
+        , method = options.method
+        }
+        []
+        (\_ formState ->
+            let
+                parsed :
+                    { result : Dict String (List error)
+                    , isMatchCandidate : Bool
+                    , combineAndView : { combineAndView | combine : Form.Validation.Validation error parsed kind constraints }
+                    }
+                parsed =
+                    parseFn Nothing formState
+            in
+            { result = parsed.result
+            , combineAndView = parsed.combineAndView.combine |> Form.Validation.mapWithNever mapFn
+            , isMatchCandidate = parsed.isMatchCandidate
+            }
+        )
+        (\_ -> [])
 
 
 {-| -}
@@ -1532,33 +1442,14 @@ combine :
         Form
             error
             { combineAndView
-                | combine : Validation error parsed kind constraints
+                | combine : Form.Validation.Validation error parsed kind constraints
             }
             input
+            msg
     -> ServerForms error combined
     -> ServerForms error combined
-combine mapFn (Form _ parseFn _) (ServerForms serverForms) =
-    ServerForms
-        (serverForms
-            ++ [ Form []
-                    (\_ formState ->
-                        let
-                            foo :
-                                { result : Dict String (List error)
-                                , isMatchCandidate : Bool
-                                , combineAndView : { combineAndView | combine : Validation error parsed kind constraints }
-                                }
-                            foo =
-                                parseFn Nothing formState
-                        in
-                        { result = foo.result
-                        , combineAndView = foo.combineAndView.combine |> Validation.mapWithNever mapFn
-                        , isMatchCandidate = foo.isMatchCandidate
-                        }
-                    )
-                    (\_ -> [])
-               ]
-        )
+combine mapFn form (ServerForms serverForms) =
+    ServerForms (serverForms ++ [ normalizeServerForm mapFn form ])
 
 
 {-| -}
@@ -1568,12 +1459,13 @@ initCombinedServer :
         Form
             error
             { combineAndView
-                | combine : Combined error (DataSource (Validation error parsed kind constraints))
+                | combine : Combined error (BackendTask backendTaskError (Form.Validation.Validation error parsed kind constraints))
             }
             input
-    -> ServerForms error (DataSource (Validation error combined kind constraints))
+            msg
+    -> ServerForms error (BackendTask backendTaskError (Form.Validation.Validation error combined kind constraints))
 initCombinedServer mapFn serverForms =
-    initCombined (DataSource.map (Validation.map mapFn)) serverForms
+    initCombined (BackendTask.map (Form.Validation.map mapFn)) serverForms
 
 
 {-| -}
@@ -1584,13 +1476,14 @@ combineServer :
             error
             { combineAndView
                 | combine :
-                    Combined error (DataSource (Validation error parsed kind constraints))
+                    Combined error (BackendTask backendTaskError (Form.Validation.Validation error parsed kind constraints))
             }
             input
-    -> ServerForms error (DataSource (Validation error combined kind constraints))
-    -> ServerForms error (DataSource (Validation error combined kind constraints))
+            msg
+    -> ServerForms error (BackendTask backendTaskError (Form.Validation.Validation error combined kind constraints))
+    -> ServerForms error (BackendTask backendTaskError (Form.Validation.Validation error combined kind constraints))
 combineServer mapFn a b =
-    combine (DataSource.map (Validation.map mapFn)) a b
+    combine (BackendTask.map (Form.Validation.map mapFn)) a b
 
 
 {-| -}
@@ -1598,33 +1491,16 @@ type alias StyledHtmlForm error parsed data msg =
     Form
         error
         { combine : Combined error parsed
-        , view : Context error data -> List (Html.Styled.Html (Pages.Msg.Msg msg))
+        , view : Context error data -> List (Html.Styled.Html (PagesMsg msg))
         }
         data
+        msg
 
 
 {-| -}
-type FormInternal error parsed data view
-    = FormInternal
-        -- TODO for renderCustom, pass them as an argument with all hidden fields that the user must render
-        (List ( String, FieldDefinition ))
-        (Maybe data
-         -> FormState
-         ->
-            { result :
-                ( parsed
-                , Dict String (List error)
-                )
-            , isMatchCandidate : Bool
-            , view : view
-            }
-        )
-        (data -> List ( String, String ))
-
-
-{-| -}
-type Form error combineAndView input
+type Form error combineAndView input userMsg
     = Form
+        (RenderOptions userMsg)
         (List ( String, FieldDefinition ))
         (Maybe input
          -> FormState
@@ -1634,13 +1510,12 @@ type Form error combineAndView input
             , combineAndView : combineAndView
             }
         )
-        (input -> List ( String, String ))
+        (input -> List ( String, Maybe String ))
 
 
 type alias RenderOptions userMsg =
     { submitStrategy : SubmitStrategy
     , method : Method
-    , name : Maybe String
     , onSubmit : Maybe ({ fields : List ( String, String ) } -> userMsg)
     }