elm-pages 3.0.0-beta.27 → 3.0.0-beta.29

package/src/Form.elm

@@ -5,7 +5,7 @@ module Form exposing
     , field, hiddenField, hiddenKind
     , Context
     , renderHtml, renderStyledHtml
-    , FinalForm, withGetMethod, toDynamicTransition, toDynamicFetcher
+    , withGetMethod, toDynamicFetcher
     , Errors, errorsForField
     , parse, runServerSide, runOneOfServerSide
     , ServerForms(..)
@@ -176,8 +176,7 @@ 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 ()
             ]
         }
 
@@ -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
@@ -288,16 +287,6 @@ 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 =
@@ -316,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
@@ -338,6 +332,7 @@ dynamic :
             , view : subView
             }
             data
+            msg
     )
     ->
         Form
@@ -349,13 +344,20 @@ dynamic :
              -> combineAndView
             )
             data
+            msg
     ->
         Form
             error
             combineAndView
             data
+            msg
 dynamic forms formBuilder =
-    Form []
+    Form
+        { submitStrategy = TransitionStrategy
+        , method = Post
+        , onSubmit = Nothing
+        }
+        []
         (\maybeData formState ->
             let
                 toParser :
@@ -367,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
 
@@ -385,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 }
@@ -504,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 (Form.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
         )
@@ -602,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 (Form.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
         )
@@ -680,6 +682,7 @@ toServerForm :
         , view : viewFn
         }
         data
+        msg
     ->
         Form
             error
@@ -687,7 +690,8 @@ toServerForm :
             , view : viewFn
             }
             data
-toServerForm (Form a b c) =
+            msg
+toServerForm (Form options a b c) =
     let
         mappedB :
             Maybe data
@@ -715,21 +719,21 @@ toServerForm (Form a b c) =
                         }
                    )
     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
         )
@@ -847,9 +851,9 @@ parse :
     String
     -> AppContext app actionData
     -> data
-    -> Form error { info | combine : Form.Validation.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
@@ -886,9 +890,9 @@ insertIfNonempty key values dict =
 {-| -}
 runServerSide :
     List ( String, String )
-    -> Form error (Form.Validation.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)
@@ -981,119 +985,33 @@ runOneOfServerSideHelp rawFormData firstFoundErrors (ServerForms parsers) =
 
 {-| -}
 renderHtml :
-    List (Html.Attribute (PagesMsg msg))
+    String
+    -> List (Html.Attribute (PagesMsg msg))
     -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
-    -> data
+    -> input
     ->
-        FinalForm
+        Form
             error
-            (Form.Validation.Validation error parsed named constraints)
-            data
-            (Context error data
-             -> List (Html (PagesMsg msg))
-            )
+            { combine : Form.Validation.Validation error parsed named constraints
+            , view : Context error input -> List (Html (PagesMsg msg))
+            }
+            input
             msg
     -> Html (PagesMsg msg)
-renderHtml attrs accessResponse app data (FinalForm options a b c) =
-    Html.Lazy.lazy6 renderHelper attrs accessResponse 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, Maybe String ))
+renderHtml formId attrs accessResponse app data form =
+    Html.Lazy.lazy6 renderHelper formId attrs accessResponse app data form
 
 
 {-| -}
 toDynamicFetcher :
-    String
-    ->
-        Form
-            error
-            { combine : Form.Validation.Validation error parsed field constraints
-            , view : Context error data -> view
-            }
-            data
-    ->
-        FinalForm
-            error
-            (Form.Validation.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
-            }
-
-        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
-
-
-{-| -}
-toDynamicTransition :
-    String
+    Form
+        error
+        { combine : Form.Validation.Validation error parsed field constraints
+        , view : Context error data -> view
+        }
+        data
+        userMsg
     ->
         Form
             error
@@ -1101,99 +1019,48 @@ toDynamicTransition :
             , view : Context error data -> view
             }
             data
