elm-pages 3.0.0-beta.32 → 3.0.0-beta.34

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

package/codegen/elm-pages-codegen.cjs

@@ -25769,79 +25769,6 @@ var $author$project$Gen$Json$Encode$annotation_ = {
 		'Value',
 		_List_Nil)
 };
-var $author$project$Gen$Pages$FormState$moduleName_ = _List_fromArray(
-	['Pages', 'FormState']);
-var $author$project$Gen$Pages$FormState$annotation_ = {
-	event: A3(
-		$author$project$Elm$Annotation$namedWith,
-		_List_fromArray(
-			['Pages', 'FormState']),
-		'Event',
-		_List_Nil),
-	fieldEvent: A4(
-		$author$project$Elm$Annotation$alias,
-		$author$project$Gen$Pages$FormState$moduleName_,
-		'FieldEvent',
-		_List_Nil,
-		$author$project$Elm$Annotation$record(
-			_List_fromArray(
-				[
-					_Utils_Tuple2('value', $author$project$Elm$Annotation$string),
-					_Utils_Tuple2('formId', $author$project$Elm$Annotation$string),
-					_Utils_Tuple2('name', $author$project$Elm$Annotation$string),
-					_Utils_Tuple2(
-					'event',
-					A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Event', _List_Nil))
-				]))),
-	fieldState: A4(
-		$author$project$Elm$Annotation$alias,
-		$author$project$Gen$Pages$FormState$moduleName_,
-		'FieldState',
-		_List_Nil,
-		$author$project$Elm$Annotation$record(
-			_List_fromArray(
-				[
-					_Utils_Tuple2('value', $author$project$Elm$Annotation$string),
-					_Utils_Tuple2(
-					'status',
-					A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'FieldStatus', _List_Nil))
-				]))),
-	formState: A4(
-		$author$project$Elm$Annotation$alias,
-		$author$project$Gen$Pages$FormState$moduleName_,
-		'FormState',
-		_List_Nil,
-		$author$project$Elm$Annotation$record(
-			_List_fromArray(
-				[
-					_Utils_Tuple2(
-					'fields',
-					A3(
-						$author$project$Elm$Annotation$namedWith,
-						_List_Nil,
-						'Dict',
-						_List_fromArray(
-							[
-								$author$project$Elm$Annotation$string,
-								A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'FieldState', _List_Nil)
-							]))),
-					_Utils_Tuple2('submitAttempted', $author$project$Elm$Annotation$bool)
-				]))),
-	pageFormState: A4(
-		$author$project$Elm$Annotation$alias,
-		$author$project$Gen$Pages$FormState$moduleName_,
-		'PageFormState',
-		_List_Nil,
-		A3(
-			$author$project$Elm$Annotation$namedWith,
-			_List_Nil,
-			'Dict',
-			_List_fromArray(
-				[
-					$author$project$Elm$Annotation$string,
-					A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'FormState', _List_Nil)
-				])))
-};
 var $author$project$Gen$Pages$Internal$NotFoundReason$moduleName_ = _List_fromArray(
 	['Pages', 'Internal', 'NotFoundReason']);
 var $author$project$Gen$Pages$Internal$NotFoundReason$annotation_ = {
@@ -26079,8 +26006,8 @@ var $author$project$Gen$Pages$Internal$Platform$annotation_ = {
 							A3(
 								$author$project$Elm$Annotation$namedWith,
 								_List_fromArray(
-									['Pages', 'FormState']),
-								'PageFormState',
+									['Form']),
+								'Model',
 								_List_Nil)),
 							_Utils_Tuple2('pendingRedirect', $author$project$Elm$Annotation$bool),
 							_Utils_Tuple2(
@@ -35396,7 +35323,12 @@ var $author$project$GenerateMain$otherFile = F2(
 				[
 					_Utils_Tuple2(
 					'pageFormState',
-					$elm$core$Maybe$Just($author$project$Gen$Pages$FormState$annotation_.pageFormState)),
+					$elm$core$Maybe$Just(
+						A2(
+							$author$project$Elm$Annotation$named,
+							_List_fromArray(
+								['Form']),
+							'Model'))),
 					_Utils_Tuple2(
 					'fetchers',
 					$elm$core$Maybe$Just(
@@ -36636,8 +36568,8 @@ var $author$project$GenerateMain$otherFile = F2(
 						A2(
 							$author$project$Elm$Annotation$named,
 							_List_fromArray(
-								['Pages', 'FormState']),
-							'PageFormState'))),
+								['Form']),
+							'Model'))),
 					_Utils_Tuple2(
 					'fetchers',
 					$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: 929039856, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 3680802640, 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: 929039856,
+  initialSeed: 3680802640,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/dead-code-review/elm.json

@@ -10,7 +10,7 @@
             "elm/core": "1.0.5",
             "elm/json": "1.1.3",
             "elm-community/result-extra": "2.4.0",
-            "jfmengels/elm-review": "2.12.2",
+            "jfmengels/elm-review": "2.13.0",
             "stil4m/elm-syntax": "7.2.9"
         },
         "indirect": {

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: 3355512856, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1263909344, 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: 3355512856,
+  initialSeed: 1263909344,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/review/elm.json

@@ -11,7 +11,7 @@
             "elm/html": "1.0.0",
             "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
-            "jfmengels/elm-review": "2.12.2",
+            "jfmengels/elm-review": "2.13.0",
             "mdgriffith/elm-codegen": "3.0.0",
             "stil4m/elm-syntax": "7.2.9",
             "the-sett/elm-syntax-dsl": "6.0.2"

package/generator/src/RouteBuilder.elm

@@ -90,11 +90,11 @@ import Dict exposing (Dict)
 import Effect exposing (Effect)
 import ErrorPage exposing (ErrorPage)
 import FatalError exposing (FatalError)
+import Form
 import Head
 import Http
 import Json.Decode
 import Pages.Fetcher
-import Pages.FormState
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.RoutePattern exposing (RoutePattern)
 import Pages.PageUrl exposing (PageUrl)
@@ -147,7 +147,7 @@ type alias App data action routeParams =
         -> Pages.Fetcher.Fetcher (Result Http.Error action)
     , transition : Maybe Pages.Transition.Transition
     , fetchers : Dict String (Pages.Transition.FetcherState (Maybe action))
-    , pageFormState : Pages.FormState.PageFormState
+    , pageFormState : Form.Model
     }
 
 

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 12;
+export const compatibilityKey = 14;
 
