elm-pages 3.0.0-beta.2 → 3.0.0-beta.21

package/src/Form.elm

@@ -1,6 +1,6 @@
 module Form exposing
     ( Form, HtmlForm, StyledHtmlForm, DoneForm
-    , Response(..)
+    , Response
     , init
     , field, hiddenField, hiddenKind
     , Context
@@ -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
@@ -184,7 +184,7 @@ Totally customizable. Uses [`Form.FieldView`](Form-FieldView) to render all of t
 
 ### 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 +192,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 +202,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"
 
 
@@ -267,12 +267,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,7 +281,7 @@ 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.Internal.Form exposing (Validation(..), unwrapResponse)
 import Pages.Msg
 import Pages.Transition exposing (Transition(..))
 import Path exposing (Path)
@@ -332,7 +333,7 @@ dynamic :
      ->
         Form
             error
-            { combine : Validation error parsed named constraints1
+            { combine : Form.Validation.Validation error parsed named constraints1
             , view : subView
             }
             data
@@ -341,7 +342,7 @@ dynamic :
         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
@@ -502,7 +503,7 @@ 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 (Form.Validation.Field error parsed kind -> combineAndView) data
     -> Form error combineAndView data
 field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
     Form
@@ -521,7 +522,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 +531,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 +547,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,7 +601,7 @@ 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 (Form.Validation.Field error parsed Form.FieldView.Hidden -> combineAndView) data
     -> Form error combineAndView data
 hiddenField name (Field fieldParser _) (Form definitions parseFn toInitialValues) =
     Form
@@ -618,7 +619,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 +628,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 +644,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,14 +675,14 @@ 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
     ->
         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
@@ -694,7 +695,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,8 +706,8 @@ 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
@@ -744,6 +745,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 +786,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 +799,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,7 +846,7 @@ 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
     -> ( Maybe parsed, Dict String (List error) )
 parse formId app data (Form _ parser _) =
     -- TODO Get transition context from `app` so you can check if the current form is being submitted
@@ -883,7 +885,7 @@ 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
     -> ( Bool, ( Maybe parsed, Dict String (List error) ) )
 runServerSide rawFormData (Form _ parser _) =
     let
@@ -979,25 +981,21 @@ runOneOfServerSideHelp rawFormData firstFoundErrors (ServerForms parsers) =
 {-| -}
 renderHtml :
     List (Html.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
     -> data
     ->
         FinalForm
             error
-            (Validation error parsed named constraints)
+            (Form.Validation.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)
+renderHtml attrs accessResponse app data (FinalForm options a b c) =
+    Html.Lazy.lazy6 renderHelper attrs accessResponse options app data (FormInternal a b c)
 
 
 {-| -}
@@ -1016,7 +1014,7 @@ type FinalForm error parsed data view userMsg
             , view : view
             }
         )
-        (data -> List ( String, String ))
+        (data -> List ( String, Maybe String ))
 
 
 {-| -}
@@ -1025,14 +1023,14 @@ toDynamicFetcher :
     ->
         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)
+            (Form.Validation.Validation error parsed field constraints)
             data
             (Context error data -> view)
             userMsg
@@ -1098,14 +1096,14 @@ toDynamicTransition :
     ->
         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)
+            (Form.Validation.Validation error parsed field constraints)
             data
             (Context error data -> view)
             userMsg
@@ -1126,7 +1124,7 @@ toDynamicTransition name (Form a b c) =
                 { result : Dict String (List error)
                 , isMatchCandidate : Bool
                 , combineAndView :
-                    { combine : Validation error parsed field constraints
+                    { combine : Form.Validation.Validation error parsed field constraints
                     , view : Context error data -> view
                     }
                 }
@@ -1136,7 +1134,7 @@ toDynamicTransition name (Form a b c) =
                  -> FormState
                  ->
                     { result :
-                        ( Validation error parsed field constraints
+                        ( Form.Validation.Validation error parsed field constraints
                         , Dict String (List error)
                         )
                     , isMatchCandidate : Bool
@@ -1150,7 +1148,7 @@ toDynamicTransition name (Form a b c) =
                         { result : Dict String (List error)
                         , isMatchCandidate : Bool
                         , combineAndView :
-                            { combine : Validation error parsed field constraints
+                            { combine : Form.Validation.Validation error parsed field constraints
                             , view : Context error data -> view
                             }
                         }
@@ -1180,53 +1178,42 @@ withOnSubmit onSubmit (FinalForm options a b c) =
 {-| -}
 renderStyledHtml :
     List (Html.Styled.Attribute (Pages.Msg.Msg msg))
-    ->
-        Maybe
-            { fields : List ( String, String )
-            , errors : Dict String (List error)
-            }
+    -> (actionData -> Maybe (Response error))
     -> AppContext app actionData
     -> data
     ->
         FinalForm
             error
-            (Validation error parsed named constraints)
+            (Form.Validation.Validation error parsed named constraints)
             data
             (Context error data
              -> List (Html.Styled.Html (Pages.Msg.Msg msg))
             )
             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)
+renderStyledHtml attrs accessResponse app data (FinalForm options a b c) =
+    Html.Styled.Lazy.lazy6 renderStyledHelper attrs accessResponse options app data (FormInternal a b c)
 
 
 {-| -}
-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)
-            }
+    -> (actionData -> Maybe (Response error))
     -> RenderOptions msg
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List (Html (Pages.Msg.Msg msg)))
+    -> FormInternal error (Form.Validation.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 =
+renderHelper attrs accessResponse options formState data 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
+            helperValues toHiddenInput accessResponse options formState data form
 
         toHiddenInput : List (Html.Attribute (Pages.Msg.Msg msg)) -> Html (Pages.Msg.Msg msg)
         toHiddenInput hiddenAttrs =
@@ -1253,22 +1240,18 @@ 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)
-            }
+    -> (actionData -> Maybe (Response error))
     -> RenderOptions msg
     -> AppContext app actionData
     -> data
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List (Html.Styled.Html (Pages.Msg.Msg msg)))
+    -> FormInternal error (Form.Validation.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 =
+renderStyledHelper attrs accessResponse options formState data 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
+            helperValues toHiddenInput accessResponse options formState data form
 
         toHiddenInput : List (Html.Attribute (Pages.Msg.Msg msg)) -> Html.Styled.Html (Pages.Msg.Msg msg)
         toHiddenInput hiddenAttrs =
@@ -1295,18 +1278,14 @@ 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)
-            }
+    -> (actionData -> Maybe (Response error))
     -> RenderOptions msg
     -> AppContext app actionData
     -> data
     ---> Form error parsed data view
