npm - elm-pages - Versions diffs - 3.0.0-beta.3 → 3.0.0-beta.31 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (129) hide show

package/README.md +10 -1
package/codegen/{elm-pages-codegen.js → elm-pages-codegen.cjs} +2864 -2589
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Review-DeadCodeEliminateData.elmi +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Review-DeadCodeEliminateData.elmo +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Review-DeadCodeEliminateDataTest.elmo +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/d.dat +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/i.dat +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/o.dat +0 -0
package/generator/dead-code-review/elm-stuff/tests-0.19.1/elm.json +1 -1
package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/Reporter.elm.js +1447 -342
package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/Runner.elm.js +16458 -13724
package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_runner.js +1 -1
package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_supervisor.js +4 -4
package/generator/dead-code-review/elm.json +9 -7
package/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm +59 -10
package/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm +52 -36
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Internal-RoutePattern.elmi +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Internal-RoutePattern.elmo +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Review-NoContractViolations.elmi +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/Pages-Review-NoContractViolations.elmo +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/d.dat +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/i.dat +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm-stuff/0.19.1/o.dat +0 -0
package/generator/review/elm-stuff/tests-0.19.1/elm.json +1 -1
package/generator/review/elm-stuff/tests-0.19.1/js/Reporter.elm.js +1447 -342
package/generator/review/elm-stuff/tests-0.19.1/js/Runner.elm.js +24542 -21748
package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js +1 -1
package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js +4 -4
package/generator/review/elm.json +10 -10
package/generator/src/RouteBuilder.elm +113 -107
package/generator/src/SharedTemplate.elm +3 -2
package/generator/src/SiteConfig.elm +3 -2
package/generator/src/basepath-middleware.js +3 -3
package/generator/src/build.js +125 -88
package/generator/src/cli.js +273 -88
package/generator/src/codegen.js +29 -27
package/generator/src/compatibility-key.js +3 -0
package/generator/src/compile-elm.js +43 -26
package/generator/src/config.js +39 -0
package/generator/src/copy-dir.js +2 -2
package/generator/src/dev-server.js +150 -133
package/generator/src/dir-helpers.js +9 -26
package/generator/src/elm-codegen.js +5 -4
package/generator/src/elm-file-constants.js +2 -3
package/generator/src/error-formatter.js +12 -11
package/generator/src/file-helpers.js +3 -4
package/generator/src/generate-template-module-connector.js +23 -22
package/generator/src/init.js +9 -8
package/generator/src/pre-render-html.js +39 -28
package/generator/src/render-test.js +109 -0
package/generator/src/render-worker.js +25 -28
package/generator/src/render.js +320 -142
package/generator/src/request-cache.js +252 -163
package/generator/src/resolve-elm-module.js +63 -0
package/generator/src/rewrite-client-elm-json.js +6 -5
package/generator/src/rewrite-elm-json-help.js +56 -0
package/generator/src/rewrite-elm-json.js +17 -7
package/generator/src/route-codegen-helpers.js +16 -31
package/generator/src/seo-renderer.js +12 -7
package/generator/src/vite-utils.js +77 -0
package/generator/static-code/hmr.js +79 -13
package/generator/template/app/Api.elm +6 -5
package/generator/template/app/Effect.elm +123 -0
package/generator/template/app/ErrorPage.elm +37 -6
package/generator/template/app/Route/Index.elm +17 -10
package/generator/template/app/Shared.elm +24 -47
package/generator/template/app/Site.elm +19 -6
package/generator/template/app/View.elm +1 -8
package/generator/template/elm-tooling.json +0 -3
package/generator/template/elm.json +32 -24
package/generator/template/package.json +10 -4
package/package.json +29 -27
package/src/ApiRoute.elm +199 -61
package/src/BackendTask/Custom.elm +325 -0
package/src/BackendTask/Env.elm +90 -0
package/src/{DataSource → BackendTask}/File.elm +128 -43
package/src/{DataSource → BackendTask}/Glob.elm +136 -125
package/src/BackendTask/Http.elm +673 -0
package/src/{DataSource → BackendTask}/Internal/Glob.elm +1 -1
package/src/BackendTask/Internal/Request.elm +28 -0
package/src/BackendTask/Random.elm +79 -0
package/src/BackendTask/Time.elm +47 -0
package/src/BackendTask.elm +537 -0
package/src/FatalError.elm +89 -0
package/src/Form/Field.elm +21 -9
package/src/Form/FieldView.elm +94 -14
package/src/Form.elm +275 -400
package/src/Head.elm +237 -7
package/src/HtmlPrinter.elm +7 -3
package/src/Internal/ApiRoute.elm +7 -5
package/src/PageServerResponse.elm +6 -1
package/src/Pages/FormState.elm +6 -5
package/src/Pages/GeneratorProgramConfig.elm +15 -0
package/src/Pages/Internal/FatalError.elm +5 -0
package/src/Pages/Internal/Form.elm +21 -1
package/src/Pages/{Msg.elm → Internal/Msg.elm} +26 -16
package/src/Pages/Internal/Platform/Cli.elm +598 -763
package/src/Pages/Internal/Platform/CompatibilityKey.elm +6 -0
package/src/Pages/Internal/Platform/Effect.elm +1 -2
package/src/Pages/Internal/Platform/GeneratorApplication.elm +373 -0
package/src/Pages/Internal/Platform/StaticResponses.elm +73 -270
package/src/Pages/Internal/Platform/ToJsPayload.elm +4 -7
package/src/Pages/Internal/Platform.elm +216 -102
package/src/Pages/Internal/Script.elm +17 -0
package/src/Pages/Internal/StaticHttpBody.elm +35 -1
package/src/Pages/Manifest.elm +29 -4
package/src/Pages/PageUrl.elm +23 -9
package/src/Pages/ProgramConfig.elm +14 -10
package/src/Pages/Script.elm +109 -0
package/src/Pages/SiteConfig.elm +3 -2
package/src/Pages/StaticHttp/Request.elm +2 -2
package/src/Pages/StaticHttpRequest.elm +23 -98
package/src/PagesMsg.elm +92 -0
package/src/Path.elm +16 -19
package/src/QueryParams.elm +21 -172
package/src/RequestsAndPending.elm +8 -19
package/src/Result/Extra.elm +26 -0
package/src/Scaffold/Form.elm +560 -0
package/src/Scaffold/Route.elm +1388 -0
package/src/Server/Request.elm +43 -37
package/src/Server/Session.elm +62 -42
package/src/Server/SetCookie.elm +12 -4
package/src/Test/Html/Internal/ElmHtml/ToString.elm +8 -9
package/src/DataSource/Env.elm +0 -38
package/src/DataSource/Http.elm +0 -446
package/src/DataSource/Internal/Request.elm +0 -20
package/src/DataSource/Port.elm +0 -90
package/src/DataSource.elm +0 -538
package/src/Pages/Generate.elm +0 -800

