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

package/README.md

@@ -81,7 +81,7 @@ https://github.com/dillonkearns/elm-pages/projects
 You will see an error if the NPM and Elm package do not have a matching Compatibility Key. Usually it's best to upgrade to the latest version of both the Elm and NPM
 packages when you upgrade. However, in case you want to install versions that are behind the latest, the Compatibility Key is included here for reference.
 
-Current Compatibility Key: 18.
+Current Compatibility Key: 19.
 
 ## Contributors ✨
 

package/codegen/elm-pages-codegen.cjs

@@ -26347,6 +26347,27 @@ var $author$project$Gen$PagesMsg$annotation_ = {
 					])));
 	}
 };
+var $author$project$Gen$Server$Request$moduleName_ = _List_fromArray(
+	['Server', 'Request']);
+var $author$project$Gen$Server$Request$annotation_ = {
+	method: A3(
+		$author$project$Elm$Annotation$namedWith,
+		_List_fromArray(
+			['Server', 'Request']),
+		'Method',
+		_List_Nil),
+	request: A4(
+		$author$project$Elm$Annotation$alias,
+		$author$project$Gen$Server$Request$moduleName_,
+		'Request',
+		_List_Nil,
+		A3(
+			$author$project$Elm$Annotation$namedWith,
+			_List_fromArray(
+				['Internal', 'Request']),
+			'Request',
+			_List_Nil))
+};
 var $author$project$Gen$Server$Response$moduleName_ = _List_fromArray(
 	['Server', 'Response']);
 var $author$project$Gen$Server$Response$annotation_ = {
@@ -33186,32 +33207,35 @@ var $author$project$Gen$ApiRoute$values_ = {
 							'ApiRouteBuilder',
 							_List_fromArray(
 								[
-									A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_fromArray(
-										['Server', 'Request']),
-									'Parser',
+									A2(
+									$author$project$Elm$Annotation$function,
 									_List_fromArray(
 										[
 											A3(
 											$author$project$Elm$Annotation$namedWith,
-											_List_Nil,
-											'BackendTask',
 											_List_fromArray(
-												[
-													A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'FatalError', _List_Nil),
-													A3(
-													$author$project$Elm$Annotation$namedWith,
-													_List_fromArray(
-														['Server', 'Response']),
-													'Response',
-													_List_fromArray(
-														[
-															A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Never', _List_Nil),
-															A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Never', _List_Nil)
-														]))
-												]))
-										])),
+												['Server', 'Request']),
+											'Request',
+											_List_Nil)
+										]),
+									A3(
+										$author$project$Elm$Annotation$namedWith,
+										_List_Nil,
+										'BackendTask',
+										_List_fromArray(
+											[
+												A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'FatalError', _List_Nil),
+												A3(
+												$author$project$Elm$Annotation$namedWith,
+												_List_fromArray(
+													['Server', 'Response']),
+												'Response',
+												_List_fromArray(
+													[
+														A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Never', _List_Nil),
+														A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Never', _List_Nil)
+													]))
+											]))),
 									$author$project$Elm$Annotation$var('constructor')
 								]))
 						]),