-export const packageVersion = "3.0.0-beta.32";
+export const packageVersion = "3.0.0-beta.34";

package/generator/src/render.js

@@ -91,6 +91,7 @@ export async function runGenerator(
     );
     return result;
   } catch (error) {
+    process.exitCode = 1;
     console.log(restoreColorSafe(error));
   }
 }

package/generator/src/request-cache.js

@@ -202,12 +202,26 @@ export function lookupOrPerform(
           },
         });
       } catch (error) {
-        console.trace("@@@ request-cache2 HTTP error", error);
-        reject({
-          title: "BackendTask.Http Error",
-          message: `${kleur.yellow().underline(request.url)} ${error.toString()}
-`,
-        });
+        if (error.code === "ECONNREFUSED") {
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "NetworkError" },
+          });
+        } else if (
+          error.code === "ETIMEDOUT" ||
+          error.code === "ERR_SOCKET_TIMEOUT"
+        ) {
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "Timeout" },
+          });
+        } else {
+          console.trace("elm-pages unhandled HTTP error", error);
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "NetworkError" },
+          });
+        }
       }
     }
   });

package/generator/static-code/elm-pages.js

@@ -103,4 +103,14 @@ function find_anchor(node) {
   return /** @type {HTMLAnchorElement} */ (node);
 }
 
+Object.defineProperty(SubmitEvent.prototype, "fields", {
+  get: function fields() {
+    let formData = new FormData(this.currentTarget);
+    if (this.submitter?.name) {
+      formData.append(this.submitter.name, this.submitter.value);
+    }
+    return [...formData.entries()];
+  },
+});
+
 setup();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.32",
+  "version": "3.0.0-beta.34",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -44,8 +44,8 @@
     "memfs": "^3.4.13",
     "micromatch": "^4.0.5",
     "serve-static": "^1.15.0",
-    "vite": "^4.2.1",
     "terser": "^5.16.8",
+    "vite": "^4.2.1",
     "which": "^3.0.0"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "cypress": "^12.8.1",
     "elm-codegen": "^0.3.0",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-review": "^2.9.2",
+    "elm-review": "^2.10.1",
     "elm-test": "^0.19.1-revision11",
     "elm-tooling": "^1.13.1",
     "elm-verify-examples": "^5.2.0",

package/src/BackendTask/Http.elm