package/src/Head.elm CHANGED Viewed

@@ -1,6 +1,7 @@
 module Head exposing
     ( Tag, metaName, metaProperty, metaRedirect
     , rssLink, sitemapLink, rootLanguage, manifestLink
+    , nonLoadingNode
     , structuredData
     , AttributeValue
     , currentPageFullUrl, urlAttribute, raw
@@ -8,18 +9,124 @@ module Head exposing
     , toJson, canonicalLink
     )
-{-| This module contains low-level functions for building up
-values that will be rendered into the page's `<head>` tag
-when you run `elm-pages build`. Most likely the `Head.Seo` module
-will do everything you need out of the box, and you will just need to import `Head`
-so you can use the `Tag` type in your type annotations.
+{-| This module contains functions for building up
+tags with metadata that will be rendered into the page's `<head>` tag
+when your page is pre-rendered (or server-rendered, in the case of your server-rendered Route Modules). See also [`Head.Seo`](Head-Seo),
+which has some helper functions for defining OpenGraph and Twitter tags.
-But this module might be useful if you have a special use case, or if you are
-writing a plugin package to extend `elm-pages`.
+One of the unique benefits of using `elm-pages` is that all of your routes (both pre-rendered and server-rendered) fully
+render the HTML of your page. That includes the full initial `view` (with the BackendTask resolved, and the `Model` from `init`).
+The HTML response also includes all of the `Head` tags, which are defined in two places:
+1.  `app/Site.elm` - there is a `head` definition in `Site.elm` where you define global head tags that will be included on every rendered page.
+2.  In each Route Module - there is a `head` function where you have access to both the resolved `BackendTask` and the `RouteParams` for the page and can return head tags based on that.
+Here is a common set of global head tags that we can define in `Site.elm`:
+    module Site exposing (canonicalUrl, config)
+    import BackendTask exposing (BackendTask)
+    import Head
+    import MimeType
+    import SiteConfig exposing (SiteConfig)
+    config : SiteConfig
+    config =
+    { canonicalUrl = "<https://elm-pages.com">
+    , head = head
+    }
+    head : BackendTask (List Head.Tag)
+    head =
+    [ Head.metaName "viewport" (Head.raw "width=device-width,initial-scale=1")
+    , Head.metaName "mobile-web-app-capable" (Head.raw "yes")
+    , Head.metaName "theme-color" (Head.raw "#ffffff")
+    , Head.metaName "apple-mobile-web-app-capable" (Head.raw "yes")
+    , Head.metaName "apple-mobile-web-app-status-bar-style" (Head.raw "black-translucent")
+    , Head.icon [ ( 32, 32 ) ] MimeType.Png (cloudinaryIcon MimeType.Png 32)
+    , Head.icon [ ( 16, 16 ) ] MimeType.Png (cloudinaryIcon MimeType.Png 16)
+    , Head.appleTouchIcon (Just 180) (cloudinaryIcon MimeType.Png 180)
+    , Head.appleTouchIcon (Just 192) (cloudinaryIcon MimeType.Png 192)
+    ]
+    |> BackendTask.succeed
+And here is a `head` function for a Route Module for a blog post. Note that we have access to our `BackendTask` Data and
+are using it to populate article metadata like the article's image, publish date, etc.
+    import Article
+    import BackendTask
+    import Date
+    import Head
+    import Head.Seo
+    import Path
+    import Route exposing (Route)
+    import RouteBuilder exposing (App, StatelessRoute)
+    type alias RouteParams =
+        { slug : String }
+    type alias Data =
+        { metadata : ArticleMetadata
+        , body : List Markdown.Block.Block
+        }
+    route : StatelessRoute RouteParams Data ActionData
+    route =
+        RouteBuilder.preRender
+            { data = data
+            , head = head
+            , pages = pages
+            }
+            |> RouteBuilder.buildNoState { view = view }
+    head :
+        App Data ActionData RouteParams
+        -> List Head.Tag
+    head static =
+        let
+            metadata =
+                static.data.metadata
+        in
+        Head.Seo.summaryLarge
+            { canonicalUrlOverride = Nothing
+            , siteName = "elm-pages"
+            , image =
+                { url = metadata.image
+                , alt = metadata.description
+                , dimensions = Nothing
+                , mimeType = Nothing
+                }
+            , description = metadata.description
+            , locale = Nothing
+            , title = metadata.title
+            }
+            |> Head.Seo.article
+                { tags = []
+                , section = Nothing
+                , publishedTime = Just (DateOrDateTime.Date metadata.published)
+                , modifiedTime = Nothing
+                , expirationTime = Nothing
+                }
+## Why is pre-rendered HTML important? Does it still matter for SEO?
+Many search engines are able to execute JavaScript now. However, not all are, and even with crawlers like Google, there
+is a longer lead time for your pages to be indexed when you have HTML with a blank page that is only visible after the JavaScript executes.
+But most importantly, many tools that unfurl links will not execute JavaScript at all, but rather simply do a simple pass to parse your `<head>` tags.
+It is not viable or reliable to add `<head>` tags for metadata on the client-side, it must be present in the initial HTML payload. Otherwise you may not
+get unfurling preview content when you share a link to your site on Slack, Twitter, etc.
+## Building up Head Tags
 @docs Tag, metaName, metaProperty, metaRedirect
 @docs rssLink, sitemapLink, rootLanguage, manifestLink
+@docs nonLoadingNode
 ## Structured Data
@@ -45,9 +152,11 @@ writing a plugin package to extend `elm-pages`.
 import Json.Encode
 import LanguageTag exposing (LanguageTag)
+import List.Extra
 import MimeType
 import Pages.Internal.String as String
 import Pages.Url
+import Regex
 {-| Values that can be passed to the generated `Pages.application` config
@@ -57,6 +166,7 @@ type Tag
     = Tag Details
     | StructuredData Json.Encode.Value
     | RootModifier String String
+    | Stripped String
 type alias Details =
@@ -211,6 +321,120 @@ canonicalLink maybePath =
         ]
+{-| Escape hatch for any head tags that don't have high-level helpers. This lets you build arbitrary head nodes as long as they
+are not loading or preloading directives.
+Tags that do loading/pre-loading will not work from this function. `elm-pages` uses ViteJS for loading assets like
+script tags, stylesheets, fonts, etc., and allows you to customize which assets to preload and how through the elm-pages.config.mjs file.
+See the full discussion of the design in [#339](https://github.com/dillonkearns/elm-pages/discussions/339).
+So for example the following tags would _not_ load if defined through `nonLoadingNode`, and would instead need to be registered through Vite:
+  - `<script src="...">`
+  - `<link href="/style.css">`
+  - `<link rel="preload">`
+The following tag would successfully render as it is a non-loading tag:
+    Head.nonLoadingNode "link"
+        [ ( "rel", Head.raw "alternate" )
+        , ( "type", Head.raw "application/atom+xml" )
+        , ( "title", Head.raw "News" )
+        , ( "href", Head.raw "/news/atom" )
+        ]
+Renders the head tag:
+`<link rel="alternate" type="application/atom+xml" title="News" href="/news/atom">`
+-}
+nonLoadingNode : String -> List ( String, AttributeValue ) -> Tag
+nonLoadingNode nodeName attributes =
+    let
+        relTag : Maybe AttributeValue
+        relTag =
+            attributes
+                |> List.Extra.find (\( key, _ ) -> key == "rel")
+                |> Maybe.map Tuple.second
+        isPreloadDirective : Bool
+        isPreloadDirective =
+            case relTag of
+                Just (Raw rel) ->
+                    let
+                        isLinkTag : Bool
+                        isLinkTag =
+                            nodeName |> matchesKeyword "link"
+                    in
+                    isLinkTag
+                        && (rel
+                                |> matchesOneKeyword
+                                    [ "preload"
+                                    , "modulepreload"
+                                    , "preconnect"
+                                    , "dns-prefetch"
+                                    , "stylesheet"
+                                    ]
+                           )
+                _ ->
+                    False
+    in
+    if
+        (nodeName |> matchesKeyword "script")
+            || isPreloadDirective
+    then
+        Stripped
+            ("<"
+                ++ nodeName
+                ++ " "
+                ++ (attributes
+                        |> List.map
+                            (\( name, value ) ->
+                                name
+                                    ++ "=\""
+                                    ++ ((case value of
+                                            Raw rawValue ->
+                                                rawValue
+                                            _ ->
+                                                "<internals>"
+                                        )
+                                            ++ "\""
+                                       )
+                            )
+                        |> String.join " "
+                   )
+                ++ " />"
+            )
+    else
+        node nodeName attributes
+matchesOneKeyword : List String -> String -> Bool
+matchesOneKeyword keywords string =
+    List.any
+        (\keyword -> string |> matchesKeyword keyword)
+        keywords
+matchesKeyword : String -> String -> Bool
+matchesKeyword regex string =
+    string |> matchesRegex ("^\\s*" ++ regex ++ "\\s*$")
+matchesRegex : String -> String -> Bool
+matchesRegex regex string =
+    string
+        |> Regex.contains
+            (Regex.fromStringWith
+                { caseInsensitive = True, multiline = True }
+                regex
+                |> Maybe.withDefault Regex.never
+            )
 {-| Let's you link to your manifest.json file, see <https://developer.mozilla.org/en-US/docs/Web/Manifest#deploying_a_manifest>.
 -}
 manifestLink : String -> Tag
@@ -443,6 +667,12 @@ toJson canonicalSiteUrl currentPagePath tag =
                 , ( "keyValuePair", Json.Encode.list Json.Encode.string [ key, value ] )
                 ]
+        Stripped message ->
+            Json.Encode.object
+                [ ( "type", Json.Encode.string "stripped" )
+                , ( "message", Json.Encode.string message )
+                ]
 encodeProperty : String -> String -> ( String, AttributeValue ) -> Json.Encode.Value
 encodeProperty canonicalSiteUrl currentPagePath ( name, value ) =

package/src/HtmlPrinter.elm CHANGED Viewed

@@ -8,15 +8,19 @@ import Test.Html.Internal.ElmHtml.ToString exposing (defaultFormatOptions, nodeT
 import VirtualDom
-htmlToString : Html msg -> String
-htmlToString viewHtml =
+htmlToString : Maybe { indent : Int, newLines : Bool } -> Html msg -> String
+htmlToString formatOptions viewHtml =
     case
         Decode.decodeValue
             (decodeElmHtml (\_ _ -> VirtualDom.Normal (Decode.succeed ())))
             (asJsonView viewHtml)
     of
         Ok str ->
-            nodeToStringWithOptions defaultFormatOptions str
+            nodeToStringWithOptions
+                (formatOptions
+                    |> Maybe.withDefault defaultFormatOptions
+                )
+                str
         Err err ->
             "Error pre-rendering HTML in HtmlPrinter.elm: " ++ Decode.errorToString err

package/src/Internal/ApiRoute.elm CHANGED Viewed

@@ -8,8 +8,10 @@ module Internal.ApiRoute exposing
     , withRoutes
     )
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
+import Json.Decode
 import Pattern exposing (Pattern)
 import Regex exposing (Regex)
@@ -44,12 +46,12 @@ tryMatchDone path (ApiRoute handler) =
 type ApiRoute response
     = ApiRoute
         { regex : Regex
-        , matchesToResponse : String -> DataSource (Maybe response)
-        , buildTimeRoutes : DataSource (List String)
-        , handleRoute : String -> DataSource Bool
+        , matchesToResponse : Json.Decode.Value -> String -> BackendTask FatalError (Maybe response)
+        , buildTimeRoutes : BackendTask FatalError (List String)
+        , handleRoute : String -> BackendTask FatalError Bool
         , pattern : Pattern
         , kind : String
-        , globalHeadTags : Maybe (DataSource (List Head.Tag))
+        , globalHeadTags : Maybe (BackendTask FatalError (List Head.Tag))
         }

package/src/PageServerResponse.elm CHANGED Viewed

@@ -15,7 +15,12 @@ type PageServerResponse data error
     | ErrorPage error { headers : List ( String, String ) }
-toRedirect : Response -> Maybe { statusCode : Int, location : String }
+toRedirect :
+    { response
+        | statusCode : Int
+        , headers : List ( String, String )
+    }
+    -> Maybe { statusCode : Int, location : String }
 toRedirect response =
     response.headers
         |> Dict.fromList

package/src/Pages/FormState.elm CHANGED Viewed

@@ -12,15 +12,16 @@ import Html exposing (Attribute)
 import Html.Attributes as Attr
 import Html.Events
 import Json.Decode as Decode exposing (Decoder)
-import Pages.Msg
+import Pages.Internal.Msg
+import PagesMsg exposing (PagesMsg)
 {-| -}
-listeners : String -> List (Attribute (Pages.Msg.Msg userMsg))
+listeners : String -> List (Attribute (PagesMsg userMsg))
 listeners formId =
-    [ Html.Events.on "focusin" (Decode.value |> Decode.map Pages.Msg.FormFieldEvent)
-    , Html.Events.on "focusout" (Decode.value |> Decode.map Pages.Msg.FormFieldEvent)
-    , Html.Events.on "input" (Decode.value |> Decode.map Pages.Msg.FormFieldEvent)
+    [ Html.Events.on "focusin" (Decode.value |> Decode.map Pages.Internal.Msg.FormFieldEvent)
+    , Html.Events.on "focusout" (Decode.value |> Decode.map Pages.Internal.Msg.FormFieldEvent)
+    , Html.Events.on "input" (Decode.value |> Decode.map Pages.Internal.Msg.FormFieldEvent)
     , Attr.id formId
     ]

package/src/Pages/GeneratorProgramConfig.elm ADDED Viewed

@@ -0,0 +1,15 @@
+module Pages.GeneratorProgramConfig exposing (GeneratorProgramConfig)
+import Json.Decode as Decode
+import Json.Encode
+import Pages.Internal.Platform.ToJsPayload
+import Pages.Script exposing (Script)
+type alias GeneratorProgramConfig =
+    { data : Script
+    , toJsPort : Json.Encode.Value -> Cmd Never
+    , fromJsPort : Sub Decode.Value
+    , gotBatchSub : Sub Decode.Value
+    , sendPageData : Pages.Internal.Platform.ToJsPayload.NewThingForPort -> Cmd Never
+    }

package/src/Pages/Internal/FatalError.elm ADDED Viewed

@@ -0,0 +1,5 @@
+module Pages.Internal.FatalError exposing (FatalError(..))
+type FatalError
+    = FatalError { title : String, body : String }

package/src/Pages/Internal/Form.elm CHANGED Viewed

@@ -1,4 +1,4 @@
-module Pages.Internal.Form exposing (Validation(..), ViewField)
+module Pages.Internal.Form exposing (Response(..), Validation(..), ViewField, unwrapResponse)
 import Dict exposing (Dict)
 import Form.FieldStatus exposing (FieldStatus)
@@ -15,3 +15,23 @@ type alias ViewField kind =
     , status : FieldStatus
     , kind : ( kind, List ( String, Encode.Value ) )
     }
+{-| -}
+type Response error
+    = Response
+        { fields : List ( String, String )
+        , errors : Dict String (List error)
+        , clientErrors : Dict String (List error)
+        }
+unwrapResponse :
+    Response error
+    ->
+        { fields : List ( String, String )
+        , errors : Dict String (List error)
+        , clientErrors : Dict String (List error)
+        }
+unwrapResponse (Response response) =
+    response

package/src/Pages/{Msg.elm → Internal/Msg.elm} RENAMED Viewed

@@ -1,16 +1,11 @@
-module Pages.Msg exposing
+module Pages.Internal.Msg exposing
     ( Msg(..)
-    , map, onSubmit, fetcherOnSubmit, submitIfValid
+    , fetcherOnSubmit
+    , map
+    , onSubmit
+    , submitIfValid
     )
-{-|
-@docs Msg
-@docs map, onSubmit, fetcherOnSubmit, submitIfValid
--}
 import Form.FormData exposing (FormData)
 import FormDecoder
 import Html exposing (Attribute)
@@ -22,9 +17,10 @@ import Json.Decode
 type Msg userMsg
     = UserMsg userMsg
     | Submit FormData
-    | SubmitIfValid String FormData Bool
+    | SubmitIfValid String FormData Bool (Maybe userMsg)
     | SubmitFetcher String FormData Bool (Maybe userMsg)
     | FormFieldEvent Json.Decode.Value
+    | NoOp
 {-| -}
@@ -35,10 +31,21 @@ onSubmit =
 {-| -}
-submitIfValid : String -> (List ( String, String ) -> Bool) -> Attribute (Msg userMsg)
-submitIfValid formId isValid =
+submitIfValid : Maybe ({ fields : List ( String, String ) } -> userMsg) -> String -> (List ( String, String ) -> Bool) -> Attribute (Msg userMsg)
+submitIfValid userMsg formId isValid =
     FormDecoder.formDataOnSubmit
-        |> Attr.map (\formData -> SubmitIfValid formId formData (isValid formData.fields))
+        |> Attr.map
+            (\formData ->
+                SubmitIfValid formId
+                    formData
+                    (isValid formData.fields)
+                    (userMsg
+                        |> Maybe.map
+                            (\toUserMsg ->
+                                toUserMsg { fields = formData.fields }
+                            )
+                    )
+            )
 {-| -}
@@ -69,11 +76,14 @@ map mapFn msg =
         Submit info ->
             Submit info
-        SubmitIfValid formId info isValid ->
-            SubmitIfValid formId info isValid
+        SubmitIfValid formId info isValid toUserMsg ->
+            SubmitIfValid formId info isValid (Maybe.map mapFn toUserMsg)
         SubmitFetcher formId info isValid toUserMsg ->
             SubmitFetcher formId info isValid (Maybe.map mapFn toUserMsg)
         FormFieldEvent value ->
             FormFieldEvent value
+        NoOp ->
+            NoOp