-    -> FormInternal error (Validation error parsed named constraints) data (Context error data -> List 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 maybe options formState data (FormInternal fieldDefinitions parser toInitialValues) =
+helperValues toHiddenInput accessResponse options formState data (FormInternal fieldDefinitions parser toInitialValues) =
     let
         formId : String
         formId =
@@ -1315,7 +1294,14 @@ helperValues toHiddenInput maybe options formState data (FormInternal fieldDefin
         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 +1309,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 +1330,18 @@ 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 named constraints, Dict String (List error) )
             , isMatchCandidate : Bool
             , view : Context error data -> List view
             }
         parsed =
             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 +1350,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 +1362,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 =
@@ -1498,7 +1486,7 @@ initCombined :
         Form
             error
             { combineAndView
-                | combine : Validation error parsed kind constraints
+                | combine : Form.Validation.Validation error parsed kind constraints
             }
             input
     -> ServerForms error combined
@@ -1511,13 +1499,13 @@ initCombined mapFn (Form _ parseFn _) =
                     foo :
                         { result : Dict String (List error)
                         , isMatchCandidate : Bool
-                        , combineAndView : { combineAndView | combine : Validation error parsed kind constraints }
+                        , combineAndView : { combineAndView | combine : Form.Validation.Validation error parsed kind constraints }
                         }
                     foo =
                         parseFn Nothing formState
                 in
                 { result = foo.result
-                , combineAndView = foo.combineAndView.combine |> Validation.mapWithNever mapFn
+                , combineAndView = foo.combineAndView.combine |> Form.Validation.mapWithNever mapFn
                 , isMatchCandidate = foo.isMatchCandidate
                 }
             )
@@ -1532,7 +1520,7 @@ combine :
         Form
             error
             { combineAndView
-                | combine : Validation error parsed kind constraints
+                | combine : Form.Validation.Validation error parsed kind constraints
             }
             input
     -> ServerForms error combined
@@ -1546,13 +1534,13 @@ combine mapFn (Form _ parseFn _) (ServerForms serverForms) =
                             foo :
                                 { result : Dict String (List error)
                                 , isMatchCandidate : Bool
-                                , combineAndView : { combineAndView | combine : Validation error parsed kind constraints }
+                                , combineAndView : { combineAndView | combine : Form.Validation.Validation error parsed kind constraints }
                                 }
                             foo =
                                 parseFn Nothing formState
                         in
                         { result = foo.result
-                        , combineAndView = foo.combineAndView.combine |> Validation.mapWithNever mapFn
+                        , combineAndView = foo.combineAndView.combine |> Form.Validation.mapWithNever mapFn
                         , isMatchCandidate = foo.isMatchCandidate
                         }
                     )
@@ -1568,12 +1556,12 @@ 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))
+    -> 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 +1572,13 @@ 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))
+    -> 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
 
 
 {-| -}
@@ -1619,7 +1607,7 @@ type FormInternal error parsed data view
             , view : view
             }
         )
-        (data -> List ( String, String ))
+        (data -> List ( String, Maybe String ))
 
 
 {-| -}
@@ -1634,7 +1622,7 @@ type Form error combineAndView input
             , combineAndView : combineAndView
             }
         )
-        (input -> List ( String, String ))
+        (input -> List ( String, Maybe String ))
 
 
 type alias RenderOptions userMsg =

package/src/Head/Seo.elm

@@ -455,9 +455,9 @@ tags (Content common details) =
                     -}
                     [ ( "og:type", "article" |> Head.raw |> Just )
                     , ( "article:section", articleDetails.section |> Maybe.map Head.raw )
-                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
-                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
-                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map (DateOrDateTime.toIso8601 >> Head.raw) )
+                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map (DateOrDateTime.toIso8601 >> Head.raw) )
+                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map (DateOrDateTime.toIso8601 >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "article:tag", tag |> Head.raw |> Just ))
@@ -466,7 +466,7 @@ tags (Content common details) =
                 Book bookDetails ->
                     [ ( "og:type", "book" |> Head.raw |> Just )
                     , ( "og:isbn", bookDetails.isbn |> Maybe.map Head.raw )
-                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map (DateOrDateTime.toIso8601 >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "book:tag", tag |> Head.raw |> Just ))