@@ -494,19 +494,25 @@ requestRaw request__ expect =
         (\maybeMockResolver rawResponseDict ->
             (case maybeMockResolver of
                 Just mockResolver ->
-                    mockResolver request_
+                    mockResolver request_ |> Maybe.map Ok
 
                 Nothing ->
                     rawResponseDict |> RequestsAndPending.get (request_ |> HashRequest.hash)
             )
                 |> (\maybeResponse ->
                         case maybeResponse of
-                            Just rawResponse ->
+                            Just (Ok rawResponse) ->
                                 Ok rawResponse
 
                             Nothing ->
                                 --Err (Pages.StaticHttpRequest.UserCalledStaticHttpFail ("INTERNAL ERROR - expected request" ++ request_.url))
                                 Err (BadBody Nothing ("INTERNAL ERROR - expected request" ++ request_.url))
+
+                            Just (Err RequestsAndPending.NetworkError) ->
+                                Err NetworkError
+
+                            Just (Err RequestsAndPending.Timeout) ->
+                                Err Timeout
                    )
                 |> Result.andThen
                     (\(RequestsAndPending.Response maybeResponse body) ->

package/src/Internal/Field.elm

@@ -0,0 +1,19 @@
+module Internal.Field exposing (Field(..), FieldInfo)
+
+{-| -}
+
+import Json.Encode as Encode
+
+
+type Field error parsed input initial kind constraints
+    = Field (FieldInfo error parsed input initial) kind
+
+
+{-| -}
+type alias FieldInfo error parsed input initial =
+    { initialValue : input -> Maybe String
+    , decode : Maybe String -> ( Maybe parsed, List error )
+    , properties : List ( String, Encode.Value )
+    , initialToString : initial -> String
+    , compare : String -> initial -> Order
+    }

package/src/Internal/Input.elm

@@ -0,0 +1,81 @@
+module Internal.Input exposing
+    ( Hidden(..)
+    , Input(..)
+    , InputType(..)
+    , Options(..)
+    , inputTypeToString
+    )
+
+
+type InputType
+    = Text
+    | Number
+      -- TODO should range have arguments for initial, min, and max?
+    | Range
+    | Radio
+      -- TODO should submit be a special type, or an Input type?
+      -- TODO have an option for a submit with a name/value?
+    | Date
+    | Time
+    | Checkbox
+    | Tel
+    | Search
+    | Password
+    | Email
+    | Url
+    | Textarea { rows : Maybe Int, cols : Maybe Int }
+
+
+inputTypeToString : InputType -> String
+inputTypeToString inputType =
+    case inputType of
+        Text ->
+            "text"
+
+        Textarea _ ->
+            "text"
+
+        Number ->
+            "number"
+
+        Range ->
+            "range"
+
+        Radio ->
+            "radio"
+
+        Date ->
+            "date"
+
+        Time ->
+            "time"
+
+        Checkbox ->
+            "checkbox"
+
+        Tel ->
+            "tel"
+
+        Search ->
+            "search"
+
+        Password ->
+            "password"
+
+        Email ->
+            "email"
+
+        Url ->
+            "url"
+
+
+type Input
+    = Input InputType
+
+
+type Hidden
+    = Hidden
+
+
+type Options a
+    = Options (String -> Maybe a) (List String)

package/src/Pages/Form.elm

@@ -0,0 +1,229 @@
+module Pages.Form exposing
+    ( Strategy(..), renderHtml, renderStyledHtml
+    , FormWithServerValidations, Handler
+    )
+
+{-|
+
+@docs Strategy, renderHtml, renderStyledHtml
+
+@docs FormWithServerValidations, Handler
+
+-}
+
+import BackendTask exposing (BackendTask)
+import Dict exposing (Dict)
+import FatalError exposing (FatalError)
+import Form
+import Form.Handler
+import Form.Validation as Validation exposing (Validation)
+import Html
+import Html.Styled
+import Pages.Internal.Msg
+import Pages.Transition
+import PagesMsg exposing (PagesMsg)
+
+
+{-| -}
+type alias FormWithServerValidations error combined input view =
+    Form.Form
+        error
+        { combine :
+            Validation
+                error
+                (BackendTask FatalError (Validation error combined Never Never))
+                Never
+                Never
+        , view : Form.Context error input -> view
+        }
+        (BackendTask FatalError (Validation error combined Never Never))
+        input
+
+
+{-| -}
+type alias Handler error combined =
+    Form.Handler.Handler error (BackendTask FatalError (Validation.Validation error combined Never Never))
+
+
+{-| -}
+type Strategy
+    = Parallel
+    | Serial
+
+
+{-| -}
+renderHtml :
+    List (Html.Attribute (PagesMsg userMsg))
+    -> Strategy
+    -> Form.Options error parsed input userMsg
+    ->
+        { --path : Path
+          --, url : Maybe PageUrl
+          --, action : Maybe action
+          app
+            | pageFormState : Form.Model
+            , transition : Maybe Pages.Transition.Transition
+            , fetchers : Dict String (Pages.Transition.FetcherState (Maybe action))
+        }
+    -> Form.Form error { combine : Validation error parsed named constraints, view : Form.Context error input -> List (Html.Html (PagesMsg userMsg)) } parsed input
+    -> Html.Html (PagesMsg userMsg)
+renderHtml attrs strategy options_ app form_ =
+    form_
+        |> Form.renderHtml
+            { state = app.pageFormState
+            , submitting =
+                (case app.fetchers |> Dict.get options_.id of
+                    Just { status } ->
+                        case status of
+                            Pages.Transition.FetcherComplete _ ->
+                                False
+
+                            Pages.Transition.FetcherSubmitting ->
+                                True
+
+                            Pages.Transition.FetcherReloading _ ->
+                                True
+
+                    Nothing ->
+                        False
+                )
+                    || (case app.transition of
+                            Just (Pages.Transition.Submitting formData) ->
+                                formData.id == Just options_.id
+
+                            Just (Pages.Transition.LoadAfterSubmit submitData _ _) ->
+                                submitData.id == Just options_.id
+
+                            Just (Pages.Transition.Loading _ _) ->
+                                False
+
+                            Nothing ->
+                                False
+                       )
+            , toMsg = Pages.Internal.Msg.FormMsg
+            }
+            { id = options_.id
+            , method = options_.method
+            , input = options_.input
+            , serverResponse = options_.serverResponse
+            , action = options_.action
+            , onSubmit =
+                Just
+                    (\submission ->
+                        case submission.parsed of
+                            Form.Valid _ ->
+                                Pages.Internal.Msg.Submit
+                                    { useFetcher = strategy == Parallel
+                                    , action = submission.action
+                                    , fields = submission.fields
+                                    , method = submission.method
+                                    , msg =
+                                        options_.onSubmit
+                                            |> Maybe.map
+                                                (\onSubmit -> onSubmit submission)
+                                    , id = options_.id
+                                    , valid = True
+                                    }
+
+                            Form.Invalid _ _ ->
+                                Pages.Internal.Msg.Submit
+                                    { useFetcher = strategy == Parallel
+                                    , action = submission.action
+                                    , method = submission.method
+                                    , fields = submission.fields
+                                    , msg = options_.onSubmit |> Maybe.map (\onSubmit -> onSubmit submission)
+                                    , id = options_.id
+                                    , valid = False
+                                    }
+                    )
+            }
+            attrs
+
+
+{-| -}
+renderStyledHtml :
+    List (Html.Styled.Attribute (PagesMsg userMsg))
+    -> Strategy
+    -> Form.Options error parsed input userMsg
+    ->
+        { --path : Path
+          --, url : Maybe PageUrl
+          --, action : Maybe action
+          app
+            | pageFormState : Form.Model
+            , transition : Maybe Pages.Transition.Transition
+            , fetchers : Dict String (Pages.Transition.FetcherState (Maybe action))
+        }
+    -> Form.Form error { combine : Validation error parsed named constraints, view : Form.Context error input -> List (Html.Styled.Html (PagesMsg userMsg)) } parsed input
+    -> Html.Styled.Html (PagesMsg userMsg)
+renderStyledHtml attrs strategy options_ app form_ =
+    form_
+        |> Form.renderStyledHtml
+            { state = app.pageFormState
+            , toMsg = Pages.Internal.Msg.FormMsg
+            , submitting =
+                (case app.fetchers |> Dict.get options_.id of
+                    Just { status } ->
+                        case status of
+                            Pages.Transition.FetcherComplete _ ->
+                                False
+
+                            Pages.Transition.FetcherSubmitting ->
+                                True
+
+                            Pages.Transition.FetcherReloading _ ->
+                                True
+
+                    Nothing ->
+                        False
+                )
+                    || (case app.transition of
+                            Just (Pages.Transition.Submitting formData) ->
+                                formData.id == Just options_.id
+
+                            Just (Pages.Transition.LoadAfterSubmit submitData _ _) ->
+                                submitData.id == Just options_.id
+
+                            Just (Pages.Transition.Loading _ _) ->
+                                False
+
+                            Nothing ->
+                                False
+                       )
+            }
+            { id = options_.id
+            , method = options_.method
+            , input = options_.input
+            , serverResponse = options_.serverResponse
+            , action = options_.action
+            , onSubmit =
+                Just
+                    (\submission ->
+                        case submission.parsed of
+                            Form.Valid _ ->
+                                Pages.Internal.Msg.Submit
+                                    { useFetcher = strategy == Parallel
+                                    , action = submission.action
+                                    , fields = submission.fields
+                                    , method = submission.method
+                                    , msg =
+                                        options_.onSubmit
+                                            |> Maybe.map
+                                                (\onSubmit -> onSubmit submission)
+                                    , id = options_.id
+                                    , valid = True
+                                    }
+
+                            Form.Invalid _ _ ->
+                                Pages.Internal.Msg.Submit
+                                    { useFetcher = strategy == Parallel
+                                    , action = submission.action
+                                    , fields = submission.fields
+                                    , method = submission.method
+                                    , msg = options_.onSubmit |> Maybe.map (\onSubmit -> onSubmit submission)
+                                    , id = options_.id
+                                    , valid = False
+                                    }
+                    )
+            }
+            attrs