elm-pages 3.0.0-beta.33 → 3.0.0-beta.35

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

package/codegen/elm-pages-codegen.cjs

@@ -25043,6 +25043,41 @@ var $author$project$Elm$Extra$topLevelValue = F2(
 			}
 		};
 	});
+var $elm$core$String$isEmpty = function (string) {
+	return string === '';
+};
+var $author$project$Internal$Compiler$documentation = F2(
+	function (rawDoc, decl) {
+		var doc = $elm$core$String$trim(rawDoc);
+		if ($elm$core$String$isEmpty(doc)) {
+			return decl;
+		} else {
+			switch (decl.$) {
+				case 'Comment':
+					return decl;
+				case 'Block':
+					var source = decl.a;
+					return decl;
+				default:
+					var details = decl.a;
+					return $author$project$Internal$Compiler$Declaration(
+						_Utils_update(
+							details,
+							{
+								docs: function () {
+									var _v1 = details.docs;
+									if (_v1.$ === 'Nothing') {
+										return $elm$core$Maybe$Just(doc);
+									} else {
+										var existing = _v1.a;
+										return $elm$core$Maybe$Just(doc + ('\n\n' + existing));
+									}
+								}()
+							}));
+			}
+		}
+	});
+var $author$project$Elm$withDocumentation = $author$project$Internal$Compiler$documentation;
 var $author$project$Generate$file = F2(
 	function (templates, basePath) {
 		var routes = A2($elm$core$List$filterMap, $author$project$Pages$Internal$RoutePattern$fromModuleName, templates);
@@ -25124,8 +25159,11 @@ var $author$project$Generate$file = F2(
 				$elm$core$Maybe$Just(
 					A2($author$project$Elm$Annotation$named, _List_Nil, 'Route'))),
 			function (route) {
-				return $author$project$Gen$Path$toAbsolute(
-					toPath.call(route));
+				return A2(
+					$author$project$Elm$withType,
+					$author$project$Elm$Annotation$string,
+					$author$project$Gen$Path$toAbsolute(
+						toPath.call(route)));
 			});
 		var redirectTo = A2(
 			$author$project$Elm$declaration,
@@ -25155,7 +25193,25 @@ var $author$project$Generate$file = F2(
 		var toLink = A4(
 			$author$project$Elm$Declare$fn2,
 			'toLink',
-			_Utils_Tuple2('toAnchorTag', $elm$core$Maybe$Nothing),
+			_Utils_Tuple2(
+				'toAnchorTag',
+				$elm$core$Maybe$Just(
+					A2(
+						$author$project$Elm$Annotation$function,
+						_List_fromArray(
+							[
+								$author$project$Elm$Annotation$list(
+								A3(
+									$author$project$Elm$Annotation$namedWith,
+									_List_fromArray(
+										['Html']),
+									'Attribute',
+									_List_fromArray(
+										[
+											$author$project$Elm$Annotation$var('msg')
+										])))
+							]),
+						$author$project$Elm$Annotation$var('a')))),
 			_Utils_Tuple2(
 				'route',
 				$elm$core$Maybe$Just(
@@ -25163,45 +25219,85 @@ var $author$project$Generate$file = F2(
 			F2(
 				function (toAnchorTag, route) {
 					return A2(
-						$author$project$Elm$apply,
-						toAnchorTag,
-						_List_fromArray(
-							[
-								$author$project$Elm$list(
-								_List_fromArray(
-									[
-										$author$project$Gen$Html$Attributes$call_.href(
-										toString.call(route)),
-										A2($author$project$Gen$Html$Attributes$attribute, 'elm-pages:prefetch', '')
-									]))
-							]));
+						$author$project$Elm$withType,
+						$author$project$Elm$Annotation$var('a'),
+						A2(
+							$author$project$Elm$apply,
+							toAnchorTag,
+							_List_fromArray(
+								[
+									$author$project$Elm$list(
+									_List_fromArray(
+										[
+											$author$project$Gen$Html$Attributes$call_.href(
+											toString.call(route)),
+											A2($author$project$Gen$Html$Attributes$attribute, 'elm-pages:prefetch', '')
+										]))
+								])));
 				}));
 		var link = A2(
 			$author$project$Elm$declaration,
 			'link',
-			A4(
-				$author$project$Elm$fn3,
-				_Utils_Tuple2('attributes', $elm$core$Maybe$Nothing),
-				_Utils_Tuple2('children', $elm$core$Maybe$Nothing),
-				_Utils_Tuple2(
-					'route',
-					$elm$core$Maybe$Just(
-						A2($author$project$Elm$Annotation$named, _List_Nil, 'Route'))),
-				F3(
-					function (attributes, children, route) {
-						return A2(
-							toLink.call,
-							A2(
-								$author$project$Elm$fn,
-								_Utils_Tuple2('anchorAttrs', $elm$core$Maybe$Nothing),
-								function (anchorAttrs) {
-									return A2(
-										$author$project$Gen$Html$call_.a,
-										A2($author$project$Elm$Op$append, anchorAttrs, attributes),
-										children);
-								}),
-							route);
-					})));
+			A2(
+				$author$project$Elm$withType,
+				A2(
+					$author$project$Elm$Annotation$function,
+					_List_fromArray(
+						[
+							$author$project$Elm$Annotation$list(
+							A3(
+								$author$project$Elm$Annotation$namedWith,
+								_List_fromArray(
+									['Html']),
+								'Attribute',
+								_List_fromArray(
+									[
+										$author$project$Elm$Annotation$var('msg')
+									]))),
+							$author$project$Elm$Annotation$list(
+							A3(
+								$author$project$Elm$Annotation$namedWith,
+								_List_fromArray(
+									['Html']),
+								'Html',
+								_List_fromArray(
+									[
+										$author$project$Elm$Annotation$var('msg')
+									]))),
+							A2($author$project$Elm$Annotation$named, _List_Nil, 'Route')
+						]),
+					A3(
+						$author$project$Elm$Annotation$namedWith,
+						_List_fromArray(
+							['Html']),
+						'Html',
+						_List_fromArray(
+							[
+								$author$project$Elm$Annotation$var('msg')
+							]))),
+				A4(
+					$author$project$Elm$fn3,
+					_Utils_Tuple2('attributes', $elm$core$Maybe$Nothing),
+					_Utils_Tuple2('children', $elm$core$Maybe$Nothing),
+					_Utils_Tuple2(
+						'route',
+						$elm$core$Maybe$Just(
+							A2($author$project$Elm$Annotation$named, _List_Nil, 'Route'))),
+					F3(
+						function (attributes, children, route) {
+							return A2(
+								toLink.call,
+								A2(
+									$author$project$Elm$fn,
+									_Utils_Tuple2('anchorAttrs', $elm$core$Maybe$Nothing),
+									function (anchorAttrs) {
+										return A2(
+											$author$project$Gen$Html$call_.a,
+											A2($author$project$Elm$Op$append, anchorAttrs, attributes),
+											children);
+									}),
+								route);
+						}))));
 		var withoutBaseUrl = A2(
 			$author$project$Elm$declaration,
 			'withoutBaseUrl',
@@ -25230,24 +25326,27 @@ var $author$project$Generate$file = F2(
 						A2(
 						$elm$core$List$map,
 						$author$project$Generate$expose,
-						_List_fromArray(
-							[
-								A2(
-								$author$project$Elm$customType,
-								'Route',
-								A2($elm$core$List$map, $author$project$Pages$Internal$RoutePattern$toVariant, routes)),
-								segmentsToRouteFn.declaration,
-								urlToRoute,
-								baseUrl.declaration,
-								routeToPathFn.declaration,
-								baseUrlAsPath.declaration,
-								toPath.declaration,
-								toString.declaration,
-								redirectTo,
-								toLink.declaration,
-								link,
-								withoutBaseUrl
-							])),
+						A2(
+							$elm$core$List$map,
+							$author$project$Elm$withDocumentation('.'),
+							_List_fromArray(
+								[
+									A2(
+									$author$project$Elm$customType,
+									'Route',
+									A2($elm$core$List$map, $author$project$Pages$Internal$RoutePattern$toVariant, routes)),
+									segmentsToRouteFn.declaration,
+									urlToRoute,
+									baseUrl.declaration,
+									routeToPathFn.declaration,
+									baseUrlAsPath.declaration,
+									toPath.declaration,
+									toString.declaration,
+									redirectTo,
+									toLink.declaration,
+									link,
+									withoutBaseUrl
+								]))),
 						_List_fromArray(
 						[$author$project$Generate$splitPath.declaration, $author$project$Generate$maybeToList.declaration])
 					])));
@@ -25769,79 +25868,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 +26105,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 +35422,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 +36667,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/cli.js

@@ -90,6 +90,7 @@ async function main() {
     .description("run an elm-pages script")
     .allowUnknownOption()
     .allowExcessArguments()
+    .helpOption(false) // allow --help to propogate to the Script to show usage
     .action(async (elmModulePath, options, options2) => {
       const unprocessedCliOptions = options2.args.splice(
         options2.processedArgs.length,
@@ -325,16 +326,11 @@ async function requireElm(compiledElmPath) {
 function generatorWrapperFile(moduleName) {
   return `port module Main exposing (main)
 
-import BackendTask exposing (BackendTask)
-import FatalError
-import Cli.Program as Program
-import Json.Decode as Decode
-import Json.Encode as Encode
 import Pages.Internal.Platform.GeneratorApplication
 import ${moduleName}
 
 
-main : Program.StatefulProgram Pages.Internal.Platform.GeneratorApplication.Model Pages.Internal.Platform.GeneratorApplication.Msg (BackendTask FatalError.FatalError ()) Pages.Internal.Platform.GeneratorApplication.Flags
+main : Pages.Internal.Platform.GeneratorApplication.Program
 main =
     Pages.Internal.Platform.GeneratorApplication.app
         { data = ${moduleName}.run
@@ -345,13 +341,13 @@ main =
         }
 
 
-port toJsPort : Encode.Value -> Cmd msg
+port toJsPort : Pages.Internal.Platform.GeneratorApplication.JsonValue -> Cmd msg
 
 
-port fromJsPort : (Decode.Value -> msg) -> Sub msg
+port fromJsPort : (Pages.Internal.Platform.GeneratorApplication.JsonValue -> msg) -> Sub msg
 
 
-port gotBatchSub : (Decode.Value -> msg) -> Sub msg
+port gotBatchSub : (Pages.Internal.Platform.GeneratorApplication.JsonValue -> msg) -> Sub msg
 `;
 }
 function collect(value, previous) {

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 13;
+export const compatibilityKey = 15;
 
-export const packageVersion = "3.0.0-beta.33";
+export const packageVersion = "3.0.0-beta.35";

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.33",
+  "version": "3.0.0-beta.35",
   "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/File.elm

@@ -65,7 +65,7 @@ frontmatter frontmatterDecoder =
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPost : BackendTask BlogPostMetadata
     blogPost =
@@ -101,7 +101,7 @@ It's common to parse the body with a markdown parser or other format.
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
     import Html exposing (Html)
 
     example :
@@ -151,13 +151,28 @@ bodyWithFrontmatter :
             }
             frontmatter
 bodyWithFrontmatter frontmatterDecoder filePath =
-    read filePath
-        (body
-            |> Decode.andThen
-                (\bodyString ->
-                    frontmatter (frontmatterDecoder bodyString)
-                )
-        )
+    BackendTask.Internal.Request.request2
+        { name = "read-file"
+        , body = BackendTask.Http.stringBody "" filePath
+        , expect =
+            body
+                |> Decode.andThen
+                    (\bodyString ->
+                        frontmatter (frontmatterDecoder bodyString)
+                    )
+        , errorDecoder = Decode.field "errorCode" (errorDecoder filePath)
+        , onError =
+            \frontmatterDecodeError ->
+                { fatal =
+                    { title = "BackendTask.File Decoder Error"
+                    , body =
+                        "I encountered a Json Decoder error from a call to BackendTask.File.bodyWithFrontmatter.\n\n"
+                            ++ Decode.errorToString frontmatterDecodeError
+                    }
+                        |> FatalError.build
+                , recoverable = DecodingError frontmatterDecodeError
+                }
+        }
 
 
 {-| -}
@@ -174,7 +189,7 @@ just the metadata.
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPost : BackendTask BlogPostMetadata
     blogPost =
@@ -198,7 +213,7 @@ the [`BackendTask`](BackendTask) API along with [`BackendTask.Glob`](BackendTask
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPostFiles : BackendTask (List String)
     blogPostFiles =
@@ -231,8 +246,23 @@ onlyFrontmatter :
             }
             frontmatter
 onlyFrontmatter frontmatterDecoder filePath =
-    read filePath
-        (frontmatter frontmatterDecoder)
+    BackendTask.Internal.Request.request2
+        { name = "read-file"
+        , body = BackendTask.Http.stringBody "" filePath
+        , expect = frontmatter frontmatterDecoder
+        , errorDecoder = Decode.field "errorCode" (errorDecoder filePath)
+        , onError =
+            \frontmatterDecodeError ->
+                { fatal =
+                    { title = "BackendTask.File Decoder Error"
+                    , body =
+                        "I encountered a Json Decoder error from a call to BackendTask.File.onlyFrontmatter.\n\n"
+                            ++ Decode.errorToString frontmatterDecodeError
+                    }
+                        |> FatalError.build
+                , recoverable = DecodingError frontmatterDecodeError
+                }
+        }
 
 
 {-| Same as `bodyWithFrontmatter` except it doesn't include the frontmatter.