-    ->
-        FinalForm
-            error
-            (Form.Validation.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 : Form.Validation.Validation error parsed field constraints
-                    , view : Context error data -> view
-                    }
-                }
-            )
-            ->
-                (Maybe data
-                 -> FormState
-                 ->
-                    { result :
-                        ( Form.Validation.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 : Form.Validation.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 (PagesMsg msg))
+    String
+    -> List (Html.Styled.Attribute (PagesMsg msg))
     -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
-    -> data
+    -> input
     ->
-        FinalForm
+        Form
             error
-            (Form.Validation.Validation error parsed named constraints)
-            data
-            (Context error data
-             -> List (Html.Styled.Html (PagesMsg msg))
-            )
+            { combine : Form.Validation.Validation error parsed field constraints
+            , view : Context error input -> List (Html.Styled.Html (PagesMsg msg))
+            }
+            input
             msg
     -> Html.Styled.Html (PagesMsg msg)
-renderStyledHtml attrs accessResponse app data (FinalForm options a b c) =
-    Html.Styled.Lazy.lazy6 renderStyledHelper attrs accessResponse options app data (FormInternal a b c)
+renderStyledHtml formId attrs accessResponse app data form =
+    Html.Styled.Lazy.lazy6 renderStyledHelper formId attrs accessResponse app data form
 
 
 {-| -}
@@ -1202,19 +1069,26 @@ type alias Response error =
 
 
 renderHelper :
-    List (Html.Attribute (PagesMsg msg))
+    String
+    -> List (Html.Attribute (PagesMsg msg))
     -> (actionData -> Maybe (Response error))
-    -> RenderOptions msg
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Form.Validation.Validation error parsed named constraints) data (Context error data -> List (Html (PagesMsg msg)))
+    ->
+        Form
+            error
+            { combine : Form.Validation.Validation error parsed named constraints
+            , view : Context error data -> List (Html (PagesMsg msg))
+            }
+            data
+            msg
     -> Html (PagesMsg msg)
-renderHelper attrs accessResponse options formState data form =
+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 accessResponse options formState data form
+        { hiddenInputs, children, isValid } =
+            helperValues formId toHiddenInput accessResponse formState data form
 
         toHiddenInput : List (Html.Attribute (PagesMsg msg)) -> Html (PagesMsg msg)
         toHiddenInput hiddenAttrs =
@@ -1240,19 +1114,26 @@ renderHelper attrs accessResponse options formState data form =
 
 
 renderStyledHelper :
-    List (Html.Styled.Attribute (PagesMsg msg))
+    String
+    -> List (Html.Styled.Attribute (PagesMsg msg))
     -> (actionData -> Maybe (Response error))
-    -> RenderOptions msg
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Form.Validation.Validation error parsed named constraints) data (Context error data -> List (Html.Styled.Html (PagesMsg msg)))
+    ->
+        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 attrs accessResponse options formState data form =
+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 accessResponse options formState data form
+        { hiddenInputs, children, isValid } =
+            helperValues formId toHiddenInput accessResponse formState data form
 
         toHiddenInput : List (Html.Attribute (PagesMsg msg)) -> Html.Styled.Html (PagesMsg msg)
         toHiddenInput hiddenAttrs =
@@ -1278,20 +1159,22 @@ renderStyledHelper attrs accessResponse options formState data form =
 
 
 helperValues :
-    (List (Html.Attribute (PagesMsg msg)) -> view)
+    String
+    -> (List (Html.Attribute (PagesMsg msg)) -> view)
     -> (actionData -> Maybe (Response error))
-    -> RenderOptions msg
     -> AppContext app actionData
     -> data
-    ---> Form error parsed data view
-    -> FormInternal error (Form.Validation.Validation error parsed named constraints) data (Context error data -> List view)
-    -> { formId : String, hiddenInputs : List view, children : List view, isValid : Bool }
-helperValues toHiddenInput accessResponse 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
@@ -1331,11 +1214,22 @@ helperValues toHiddenInput accessResponse options formState data (FormInternal f
                 |> Dict.union part2
 
         parsed :
-            { result : ( Form.Validation.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 : Form.Validation.Validation error parsed named constraints
@@ -1455,21 +1349,21 @@ helperValues toHiddenInput accessResponse options formState data (FormInternal f
                 _ ->
                     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
 
 
 {-| -}
@@ -1480,6 +1374,7 @@ type alias HtmlForm error parsed input msg =
         , view : Context error input -> List (Html (PagesMsg msg))
         }
         input
+        msg
 
 
 {-| -}
@@ -1490,6 +1385,7 @@ type ServerForms error parsed
                 error
                 (Combined error parsed)
                 Never
+                Never
             )
         )
 
@@ -1504,28 +1400,39 @@ initCombined :
                 | 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 : Form.Validation.Validation error parsed kind constraints }
-                        }
-                    foo =
-                        parseFn Nothing formState
-                in
-                { result = foo.result
-                , combineAndView = foo.combineAndView.combine |> Form.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
+            }
+        )
+        (\_ -> [])
 
 
 {-| -}
@@ -1538,30 +1445,11 @@ combine :
                 | 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 : Form.Validation.Validation error parsed kind constraints }
-                                }
-                            foo =
-                                parseFn Nothing formState
-                        in
-                        { result = foo.result
-                        , combineAndView = foo.combineAndView.combine |> Form.Validation.mapWithNever mapFn
-                        , isMatchCandidate = foo.isMatchCandidate
-                        }
-                    )
-                    (\_ -> [])
-               ]
-        )
+combine mapFn form (ServerForms serverForms) =
+    ServerForms (serverForms ++ [ normalizeServerForm mapFn form ])
 
 
 {-| -}
@@ -1574,6 +1462,7 @@ initCombinedServer :
                 | combine : Combined error (BackendTask backendTaskError (Form.Validation.Validation error parsed kind constraints))
             }
             input
+            msg
     -> ServerForms error (BackendTask backendTaskError (Form.Validation.Validation error combined kind constraints))
 initCombinedServer mapFn serverForms =
     initCombined (BackendTask.map (Form.Validation.map mapFn)) serverForms
@@ -1590,6 +1479,7 @@ combineServer :
                     Combined error (BackendTask backendTaskError (Form.Validation.Validation error parsed kind constraints))
             }
             input
+            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 =
@@ -1604,30 +1494,13 @@ type alias StyledHtmlForm error parsed data 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, Maybe String ))
-
-
-{-| -}
-type Form error combineAndView input
+type Form error combineAndView input userMsg
     = Form
+        (RenderOptions userMsg)
         (List ( String, FieldDefinition ))
         (Maybe input
          -> FormState
@@ -1643,7 +1516,6 @@ type Form error combineAndView input
 type alias RenderOptions userMsg =
     { submitStrategy : SubmitStrategy
     , method : Method
-    , name : Maybe String
     , onSubmit : Maybe ({ fields : List ( String, String ) } -> userMsg)
     }