elm-pages 3.0.16 → 3.0.18

package/generator/review/elm.json

@@ -12,7 +12,7 @@
             "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
             "jfmengels/elm-review": "2.14.0",
-            "mdgriffith/elm-codegen": "4.2.2",
+            "mdgriffith/elm-codegen": "5.0.0",
             "stil4m/elm-syntax": "7.3.2",
             "the-sett/elm-syntax-dsl": "6.0.3"
         },

package/generator/template/codegen/elm.codegen.json

@@ -1,5 +1,5 @@
 {
-    "elm-codegen-version": "0.5.1",
+    "elm-codegen-version": "0.6.0",
     "codegen-helpers": {
         "packages": {
             "elm/core": "1.0.5",

package/generator/template/elm-pages.config.mjs

@@ -12,7 +12,7 @@ export default {
   },
   preloadTagForFile(file) {
     // add preload directives for JS assets and font assets, etc., skip for CSS files
-    // this function will be called with each file that is procesed by Vite, including any files in your headTagsTemplate in your config
+    // this function will be called with each file that is processed by Vite, including any files in your headTagsTemplate in your config
     return !file.endsWith(".css");
   },
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -25,49 +25,48 @@
   "author": "Dillon Kearns",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@sindresorhus/merge-streams": "^3.0.0",
+    "@sindresorhus/merge-streams": "^4.0.0",
     "busboy": "^1.6.0",
-    "chokidar": "^3.5.3",
-    "cli-cursor": "^4.0.0",
-    "commander": "^11.1.0",
+    "chokidar": "^4.0.1",
+    "cli-cursor": "^5.0.0",
+    "commander": "^12.1.0",
     "connect": "^3.7.0",
-    "cookie-signature": "^1.2.1",
-    "cross-spawn": "7.0.3",
+    "cookie-signature": "^1.2.2",
+    "cross-spawn": "7.0.6",
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.19.11",
+    "esbuild": "^0.24.0",
     "fs-extra": "^11.2.0",
-    "globby": "14.0.0",
+    "globby": "14.0.2",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
-    "make-fetch-happen": "^13.0.0",
-    "memfs": "^4.6.0",
-    "micromatch": "^4.0.5",
-    "serve-static": "^1.15.0",
-    "terser": "^5.26.0",
-    "vite": "^5.0.11",
-    "which": "^4.0.0"
+    "make-fetch-happen": "^14.0.3",
+    "memfs": "^4.14.0",
+    "micromatch": "^4.0.8",
+    "serve-static": "^1.16.2",
+    "terser": "^5.36.0",
+    "which": "^5.0.0"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
     "@types/make-fetch-happen": "^10.0.4",
-    "@types/micromatch": "^4.0.6",
-    "@types/node": "^20.10.7",
-    "@types/serve-static": "^1.15.5",
-    "cypress": "^13.6.2",
-    "elm-codegen": "^0.5.0",
+    "@types/micromatch": "^4.0.9",
+    "@types/node": "^22.10.0",
+    "@types/serve-static": "^1.15.7",
+    "cypress": "^13.16.0",
+    "elm-codegen": "^0.6.1",
     "elm-optimize-level-2": "^0.3.5",
     "elm-review": "^2.12.0",
     "elm-test": "^0.19.1-revision12",
-    "elm-tooling": "^1.15.0",
-    "elm-verify-examples": "^5.3.0",
-    "lamdera": "^0.19.1-1.2.1-1",
-    "typescript": "^5.3.3",
-    "vite": "^5.0.11",
-    "vitest": "^1.1.3"
+    "elm-tooling": "^1.15.1",
+    "elm-verify-examples": "^6.0.3",
+    "lamdera": "^0.19.1-1.3.2",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.0",
+    "vitest": "^2.1.6"
   },
   "files": [
     "adapter/",

package/src/ApiRoute.elm

@@ -189,7 +189,7 @@ You define your ApiRoute's in `app/Api.elm`. Here's a simple example:
 import BackendTask exposing (BackendTask)
 import FatalError exposing (FatalError)
 import Head
-import Internal.ApiRoute exposing (ApiRoute(..), ApiRouteBuilder(..))
+import Internal.ApiRoute
 import Internal.Request
 import Json.Encode
 import Pattern
@@ -214,8 +214,8 @@ single handler =
 
 {-| -}
 serverRender : ApiRouteBuilder (Server.Request.Request -> BackendTask FatalError (Server.Response.Response Never Never)) constructor -> ApiRoute Response
-serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
-    ApiRoute
+serverRender ((Internal.ApiRoute.ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
+    Internal.ApiRoute.ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
         , matchesToResponse =
             \serverRequest path ->
@@ -246,14 +246,14 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
 
 {-| -}
 preRenderWithFallback : (constructor -> BackendTask FatalError (List (List String))) -> ApiRouteBuilder (BackendTask FatalError (Server.Response.Response Never Never)) constructor -> ApiRoute Response
-preRenderWithFallback buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
+preRenderWithFallback buildUrls ((Internal.ApiRoute.ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
     let
         buildTimeRoutes__ : BackendTask FatalError (List String)
         buildTimeRoutes__ =
             buildUrls (constructor [])
                 |> BackendTask.map (List.map toString)
     in
-    ApiRoute
+    Internal.ApiRoute.ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
         , matchesToResponse =
             \_ path ->
@@ -335,7 +335,7 @@ Note: `dist` is the output folder for `elm-pages build`, so this will be accessi
 
 -}
 preRender : (constructor -> BackendTask FatalError (List (List String))) -> ApiRouteBuilder (BackendTask FatalError String) constructor -> ApiRoute Response
-preRender buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
+preRender buildUrls ((Internal.ApiRoute.ApiRouteBuilder patterns pattern _ toString constructor) as fullHandler) =
     let
         buildTimeRoutes__ : BackendTask FatalError (List String)
         buildTimeRoutes__ =
@@ -346,7 +346,7 @@ preRender buildUrls ((ApiRouteBuilder patterns pattern _ toString constructor) a
         preBuiltMatches =
             buildUrls (constructor [])
     in
-    ApiRoute
+    Internal.ApiRoute.ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
         , matchesToResponse =
             \_ path ->
@@ -403,13 +403,13 @@ type alias Response =
 -}
 succeed : a -> ApiRouteBuilder a (List String)
 succeed a =
-    ApiRouteBuilder Pattern.empty "" (\_ -> a) (\_ -> "") (\list -> list)
+    Internal.ApiRoute.ApiRouteBuilder Pattern.empty "" (\_ -> a) (\_ -> "") (\list -> list)
 
 
 {-| Turn the route into a pattern in JSON format. For internal uses.
 -}
 toJson : ApiRoute response -> Json.Encode.Value
-toJson ((ApiRoute { kind }) as apiRoute) =
+toJson ((Internal.ApiRoute.ApiRoute { kind }) as apiRoute) =
     Json.Encode.object
         [ ( "pathPattern", apiRoute |> Internal.ApiRoute.toPattern |> Pattern.toJson )
         , ( "kind", Json.Encode.string kind )
@@ -419,8 +419,8 @@ toJson ((ApiRoute { kind }) as apiRoute) =
 {-| A literal String segment of a route.
 -}
 literal : String -> ApiRouteBuilder a constructor -> ApiRouteBuilder a constructor
-literal segment (ApiRouteBuilder patterns pattern handler toString constructor) =
-    ApiRouteBuilder
+literal segment (Internal.ApiRoute.ApiRouteBuilder patterns pattern handler toString constructor) =
+    Internal.ApiRoute.ApiRouteBuilder
         (Pattern.addLiteral segment patterns)
         (pattern ++ segment)
         handler
@@ -431,8 +431,8 @@ literal segment (ApiRouteBuilder patterns pattern handler toString constructor)
 {-| A path separator within the route.
 -}
 slash : ApiRouteBuilder a constructor -> ApiRouteBuilder a constructor
-slash (ApiRouteBuilder patterns pattern handler toString constructor) =
-    ApiRouteBuilder (patterns |> Pattern.addSlash) (pattern ++ "/") handler (\arg -> toString arg ++ "/") constructor
+slash (Internal.ApiRoute.ApiRouteBuilder patterns pattern handler toString constructor) =
+    Internal.ApiRoute.ApiRouteBuilder (patterns |> Pattern.addSlash) (pattern ++ "/") handler (\arg -> toString arg ++ "/") constructor
 
 
 {-| Captures a dynamic segment from the route.
@@ -440,8 +440,8 @@ slash (ApiRouteBuilder patterns pattern handler toString constructor) =
 capture :
     ApiRouteBuilder (String -> a) constructor
     -> ApiRouteBuilder a (String -> constructor)
-capture (ApiRouteBuilder patterns pattern previousHandler toString constructor) =
-    ApiRouteBuilder
+capture (Internal.ApiRoute.ApiRouteBuilder patterns pattern previousHandler toString constructor) =
+    Internal.ApiRoute.ApiRouteBuilder
         (patterns |> Pattern.addCapture)
         (pattern ++ "(.*)")
         (\matches ->
@@ -469,19 +469,19 @@ capture (ApiRouteBuilder patterns pattern previousHandler toString constructor)
 {-| For internal use by generated code. Not so useful in user-land.
 -}
 getBuildTimeRoutes : ApiRoute response -> BackendTask FatalError (List String)
-getBuildTimeRoutes (ApiRoute handler) =
+getBuildTimeRoutes (Internal.ApiRoute.ApiRoute handler) =
     handler.buildTimeRoutes
 
 
 {-| Include head tags on every page's HTML.
 -}
 withGlobalHeadTags : BackendTask FatalError (List Head.Tag) -> ApiRoute response -> ApiRoute response
-withGlobalHeadTags globalHeadTags (ApiRoute handler) =
-    ApiRoute { handler | globalHeadTags = Just globalHeadTags }
+withGlobalHeadTags globalHeadTags (Internal.ApiRoute.ApiRoute handler) =
+    Internal.ApiRoute.ApiRoute { handler | globalHeadTags = Just globalHeadTags }
 
 
 {-| For internal use.
 -}
 getGlobalHeadTagsBackendTask : ApiRoute response -> Maybe (BackendTask FatalError (List Head.Tag))
-getGlobalHeadTagsBackendTask (ApiRoute handler) =
+getGlobalHeadTagsBackendTask (Internal.ApiRoute.ApiRoute handler) =
     handler.globalHeadTags

package/src/Scaffold/Form.elm

@@ -28,6 +28,7 @@ with the wiring form a `Form`.
 import Cli.Option
 import Elm
 import Elm.Annotation as Type
+import Elm.Arg
 import Elm.Declare
 import Elm.Op
 import List.Extra
@@ -55,113 +56,111 @@ type alias Context =
     }
 
 
-formWithFields : Bool -> List ( String, Kind ) -> ({ formState : { errors : Elm.Expression, submitting : Elm.Expression, submitAttempted : Elm.Expression, data : Elm.Expression, expression : Elm.Expression }, params : List { name : String, kind : Kind, param : Elm.Expression } } -> Elm.Expression) -> { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
+formWithFields : Bool -> List ( String, Kind ) -> ({ formState : { errors : Elm.Expression, submitting : Elm.Expression, submitAttempted : Elm.Expression, data : Elm.Expression, expression : Elm.Expression }, params : List { name : String, kind : Kind, param : Elm.Expression } } -> Elm.Expression) -> Elm.Declare.Value
 formWithFields elmCssView fields viewFn =
-    Elm.Declare.function "form"
-        []
-        (\_ ->
-            fields
-                |> List.foldl
-                    (\( fieldName, kind ) chain ->
-                        chain
-                            |> Elm.Op.pipe
-                                (formField fieldName
-                                    (case kind of
-                                        FieldText ->
-                                            formFieldText
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-
-                                        FieldInt ->
-                                            formFieldInt { invalid = \_ -> Elm.string "" }
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-
-                                        FieldTextarea ->
-                                            formFieldText
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-                                                |> Elm.Op.pipe
-                                                    (formFieldTextarea
-                                                        { rows = Elm.nothing
-                                                        , cols = Elm.nothing
-                                                        }
-                                                    )
-
-                                        FieldFloat ->
-                                            formFieldFloat { invalid = \_ -> Elm.string "" }
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-
-                                        FieldTime ->
-                                            formFieldTime { invalid = \_ -> Elm.string "" }
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-
-                                        FieldDate ->
-                                            formFieldDate { invalid = \_ -> Elm.string "" }
-                                                |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
-
-                                        FieldCheckbox ->
-                                            formFieldCheckbox
-                                    )
-                                )
-                    )
-                    (Elm.function (List.map fieldToParam fields)
-                        (\params ->
-                            Elm.record
-                                [ ( "combine"
-                                  , params
-                                        |> List.foldl
-                                            (\fieldExpression chain ->
-                                                chain
-                                                    |> Elm.Op.pipe (validationAndMap fieldExpression)
-                                            )
-                                            (Elm.val "ParsedForm"
-                                                |> Elm.Op.pipe validationSucceed
-                                            )
-                                  )
-                                , ( "view"
-                                  , Elm.fn ( "formState", Nothing )
-                                        (\formState ->
-                                            let
-                                                mappedParams : List { name : String, kind : Kind, param : Elm.Expression }
-                                                mappedParams =
-                                                    params
-                                                        |> List.Extra.zip fields
-                                                        |> List.map
-                                                            (\( ( name, kind ), param ) ->
-                                                                { name = name
-                                                                , kind = kind
-                                                                , param = param
-                                                                }
-                                                            )
-                                            in
-                                            viewFn
-                                                { formState =
-                                                    { errors = formState |> Elm.get "errors"
-                                                    , submitting = formState |> Elm.get "submitting"
-                                                    , submitAttempted = formState |> Elm.get "submitAttempted"
-                                                    , data = formState |> Elm.get "data"
-                                                    , expression = formState
+    Elm.Declare.value "form"
+        (fields
+            |> List.foldl
+                (\( fieldName, kind ) chain ->
+                    chain
+                        |> Elm.Op.pipe
+                            (formField fieldName
+                                (case kind of
+                                    FieldText ->
+                                        formFieldText
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+
+                                    FieldInt ->
+                                        formFieldInt { invalid = \_ -> Elm.string "" }
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+
+                                    FieldTextarea ->
+                                        formFieldText
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+                                            |> Elm.Op.pipe
+                                                (formFieldTextarea
+                                                    { rows = Elm.nothing
+                                                    , cols = Elm.nothing
                                                     }
-                                                , params = mappedParams
-                                                }
+                                                )
+
+                                    FieldFloat ->
+                                        formFieldFloat { invalid = \_ -> Elm.string "" }
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+
+                                    FieldTime ->
+                                        formFieldTime { invalid = \_ -> Elm.string "" }
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+
+                                    FieldDate ->
+                                        formFieldDate { invalid = \_ -> Elm.string "" }
+                                            |> Elm.Op.pipe (formFieldRequired (Elm.string "Required"))
+
+                                    FieldCheckbox ->
+                                        formFieldCheckbox
+                                )
+                            )
+                )
+                (Elm.function (List.map fieldToParam fields)
+                    (\params ->
+                        Elm.record
+                            [ ( "combine"
+                              , params
+                                    |> List.foldl
+                                        (\fieldExpression chain ->
+                                            chain
+                                                |> Elm.Op.pipe (validationAndMap fieldExpression)
                                         )
-                                  )
-                                ]
-                        )
-                        |> Elm.Op.pipe formInit
+                                        (Elm.val "ParsedForm"
+                                            |> Elm.Op.pipe validationSucceed
+                                        )
+                              )
+                            , ( "view"
+                              , Elm.fn (Elm.Arg.var "formState")
+                                    (\formState ->
+                                        let
+                                            mappedParams : List { name : String, kind : Kind, param : Elm.Expression }
+                                            mappedParams =
+                                                params
+                                                    |> List.Extra.zip fields
+                                                    |> List.map
+                                                        (\( ( name, kind ), param ) ->
+                                                            { name = name
+                                                            , kind = kind
+                                                            , param = param
+                                                            }
+                                                        )
+                                        in
+                                        viewFn
+                                            { formState =
+                                                { errors = formState |> Elm.get "errors"
+                                                , submitting = formState |> Elm.get "submitting"
+                                                , submitAttempted = formState |> Elm.get "submitAttempted"
+                                                , data = formState |> Elm.get "data"
+                                                , expression = formState
+                                                }
+                                            , params = mappedParams
+                                            }
+                                    )
+                              )
+                            ]
                     )
-                |> Elm.withType
-                    (Type.namedWith [ "Form" ]
-                        (if elmCssView then
-                            "StyledHtmlForm"
+                    |> Elm.Op.pipe formInit
+                )
+            |> Elm.withType
+                (Type.namedWith [ "Form" ]
+                    (if elmCssView then
+                        "StyledHtmlForm"
 
-                         else
-                            "HtmlForm"
-                        )
-                        [ Type.string
-                        , Type.named [] "ParsedForm"
-                        , Type.var "input"
-                        , Type.namedWith [ "PagesMsg" ] "PagesMsg" [ Type.named [] "Msg" ]
-                        ]
+                     else
+                        "HtmlForm"
                     )
+                    [ Type.string
+                    , Type.named [] "ParsedForm"
+                    , Type.var "input"
+                    , Type.namedWith [ "PagesMsg" ] "PagesMsg" [ Type.named [] "Msg" ]
+                    ]
+                )
         )
 
 
@@ -246,29 +245,27 @@ provide { fields, view, elmCssView } =
 
     else
         let
-            form : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
+            form : Elm.Declare.Value
             form =
                 formWithFields elmCssView fields view
 
-            formHandlersDeclaration : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
+            formHandlersDeclaration : Elm.Declare.Value
             formHandlersDeclaration =
                 -- TODO customizable formHandlers name?
-                Elm.Declare.function "formHandlers"
-                    []
-                    (\_ ->
-                        initCombined (Elm.val "Action") (form.call [])
-                            |> Elm.withType
-                                (Type.namedWith [ "Form", "Handler" ]
-                                    "Handler"
-                                    [ Type.string
-                                    , Type.named [] "Action"
-                                    ]
-                                )
+                Elm.Declare.value "formHandlers"
+                    (initCombined (Elm.val "Action") form.value
+                        |> Elm.withType
+                            (Type.namedWith [ "Form", "Handler" ]
+                                "Handler"
+                                [ Type.string
+                                , Type.named [] "Action"
+                                ]
+                            )
                     )
         in
         Just
-            { formHandlers = formHandlersDeclaration.call []
-            , form = form.call []
+            { formHandlers = formHandlersDeclaration.value
+            , form = form.value
             , declarations =
                 [ formWithFields elmCssView fields view |> .declaration
                 , Elm.customType "Action"