elm-pages 3.0.0-beta.23 → 3.0.0-beta.25

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: 8.
+Current Compatibility Key: 9.
 
 ## Contributors ✨
 

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 8;
+export const compatibilityKey = 9;
 
-export const packageVersion = "3.0.0-beta.23";
+export const packageVersion = "3.0.0-beta.25";

package/generator/src/dev-server.js

@@ -265,6 +265,11 @@ export async function start(options) {
   watcher.on("all", async function (eventName, pathThatChanged) {
     if (pathThatChanged === "elm.json") {
       watchElmSourceDirs(false);
+    } else if (
+      pathThatChanged.startsWith("app/Route") &&
+      !pathThatChanged.endsWith(".elm")
+    ) {
+      // this happens when a folder is created in app/Route. Ignore this case.
     } else if (pathThatChanged.endsWith(".elm")) {
       invalidatePool();
       if (elmMakeRunning) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.23",
+  "version": "3.0.0-beta.25",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -34,18 +34,18 @@
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.17.5",
+    "esbuild": "^0.17.8",
     "fs-extra": "^11.1.0",
     "globby": "^13.1.3",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
-    "make-fetch-happen": "^11.0.2",
+    "make-fetch-happen": "^11.0.3",
     "memfs": "^3.4.7",
     "micromatch": "^4.0.5",
     "serve-static": "^1.15.0",
-    "terser": "^5.16.1",
-    "vite": "^4.0.4",
+    "terser": "^5.16.3",
+    "vite": "^4.1.1",
     "which": "^3.0.0"
   },
   "devDependencies": {
@@ -55,16 +55,16 @@
     "@types/micromatch": "^4.0.2",
     "@types/node": "^18.11.9",
     "@types/serve-static": "^1.15.0",
-    "cypress": "^12.4.0",
+    "cypress": "^12.5.1",
     "elm-codegen": "^0.2.0",
     "elm-optimize-level-2": "^0.3.5",
     "elm-review": "^2.8.2",
     "elm-test": "^0.19.1-revision11",
-    "elm-tooling": "^1.11.0",
+    "elm-tooling": "^1.12.0",
     "elm-verify-examples": "^5.2.0",
     "elmi-to-json": "^1.2.0",
     "mocha": "^10.2.0",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.5"
   },
   "files": [
     "generator/src/",

package/src/BackendTask/Custom.elm

@@ -110,123 +110,130 @@ run portName input decoder =
                 ]
                 |> BackendTask.Http.jsonBody
         , expect =
-            Decode.oneOf
-                [ Decode.field "elm-pages-internal-error" Decode.string
-                    |> Decode.andThen
-                        (\errorKind ->
-                            if errorKind == "CustomBackendTaskNotDefined" then
-                                FatalError.recoverable
-                                    { title = "Custom BackendTask Error"
-                                    , body =
-                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I expected to find a port named `"
-                                        , TerminalText.yellow portName
-                                        , TerminalText.text "` but I couldn't find it. Is the function exported in your custom-backend-task file?"
-                                        ]
-                                            |> TerminalText.toString
-                                    }
-                                    (CustomBackendTaskNotDefined { name = portName })
-                                    |> Decode.succeed
-
-                            else if errorKind == "ExportIsNotFunction" then
-                                Decode.field "error" Decode.string
-                                    |> Decode.maybe
-                                    |> Decode.map (Maybe.withDefault "")
-                                    |> Decode.map
-                                        (\incorrectType ->
-                                            FatalError.recoverable
-                                                { title = "Custom BackendTask Error"
-                                                , body =
-                                                    [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I found an export called `"
-                                                    , TerminalText.yellow portName
-                                                    , TerminalText.text "` but I expected its type to be function, but instead its type was: "
-                                                    , TerminalText.red incorrectType
-                                                    ]
-                                                        |> TerminalText.toString
-                                                }
-                                                ExportIsNotFunction
-                                        )
-
-                            else if errorKind == "MissingCustomBackendTaskFile" then
-                                FatalError.recoverable
-                                    { title = "Custom BackendTask Error"
-                                    , body =
-                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I couldn't find your custom-backend-task file. Be sure to create a 'custom-backend-task.ts' or 'custom-backend-task.js' file."
-                                        ]
-                                            |> TerminalText.toString
-                                    }
-                                    MissingCustomBackendTaskFile
-                                    |> Decode.succeed
-
-                            else if errorKind == "ErrorInCustomBackendTaskFile" then
-                                Decode.field "error" Decode.string
-                                    |> Decode.maybe
-                                    |> Decode.map (Maybe.withDefault "")
-                                    |> Decode.map
-                                        (\errorMessage ->
-                                            FatalError.recoverable
-                                                { title = "Custom BackendTask Error"
-                                                , body =
-                                                    [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I couldn't import the port definitions file, because of this exception:\n\n"
-                                                    , TerminalText.red errorMessage
-                                                    , TerminalText.text "\n\nAre there syntax errors or exceptions thrown during import?"
-                                                    ]
-                                                        |> TerminalText.toString
-                                                }
-                                                ErrorInCustomBackendTaskFile
-                                        )
-
-                            else if errorKind == "CustomBackendTaskException" then
-                                Decode.field "error" Decode.value
-                                    |> Decode.maybe
-                                    |> Decode.map (Maybe.withDefault Encode.null)
-                                    |> Decode.map
-                                        (\portCallError ->
+            Decode.field "elm-pages-internal-error" Decode.string
+                |> Decode.maybe
+                |> Decode.andThen
+                    (\maybeInternalErrorCode ->
+                        case maybeInternalErrorCode of
+                            Just errorKind ->
+                                --Decode.field "elm-pages-internal-error" Decode.string
+                                --    |> Decode.andThen
+                                (--\errorKind ->
+                                 if errorKind == "CustomBackendTaskNotDefined" then
+                                    FatalError.recoverable
+                                        { title = "Custom BackendTask Error"
+                                        , body =
+                                            [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I expected to find a port named `"
+                                            , TerminalText.yellow portName
+                                            , TerminalText.text "` but I couldn't find it. Is the function exported in your custom-backend-task file?"
+                                            ]
+                                                |> TerminalText.toString
+                                        }
+                                        (CustomBackendTaskNotDefined { name = portName })
+                                        |> Decode.succeed
+
+                                 else if errorKind == "ExportIsNotFunction" then
+                                    Decode.field "error" Decode.string
+                                        |> Decode.maybe
+                                        |> Decode.map (Maybe.withDefault "")
+                                        |> Decode.map
+                                            (\incorrectType ->
+                                                FatalError.recoverable
+                                                    { title = "Custom BackendTask Error"
+                                                    , body =
+                                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I found an export called `"
+                                                        , TerminalText.yellow portName
+                                                        , TerminalText.text "` but I expected its type to be function, but instead its type was: "
+                                                        , TerminalText.red incorrectType
+                                                        ]
+                                                            |> TerminalText.toString
+                                                    }
+                                                    ExportIsNotFunction
+                                            )
+
+                                 else if errorKind == "MissingCustomBackendTaskFile" then
+                                    FatalError.recoverable
+                                        { title = "Custom BackendTask Error"
+                                        , body =
+                                            [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I couldn't find your custom-backend-task file. Be sure to create a 'custom-backend-task.ts' or 'custom-backend-task.js' file."
+                                            ]
+                                                |> TerminalText.toString
+                                        }
+                                        MissingCustomBackendTaskFile
+                                        |> Decode.succeed
+
+                                 else if errorKind == "ErrorInCustomBackendTaskFile" then
+                                    Decode.field "error" Decode.string
+                                        |> Decode.maybe
+                                        |> Decode.map (Maybe.withDefault "")
+                                        |> Decode.map
+                                            (\errorMessage ->
+                                                FatalError.recoverable
+                                                    { title = "Custom BackendTask Error"
+                                                    , body =
+                                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I couldn't import the port definitions file, because of this exception:\n\n"
+                                                        , TerminalText.red errorMessage
+                                                        , TerminalText.text "\n\nAre there syntax errors or exceptions thrown during import?"
+                                                        ]
+                                                            |> TerminalText.toString
+                                                    }
+                                                    ErrorInCustomBackendTaskFile
+                                            )
+
+                                 else if errorKind == "CustomBackendTaskException" then
+                                    Decode.field "error" Decode.value
+                                        |> Decode.maybe
+                                        |> Decode.map (Maybe.withDefault Encode.null)
+                                        |> Decode.map
+                                            (\portCallError ->
+                                                FatalError.recoverable
+                                                    { title = "Custom BackendTask Error"
+                                                    , body =
+                                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I was able to import the port definitions file, but when running it I encountered this exception:\n\n"
+                                                        , TerminalText.red (Encode.encode 2 portCallError)
+                                                        , TerminalText.text "\n\nYou could add a `try`/`catch` in your `custom-backend-task` JavaScript code to handle that error."
+                                                        ]
+                                                            |> TerminalText.toString
+                                                    }
+                                                    (CustomBackendTaskException portCallError)
+                                            )
+
+                                 else if errorKind == "NonJsonException" then
+                                    Decode.map2
+                                        (\exceptionMessage stackTrace ->
                                             FatalError.recoverable
                                                 { title = "Custom BackendTask Error"
                                                 , body =
                                                     [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I was able to import the port definitions file, but when running it I encountered this exception:\n\n"
-                                                    , TerminalText.red (Encode.encode 2 portCallError)
+                                                    , TerminalText.red exceptionMessage
+                                                    , TerminalText.text ("\n\n" ++ (stackTrace |> Maybe.withDefault "\n"))
                                                     , TerminalText.text "\n\nYou could add a `try`/`catch` in your `custom-backend-task` JavaScript code to handle that error."
                                                     ]
                                                         |> TerminalText.toString
                                                 }
-                                                (CustomBackendTaskException portCallError)
+                                                (NonJsonException exceptionMessage)
                                         )
-
-                            else if errorKind == "NonJsonException" then
-                                Decode.map2
-                                    (\exceptionMessage stackTrace ->
-                                        FatalError.recoverable
-                                            { title = "Custom BackendTask Error"
-                                            , body =
-                                                [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I was able to import the port definitions file, but when running it I encountered this exception:\n\n"
-                                                , TerminalText.red exceptionMessage
-                                                , TerminalText.text ("\n\n" ++ (stackTrace |> Maybe.withDefault "\n"))
-                                                , TerminalText.text "\n\nYou could add a `try`/`catch` in your `custom-backend-task` JavaScript code to handle that error."
-                                                ]
-                                                    |> TerminalText.toString
-                                            }
-                                            (NonJsonException exceptionMessage)
-                                    )
-                                    (Decode.field "error" Decode.string)
-                                    (Decode.field "stack" (Decode.nullable Decode.string))
-
-                            else
-                                FatalError.recoverable
-                                    { title = "Custom BackendTask Error"
-                                    , body =
-                                        [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I expected to find a port named `"
-                                        , TerminalText.yellow portName
-                                        , TerminalText.text "`."
-                                        ]
-                                            |> TerminalText.toString
-                                    }
-                                    ErrorInCustomBackendTaskFile
-                                    |> Decode.succeed
-                        )
-                    |> Decode.map Err
-                , decoder |> Decode.map Ok
-                ]
+                                        (Decode.field "error" Decode.string)
+                                        (Decode.field "stack" (Decode.nullable Decode.string))
+
+                                 else
+                                    FatalError.recoverable
+                                        { title = "Custom BackendTask Error"
+                                        , body =
+                                            [ TerminalText.text "Something went wrong in a call to BackendTask.Custom.run. I expected to find a port named `"
+                                            , TerminalText.yellow portName
+                                            , TerminalText.text "`."
+                                            ]
+                                                |> TerminalText.toString
+                                        }
+                                        ErrorInCustomBackendTaskFile
+                                        |> Decode.succeed
+                                )
+                                    |> Decode.map Err
+
+                            Nothing ->
+                                decoder |> Decode.map Ok
+                    )
                 |> BackendTask.Http.expectJson
         }
         |> BackendTask.andThen BackendTask.fromResult