@@ -37536,7 +37560,7 @@ var $author$project$GenerateMain$otherFile = F2(
 			'dataForRoute',
 			_Utils_Tuple2(
 				'requestPayload',
-				$elm$core$Maybe$Just($author$project$Gen$Json$Decode$annotation_.value)),
+				$elm$core$Maybe$Just($author$project$Gen$Server$Request$annotation_.request)),
 			_Utils_Tuple2(
 				'maybeRoute',
 				$elm$core$Maybe$Just(
@@ -38019,7 +38043,7 @@ var $author$project$GenerateMain$otherFile = F2(
 			'action',
 			_Utils_Tuple2(
 				'requestPayload',
-				$elm$core$Maybe$Just($author$project$Gen$Json$Decode$annotation_.value)),
+				$elm$core$Maybe$Just($author$project$Gen$Server$Request$annotation_.request)),
 			_Utils_Tuple2(
 				'maybeRoute',
 				$elm$core$Maybe$Just(

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: 386019384, 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: 386019384,
+  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: 4127127384, 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: 4127127384,
+  initialSeed: 2748899408,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/src/RouteBuilder.elm

@@ -98,20 +98,20 @@ import Pages.ConcurrentSubmission
 import Pages.Fetcher
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.RoutePattern exposing (RoutePattern)
-import Pages.PageUrl exposing (PageUrl)
 import Pages.Navigation
+import Pages.PageUrl exposing (PageUrl)
 import PagesMsg exposing (PagesMsg)
-import UrlPath exposing (UrlPath)
 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
@@ -155,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
@@ -362,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/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 18;
+export const compatibilityKey = 19;
 
-export const packageVersion = "3.0.0-beta.41";
+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.41",
+  "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/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/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

package/src/Pages/FormData.elm

@@ -9,7 +9,8 @@ module Pages.FormData exposing (FormData)
 import Form
 
 
-{-| -}
+{-| The payload for form submissions.
+-}
 type alias FormData =
     { fields : List ( String, String )
     , method : Form.Method

package/src/Pages/Internal/Platform/Cli.elm

@@ -17,6 +17,7 @@ import Head exposing (Tag)
 import Html exposing (Html)
 import HtmlPrinter
 import Internal.ApiRoute exposing (ApiRoute(..))
+import Internal.Request
 import Json.Decode as Decode
 import Json.Encode
 import PageServerResponse exposing (PageServerResponse)
@@ -422,7 +423,13 @@ initLegacy site ((RenderRequest.SinglePage includeHtml singleRequest _) as rende
                                         --sendSinglePageProgress site model.allRawResponses config model payload
                                         (case isAction of
                                             Just _ ->
-                                                config.action (RenderRequest.maybeRequestPayload renderRequest |> Maybe.withDefault Json.Encode.null) serverRequestPayload.frontmatter |> BackendTask.map Just
+                                                config.action
+                                                    (RenderRequest.maybeRequestPayload renderRequest
+                                                        |> Maybe.map Internal.Request.toRequest
+                                                        |> Maybe.withDefault Internal.Request.fakeRequest
+                                                    )
+                                                    serverRequestPayload.frontmatter
+                                                    |> BackendTask.map Just
 
                                             Nothing ->
                                                 BackendTask.succeed Nothing
@@ -674,7 +681,13 @@ initLegacy site ((RenderRequest.SinglePage includeHtml singleRequest _) as rende
                                                                     in
                                                                     renderedResult
                                                                 )
-                                                                (config.data (RenderRequest.maybeRequestPayload renderRequest |> Maybe.withDefault Json.Encode.null) serverRequestPayload.frontmatter)
+                                                                (config.data
+                                                                    (RenderRequest.maybeRequestPayload renderRequest
+                                                                        |> Maybe.map Internal.Request.toRequest
+                                                                        |> Maybe.withDefault Internal.Request.fakeRequest
+                                                                    )
+                                                                    serverRequestPayload.frontmatter
+                                                                )
                                                                 config.sharedData
                                                                 globalHeadTags
                                                 )

package/src/Pages/Internal/Platform/CompatibilityKey.elm

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    18
+    19

package/src/Pages/Navigation.elm

@@ -61,9 +61,7 @@ You can also use it to derive Pending UI or Optimistic UI from a pending form su
 
 -}
 
-import Form
 import Pages.FormData exposing (FormData)
-import Time
 import UrlPath exposing (UrlPath)
 
 

package/src/Pages/ProgramConfig.elm

@@ -26,6 +26,7 @@ import Pages.Navigation
 import Pages.PageUrl exposing (PageUrl)
 import Pages.SiteConfig exposing (SiteConfig)
 import PagesMsg exposing (PagesMsg)
+import Server.Request
 import Url exposing (Url)
 import UrlPath exposing (UrlPath)
 
@@ -50,8 +51,8 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
     , update : Form.Model -> Dict String (Pages.ConcurrentSubmission.ConcurrentSubmission actionData) -> Maybe Pages.Navigation.Navigation -> sharedData -> pageData -> Maybe Browser.Navigation.Key -> userMsg -> userModel -> ( userModel, effect )
     , subscriptions : route -> UrlPath -> userModel -> Sub userMsg
     , sharedData : BackendTask FatalError sharedData
-    , data : Decode.Value -> route -> BackendTask FatalError (PageServerResponse pageData errorPage)
-    , action : Decode.Value -> route -> BackendTask FatalError (PageServerResponse actionData errorPage)
+    , data : Server.Request.Request -> route -> BackendTask FatalError (PageServerResponse pageData errorPage)
+    , action : Server.Request.Request -> route -> BackendTask FatalError (PageServerResponse actionData errorPage)
     , onActionData : actionData -> Maybe userMsg
     , view :
         Form.Model