elm-pages 3.0.0-beta.40 → 3.0.0-beta.42

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 2220181744, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 848138408, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 2220181744,
+  initialSeed: 848138408,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 1451258136, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 2748899408, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1451258136,
+  initialSeed: 2748899408,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/src/RouteBuilder.elm

@@ -94,23 +94,24 @@ import Form
 import Head
 import Http
 import Json.Decode
+import Pages.ConcurrentSubmission
 import Pages.Fetcher
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.RoutePattern exposing (RoutePattern)
+import Pages.Navigation
 import Pages.PageUrl exposing (PageUrl)
-import Pages.Transition
 import PagesMsg exposing (PagesMsg)
-import Path exposing (Path)
 import Server.Request
 import Server.Response
 import Shared
+import UrlPath exposing (UrlPath)
 import View exposing (View)
 
 
 {-| -}
 type alias StatefulRoute routeParams data action model msg =
-    { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
-    , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+    { data : Server.Request.Request -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , action : Server.Request.Request -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
     , staticRoutes : BackendTask FatalError (List routeParams)
     , view :
         Shared.Model
@@ -122,7 +123,7 @@ type alias StatefulRoute routeParams data action model msg =
         -> List Head.Tag
     , init : Shared.Model -> App data action routeParams -> ( model, Effect msg )
     , update : App data action routeParams -> msg -> model -> Shared.Model -> ( model, Effect msg, Maybe Shared.Msg )
-    , subscriptions : routeParams -> Path -> model -> Shared.Model -> Sub msg
+    , subscriptions : routeParams -> UrlPath -> model -> Shared.Model -> Sub msg
     , handleRoute : { moduleName : List String, routePattern : RoutePattern } -> (routeParams -> List ( String, String )) -> routeParams -> BackendTask FatalError (Maybe NotFoundReason)
     , kind : String
     , onAction : Maybe (action -> msg)
@@ -139,14 +140,14 @@ type alias App data action routeParams =
     { data : data
     , sharedData : Shared.Data
     , routeParams : routeParams
-    , path : Path
+    , path : UrlPath
     , url : Maybe PageUrl
     , action : Maybe action
     , submit :
         { fields : List ( String, String ), headers : List ( String, String ) }
         -> Pages.Fetcher.Fetcher (Result Http.Error action)
-    , transition : Maybe Pages.Transition.Transition
-    , fetchers : Dict String (Pages.Transition.FetcherState (Maybe action))
+    , navigation : Maybe Pages.Navigation.Navigation
+    , concurrentSubmissions : Dict String (Pages.ConcurrentSubmission.ConcurrentSubmission (Maybe action))
     , pageFormState : Form.Model
     }
 
@@ -154,8 +155,8 @@ type alias App data action routeParams =
 {-| -}
 type Builder routeParams data action
     = WithData
-        { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
-        , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+        { data : Server.Request.Request -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+        , action : Server.Request.Request -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
         , staticRoutes : BackendTask FatalError (List routeParams)
         , head :
             App data action routeParams
@@ -213,7 +214,7 @@ buildWithLocalState :
         -> View (PagesMsg msg)
     , init : App data action routeParams -> Shared.Model -> ( model, Effect msg )
     , update : App data action routeParams -> Shared.Model -> msg -> model -> ( model, Effect msg )
-    , subscriptions : routeParams -> Path -> Shared.Model -> model -> Sub msg
+    , subscriptions : routeParams -> UrlPath -> Shared.Model -> model -> Sub msg
     }
     -> Builder routeParams data action
     -> StatefulRoute routeParams data action model msg
@@ -253,7 +254,7 @@ buildWithSharedState :
         -> View (PagesMsg msg)
     , init : App data action routeParams -> Shared.Model -> ( model, Effect msg )
     , update : App data action routeParams -> Shared.Model -> msg -> model -> ( model, Effect msg, Maybe Shared.Msg )
-    , subscriptions : routeParams -> Path -> Shared.Model -> model -> Sub msg
+    , subscriptions : routeParams -> UrlPath -> Shared.Model -> model -> Sub msg
     }
     -> Builder routeParams data action
     -> StatefulRoute routeParams data action model msg
@@ -361,61 +362,19 @@ preRenderWithFallback { data, head, pages } =
 
 {-| -}
 serverRender :
-    { data : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response data ErrorPage))
-    , action : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response action ErrorPage))
+    { data : routeParams -> Server.Request.Request -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , action : routeParams -> Server.Request.Request -> BackendTask FatalError (Server.Response.Response action ErrorPage)
     , head : App data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
 serverRender { data, action, head } =
     WithData
         { data =
-            \requestPayload routeParams ->
-                (routeParams
-                    |> data
-                    |> Server.Request.getDecoder
-                    |> (\decoder ->
-                            Json.Decode.decodeValue decoder requestPayload
-                                |> Result.mapError Json.Decode.errorToString
-                                |> BackendTask.fromResult
-                                -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
-                       )
-                )
-                    |> BackendTask.andThen
-                        (\rendered ->
-                            case rendered of
-                                Ok okRendered ->
-                                    okRendered
-
-                                Err error ->
-                                    Server.Request.errorsToString error
-                                        |> FatalError.fromString
-                                        |> BackendTask.fail
-                        )
+            \request routeParams ->
+                data routeParams request
         , action =
-            \requestPayload routeParams ->
-                (routeParams
-                    |> action
-                    |> Server.Request.getDecoder
-                    |> (\decoder ->
-                            Json.Decode.decodeValue decoder requestPayload
-                                |> Result.mapError Json.Decode.errorToString
-                                |> BackendTask.fromResult
-                                -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
-                       )
-                )
-                    |> BackendTask.andThen
-                        (\rendered ->
-                            case rendered of
-                                Ok okRendered ->
-                                    okRendered
-
-                                Err error ->
-                                    Server.Request.errorsToString error
-                                        |> FatalError.fromString
-                                        |> BackendTask.fail
-                        )
+            \request routeParams ->
+                action routeParams request
         , staticRoutes = BackendTask.succeed []
         , head = head
         , serverless = True

package/generator/src/SharedTemplate.elm

@@ -6,7 +6,7 @@ import FatalError exposing (FatalError)
 import Html exposing (Html)
 import Pages.Flags exposing (Flags)
 import Pages.PageUrl exposing (PageUrl)
-import Path exposing (Path)
+import UrlPath exposing (UrlPath)
 import Route exposing (Route)
 import View exposing (View)
 
@@ -17,7 +17,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         ->
             Maybe
                 { path :
-                    { path : Path
+                    { path : UrlPath
                     , query : Maybe String
                     , fragment : Maybe String
                     }
@@ -29,7 +29,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
     , view :
         sharedData
         ->
-            { path : Path
+            { path : UrlPath
             , route : Maybe Route
             }
         -> sharedModel
@@ -37,10 +37,10 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         -> View mappedMsg
         -> { body : List (Html mappedMsg), title : String }
     , data : BackendTask.BackendTask FatalError sharedData
-    , subscriptions : Path -> sharedModel -> Sub msg
+    , subscriptions : UrlPath -> sharedModel -> Sub msg
     , onPageChange :
         Maybe
-            ({ path : Path
+            ({ path : UrlPath
              , query : Maybe String
              , fragment : Maybe String
              }

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 17;
+export const compatibilityKey = 19;
 
-export const packageVersion = "3.0.0-beta.40";
+export const packageVersion = "3.0.0-beta.42";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.40",
+  "version": "3.0.0-beta.42",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -55,7 +55,7 @@
     "@types/micromatch": "^4.0.2",
     "@types/node": "^20.1.0",
     "@types/serve-static": "^1.15.1",
-    "cypress": "^12.11.0",
+    "cypress": "^12.13.0",
     "elm-codegen": "^0.3.0",
     "elm-optimize-level-2": "^0.3.5",
     "elm-review": "^2.10.2",

package/src/ApiRoute.elm

@@ -176,6 +176,7 @@ import BackendTask exposing (BackendTask)
 import FatalError exposing (FatalError)
 import Head
 import Internal.ApiRoute exposing (ApiRoute(..), ApiRouteBuilder(..))
+import Internal.Request
 import Json.Decode as Decode
 import Json.Encode
 import Pattern
@@ -199,7 +200,7 @@ single handler =
 
 
 {-| -}
-serverRender : ApiRouteBuilder (Server.Request.Parser (BackendTask FatalError (Server.Response.Response Never Never))) constructor -> ApiRoute Response
+serverRender : ApiRouteBuilder (Server.Request.Request -> BackendTask FatalError (Server.Response.Response Never Never)) constructor -> ApiRoute Response
 serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
     ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
@@ -208,36 +209,7 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
                 Internal.ApiRoute.tryMatch path fullHandler
                     |> Maybe.map
                         (\toBackendTask ->
-                            Server.Request.getDecoder toBackendTask
-                                |> (\decoder ->
-                                        Decode.decodeValue decoder serverRequest
-                                            |> Result.mapError Decode.errorToString
-                                            |> BackendTask.fromResult
-                                            |> BackendTask.map Just
-                                   )
-                                |> BackendTask.onError
-                                    (\stringError ->
-                                        -- TODO make error with title and better context/formatting
-                                        FatalError.fromString stringError |> BackendTask.fail
-                                    )
-                                |> BackendTask.andThen
-                                    (\rendered ->
-                                        case rendered of
-                                            Just (Ok okRendered) ->
-                                                okRendered
-
-                                            Just (Err errors) ->
-                                                errors
-                                                    |> Server.Request.errorsToString
-                                                    |> Server.Response.plainText
-                                                    |> Server.Response.withStatusCode 400
-                                                    |> BackendTask.succeed
-
-                                            Nothing ->
-                                                Server.Response.plainText "No matching request handler"
-                                                    |> Server.Response.withStatusCode 400
-                                                    |> BackendTask.succeed
-                                    )
+                            toBackendTask (Internal.Request.toRequest serverRequest)
                         )
                     |> Maybe.map (BackendTask.map (Server.Response.toJson >> Just))
                     |> Maybe.withDefault

package/src/BackendTask.elm

@@ -98,28 +98,19 @@ type alias BackendTask error value =
     RawRequest error value
 
 
-{-| Transform a request into an arbitrary value. The same underlying HTTP requests will be performed during the build
-step, but mapping allows you to change the resulting values by applying functions to the results.
-
-A common use for this is to map your data into your elm-pages view:
+{-| Transform a request into an arbitrary value. The same underlying task will be performed,
+but mapping allows you to change the resulting values by applying functions to the results.
 
     import BackendTask
+    import BackendTask.Http
     import Json.Decode as Decode exposing (Decoder)
 
-    view =
-        BackendTask.Http.get
-            (Secrets.succeed "https://api.github.com/repos/dillonkearns/elm-pages")
+    starsMessage =
+        BackendTask.Http.getJson
+            "https://api.github.com/repos/dillonkearns/elm-pages"
             (Decode.field "stargazers_count" Decode.int)
             |> BackendTask.map
-                (\stars ->
-                    { view =
-                        \model viewForPage ->
-                            { title = "Current stars: " ++ String.fromInt stars
-                            , body = Html.text <| "⭐️ " ++ String.fromInt stars
-                            , head = []
-                            }
-                    }
-                )
+                (\stars -> "⭐️ " ++ String.fromInt stars)
 
 -}
 map : (a -> b) -> BackendTask error a -> BackendTask error b
@@ -146,7 +137,7 @@ resolve =
     andThen combine
 
 
-{-| Turn a list of `StaticHttp.Request`s into a single one.
+{-| Turn a list of `BackendTask`s into a single one.
 
     import BackendTask
     import Json.Decode as Decode exposing (Decoder)
@@ -156,10 +147,10 @@ resolve =
         , sprite : String
         }
 
-    pokemonDetailRequest : StaticHttp.Request (List Pokemon)
+    pokemonDetailRequest : BackendTask (List Pokemon)
     pokemonDetailRequest =
-        StaticHttp.get
-            (Secrets.succeed "https://pokeapi.co/api/v2/pokemon/?limit=3")
+        BackendTask.Http.getJson
+            "https://pokeapi.co/api/v2/pokemon/?limit=3"
             (Decode.field "results"
                 (Decode.list
                     (Decode.map2 Tuple.pair
@@ -167,7 +158,7 @@ resolve =
                         (Decode.field "url" Decode.string)
                         |> Decode.map
                             (\( name, url ) ->
-                                StaticHttp.get (Secrets.succeed url)
+                                BackendTask.Http.getJson url
                                     (Decode.at
                                         [ "sprites", "front_default" ]
                                         Decode.string
@@ -177,7 +168,7 @@ resolve =
                     )
                 )
             )
-            |> StaticHttp.andThen StaticHttp.combine
+            |> BackendTask.andThen BackendTask.combine
 
 -}
 combine : List (BackendTask error value) -> BackendTask error (List value)
@@ -353,7 +344,7 @@ fail error =
     ApiRoute (Err error)
 
 
-{-| Turn an Err into a BackendTask failure.
+{-| Turn `Ok` into `BackendTask.succeed` and `Err` into `BackendTask.fail`.
 -}
 fromResult : Result error value -> BackendTask error value
 fromResult result =
@@ -523,7 +514,10 @@ map9 combineFn request1 request2 request3 request4 request5 request6 request7 re
         |> map2 (|>) request9
 
 
-{-| -}
+{-| Ignore any recoverable error data and propagate the `FatalError`. Similar to a `Cmd` in The Elm Architecture,
+a `FatalError` will not do anything except if it is returned at the top-level of your application. Read more
+in the [`FatalError` docs](FatalError).
+-}
 allowFatal : BackendTask { error | fatal : FatalError } data -> BackendTask FatalError data
 allowFatal backendTask =
     mapError .fatal backendTask

package/src/FormData.elm

@@ -1,4 +1,4 @@
-module FormData exposing (encode, parse)
+module FormData exposing (encode, parse, parseToList)
 
 import Dict exposing (Dict)
 import List.NonEmpty exposing (NonEmpty)
@@ -34,6 +34,26 @@ parse rawString =
             Dict.empty
 
 
+parseToList : String -> List ( String, String )
+parseToList rawString =
+    rawString
+        |> String.split "&"
+        |> List.concatMap
+            (\entry ->
+                case entry |> String.split "=" of
+                    [ key, value ] ->
+                        let
+                            newValue : String
+                            newValue =
+                                value |> decode
+                        in
+                        [ ( key, newValue ) ]
+
+                    _ ->
+                        []
+            )
+
+
 decode : String -> String
 decode string =
     string

package/src/Head/Seo.elm

@@ -1,13 +1,13 @@
 module Head.Seo exposing (Common, Image, article, audioPlayer, book, profile, song, summary, summaryLarge, videoPlayer, website)
 
-{-| <https://ogp.me/#>
-<https://developers.facebook.com/docs/sharing/opengraph>
+{-| <https://developers.facebook.com/docs/sharing/opengraph>
 
 This module encapsulates some of the best practices for SEO for your site.
 
-`elm-pages` will pre-render each of the static pages (in your `content` directory) so that
+`elm-pages` pre-renders the HTML for your pages (either at build-time or server-render time) so that
 web crawlers can efficiently and accurately process it. The functions in this module are for use
-with the `head` function that you pass to your Pages config (`Pages.application`).
+with the `head` function in your `Route` modules to help you build up a set of `<meta>` tags that
+includes common meta tags used for rich link previews, namely [OpenGraph tags](https://ogp.me/) and [Twitter card tags](https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/abouts-cards).
 
     import Date
     import Head

package/src/Internal/Request.elm

@@ -1,7 +1,87 @@
-module Internal.Request exposing (Parser(..))
+module Internal.Request exposing (Request(..), RequestRecord, fakeRequest, toRequest)
 
-import Json.Decode
+import CookieParser
+import Dict exposing (Dict)
+import Json.Decode as Decode
+import Time
 
 
-type Parser decodesTo validationError
-    = Parser (Json.Decode.Decoder ( Result validationError decodesTo, List validationError ))
+type Request
+    = Request RequestRecord
+
+
+type alias RequestRecord =
+    { time : Time.Posix
+    , method : String
+    , body : Maybe String
+    , rawUrl : String
+    , rawHeaders : Dict String String
+    , cookies : Dict String String
+    }
+
+
+toRequest : Decode.Value -> Request
+toRequest value =
+    Decode.decodeValue requestDecoder value
+        |> Result.map Request
+        |> Result.withDefault fakeRequest
+
+
+fakeRequest : Request
+fakeRequest =
+    Request
+        { time = Time.millisToPosix 0
+        , method = "ERROR"
+        , body = Just "ERROR"
+        , rawUrl = "ERROR"
+        , rawHeaders = Dict.empty
+        , cookies = Dict.empty
+        }
+
+
+requestDecoder : Decode.Decoder RequestRecord
+requestDecoder =
+    Decode.succeed RequestRecord
+        |> andMap
+            (Decode.field "requestTime"
+                (Decode.int |> Decode.map Time.millisToPosix)
+            )
+        |> andMap (Decode.field "method" Decode.string)
+        |> andMap (Decode.field "body" (Decode.nullable Decode.string))
+        |> andMap
+            (Decode.string
+                |> Decode.field "rawUrl"
+            )
+        |> andMap (Decode.field "headers" (Decode.dict Decode.string))
+        |> andMap
+            (Decode.field "headers"
+                (optionalField "cookie" Decode.string
+                    |> Decode.map
+                        (Maybe.map CookieParser.parse
+                            >> Maybe.withDefault Dict.empty
+                        )
+                )
+            )
+
+
+andMap : Decode.Decoder a -> Decode.Decoder (a -> b) -> Decode.Decoder b
+andMap =
+    Decode.map2 (|>)
+
+
+optionalField : String -> Decode.Decoder a -> Decode.Decoder (Maybe a)
+optionalField fieldName decoder_ =
+    let
+        finishDecoding : Decode.Value -> Decode.Decoder (Maybe a)
+        finishDecoding json =
+            case Decode.decodeValue (Decode.field fieldName Decode.value) json of
+                Ok _ ->
+                    -- The field is present, so run the decoder on it.
+                    Decode.map Just (Decode.field fieldName decoder_)
+
+                Err _ ->
+                    -- The field was missing, which is fine!
+                    Decode.succeed Nothing
+    in
+    Decode.value
+        |> Decode.andThen finishDecoding