package/src/Form/FieldView.elm

@@ -1,16 +1,16 @@
 module Form.FieldView exposing
-    ( Input(..), InputType(..), Options(..), input, inputTypeToString, radio, toHtmlProperties, Hidden(..), select
-    , radioStyled, inputStyled
+    ( Input(..), InputType(..), Options(..), input, inputTypeToString, radio, toHtmlProperties, Hidden(..), select, valueButton
+    , radioStyled, inputStyled, valueButtonStyled
     )
 
 {-|
 
-@docs Input, InputType, Options, input, inputTypeToString, radio, toHtmlProperties, Hidden, select
+@docs Input, InputType, Options, input, inputTypeToString, radio, toHtmlProperties, Hidden, select, valueButton
 
 
 ## Html.Styled Helpers
 
-@docs radioStyled, inputStyled
+@docs radioStyled, inputStyled, valueButtonStyled
 
 -}
 
@@ -103,6 +103,90 @@ type Options a
     = Options (String -> Maybe a) (List String)
 
 
+{-| Gives you a submit button that will submit the form with a specific value for the given Field.
+-}
+valueButton :
+    String
+    -> List (Html.Attribute msg)
+    -> List (Html msg)
+    -> Form.Validation.Field error parsed Input
+    -> Html msg
+valueButton exactValue attrs children (Validation viewField fieldName _) =
+    let
+        justViewField : ViewField Input
+        justViewField =
+            expectViewField viewField
+
+        rawField : { name : String, value : Maybe String, kind : ( Input, List ( String, Encode.Value ) ) }
+        rawField =
+            { name = fieldName |> Maybe.withDefault ""
+            , value = Just exactValue --justViewField.value
+            , kind = justViewField.kind
+            }
+    in
+    case rawField.kind of
+        ( Input inputType, properties ) ->
+            Html.button
+                (attrs
+                    ++ toHtmlProperties properties
+                    ++ [ (case inputType of
+                            Checkbox ->
+                                Attr.checked ((rawField.value |> Maybe.withDefault "") == "on")
+
+                            _ ->
+                                Attr.value (rawField.value |> Maybe.withDefault "")
+                          -- TODO is this an okay default?
+                         )
+                       , Attr.name rawField.name
+                       , inputType |> inputTypeToString |> Attr.type_
+                       ]
+                )
+                children
+
+
+{-| Gives you a submit button that will submit the form with a specific value for the given Field.
+-}
+valueButtonStyled :
+    String
+    -> List (Html.Styled.Attribute msg)
+    -> List (Html.Styled.Html msg)
+    -> Form.Validation.Field error parsed Input
+    -> Html.Styled.Html msg
+valueButtonStyled exactValue attrs children (Validation viewField fieldName _) =
+    let
+        justViewField : ViewField Input
+        justViewField =
+            expectViewField viewField
+
+        rawField : { name : String, value : Maybe String, kind : ( Input, List ( String, Encode.Value ) ) }
+        rawField =
+            { name = fieldName |> Maybe.withDefault ""
+            , value = Just exactValue
+            , kind = justViewField.kind
+            }
+    in
+    case rawField.kind of
+        ( Input inputType, properties ) ->
+            Html.Styled.button
+                (attrs
+                    ++ (toHtmlProperties properties |> List.map StyledAttr.fromUnstyled)
+                    ++ ([ (case inputType of
+                            Checkbox ->
+                                Attr.checked ((rawField.value |> Maybe.withDefault "") == "on")
+
+                            _ ->
+                                Attr.value (rawField.value |> Maybe.withDefault "")
+                           -- TODO is this an okay default?
+                          )
+                        , Attr.name rawField.name
+                        , inputType |> inputTypeToString |> Attr.type_
+                        ]
+                            |> List.map StyledAttr.fromUnstyled
+                       )
+                )
+                children
+
+
 {-| -}
 input :
     List (Html.Attribute msg)
@@ -131,11 +215,12 @@ input attrs (Validation viewField fieldName _) =
                         ]
                             |> List.filterMap identity
                        )
-                    ++ [ Attr.value (rawField.value |> Maybe.withDefault "")
-                       , Attr.name rawField.name
+                    ++ [ Attr.name rawField.name
                        ]
                 )
-                []
+                [ -- textarea does not support the `value` attribute, but instead uses inner text for its form value
+                  Html.text (rawField.value |> Maybe.withDefault "")
+                ]
 
         ( Input inputType, properties ) ->
             Html.input
@@ -184,13 +269,14 @@ inputStyled attrs (Validation viewField fieldName _) =
                         ]
                             |> List.filterMap identity
                        )
-                    ++ ([ Attr.value (rawField.value |> Maybe.withDefault "")
-                        , Attr.name rawField.name
+                    ++ ([ Attr.name rawField.name
                         ]
                             |> List.map StyledAttr.fromUnstyled
                        )
                 )
-                []
+                [ -- textarea does not support the `value` attribute, but instead uses inner text for its form value
+                  Html.Styled.text (rawField.value |> Maybe.withDefault "")
+                ]
 
         ( Input inputType, properties ) ->
             Html.Styled.input

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

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

package/src/Pages/Internal/Platform.elm

@@ -414,7 +414,7 @@ update config appMsg model =
                         model
 
                 Nothing ->
-                    if model.url.path == url.path then
+                    if model.url.path == url.path && model.url.query == url.query then
                         ( { model
                             | -- update the URL in case query params or fragment changed
                               url = url

package/src/Scaffold/Form.elm

@@ -156,7 +156,7 @@ formWithFields elmCssView fields viewFn =
 
 
 fieldToParam : ( String, Kind ) -> ( String, Maybe Type.Annotation )
-fieldToParam ( name, kind ) =
+fieldToParam ( name, _ ) =
     ( name, Nothing )
 
 
@@ -221,35 +221,35 @@ provide :
             , declarations : List Elm.Declaration
             }
 provide { fields, view, elmCssView } =
-    let
-        form : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
-        form =
-            formWithFields elmCssView fields view
-
-        formHandlersDeclaration :
-            { declaration : Elm.Declaration
-            , call : List Elm.Expression -> Elm.Expression
-            , callFrom : List String -> List Elm.Expression -> Elm.Expression
-            }
-        formHandlersDeclaration =
-            -- TODO customizable formHandlers name?
-            Elm.Declare.function "formHandlers"
-                []
-                (\_ ->
-                    initCombined (Elm.val "Action") (form.call [])
-                        |> Elm.withType
-                            (Type.namedWith [ "Form" ]
-                                "ServerForms"
-                                [ Type.string
-                                , Type.named [] "Action"
-                                ]
-                            )
-                )
-    in
     if List.isEmpty fields then
         Nothing
 
     else
+        let
+            form : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
+            form =
+                formWithFields elmCssView fields view
+
+            formHandlersDeclaration :
+                { declaration : Elm.Declaration
+                , call : List Elm.Expression -> Elm.Expression
+                , callFrom : List String -> List Elm.Expression -> Elm.Expression
+                }
+            formHandlersDeclaration =
+                -- TODO customizable formHandlers name?
+                Elm.Declare.function "formHandlers"
+                    []
+                    (\_ ->
+                        initCombined (Elm.val "Action") (form.call [])
+                            |> Elm.withType
+                                (Type.namedWith [ "Form" ]
+                                    "ServerForms"
+                                    [ Type.string
+                                    , Type.named [] "Action"
+                                    ]
+                                )
+                    )
+        in
         Just
             { formHandlers = formHandlersDeclaration.call []
             , form = form.call []
@@ -455,11 +455,21 @@ formInit initArg =
     Elm.apply
         (Elm.value
             { importFrom = [ "Form" ]
-            , name = "init"
+            , name = "hiddenKind"
             , annotation = Nothing
             }
         )
-        [ initArg ]
+        [ Elm.tuple (Elm.string "kind") (Elm.string "regular")
+        , Elm.string "Expected kind."
+        , Elm.apply
+            (Elm.value
+                { importFrom = [ "Form" ]
+                , name = "init"
+                , annotation = Nothing
+                }
+            )
+            [ initArg ]
+        ]
 
 
 initCombined : Elm.Expression -> Elm.Expression -> Elm.Expression

package/generator/dead-code-review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision9/dependencies.75364bef27ac5a049b87c3325f846fc6dbda23b8ed7187ed06748b96bb6a50a7.json

@@ -1 +0,0 @@
-{"direct":{"elm/core":"1.0.5","elm/json":"1.1.3","elm/random":"1.0.0","elm/time":"1.0.0","elm-community/result-extra":"2.4.0","elm-explorations/test":"2.1.0","jfmengels/elm-review":"2.10.0","stil4m/elm-syntax":"7.2.9"},"indirect":{"elm/bytes":"1.0.8","elm/html":"1.0.0","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/virtual-dom":"1.0.3","elm-community/list-extra":"8.7.0","miniBill/elm-unicode":"1.0.2","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3"}}