elm-pages 3.0.0-beta.28 → 3.0.0-beta.29

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

package/codegen/elm-pages-codegen.cjs

@@ -14934,7 +14934,7 @@ var $author$project$Gen$Path$call_ = {
 							$author$project$Elm$Annotation$function,
 							_List_fromArray(
 								[
-									$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string)
+									A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Path', _List_Nil)
 								]),
 							A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Path', _List_Nil))),
 					importFrom: _List_fromArray(
@@ -14993,9 +14993,7 @@ var $author$project$Gen$Path$call_ = {
 						A2(
 							$author$project$Elm$Annotation$function,
 							_List_fromArray(
-								[
-									A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Path', _List_Nil)
-								]),
+								[$author$project$Elm$Annotation$string]),
 							$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string))),
 					importFrom: _List_fromArray(
 						['Path']),
@@ -24669,13 +24667,73 @@ var $author$project$Generate$segmentsToRoute = function (routes) {
 										])))))));
 		});
 };
+var $author$project$Internal$Compiler$addAlias = F4(
+	function (mod, name, ann, aliasCache) {
+		var annDetails = ann.a;
+		return A3(
+			$elm$core$Dict$insert,
+			A2($author$project$Internal$Compiler$formatAliasKey, mod, name),
+			{
+				target: annDetails.annotation,
+				variables: $author$project$Internal$Compiler$getGenerics(ann)
+			},
+			aliasCache);
+	});
+var $author$project$Internal$Compiler$getAliases = function (_v0) {
+	var ann = _v0.a;
+	return ann.aliases;
+};
+var $author$project$Elm$Annotation$alias = F4(
+	function (mod, name, vars, target) {
+		return $author$project$Internal$Compiler$Annotation(
+			{
+				aliases: A4(
+					$author$project$Internal$Compiler$addAlias,
+					mod,
+					name,
+					target,
+					A3(
+						$elm$core$List$foldl,
+						F2(
+							function (ann, aliases) {
+								return A2(
+									$author$project$Internal$Compiler$mergeAliases,
+									$author$project$Internal$Compiler$getAliases(ann),
+									aliases);
+							}),
+						$author$project$Internal$Compiler$getAliases(target),
+						vars)),
+				annotation: A2(
+					$stil4m$elm_syntax$Elm$Syntax$TypeAnnotation$Typed,
+					$author$project$Internal$Compiler$nodify(
+						_Utils_Tuple2(
+							mod,
+							$author$project$Internal$Format$formatType(name))),
+					A2(
+						$elm$core$List$map,
+						A2($elm$core$Basics$composeL, $author$project$Internal$Compiler$nodify, $author$project$Internal$Compiler$getInnerAnnotation),
+						vars)),
+				imports: function () {
+					if (!mod.b) {
+						return A2($elm$core$List$concatMap, $author$project$Internal$Compiler$getAnnotationImports, vars);
+					} else {
+						return _Utils_ap(
+							_List_fromArray(
+								[mod]),
+							A2($elm$core$List$concatMap, $author$project$Internal$Compiler$getAnnotationImports, vars));
+					}
+				}()
+			});
+	});
+var $author$project$Gen$Path$moduleName_ = _List_fromArray(
+	['Path']);
 var $author$project$Gen$Path$annotation_ = {
-	path: A3(
-		$author$project$Elm$Annotation$namedWith,
-		_List_fromArray(
-			['Path']),
+	path: A4(
+		$author$project$Elm$Annotation$alias,
+		$author$project$Gen$Path$moduleName_,
 		'Path',
-		_List_Nil)
+		_List_Nil,
+		$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string))
 };
 var $author$project$Internal$Types$bool = A2(
 	$stil4m$elm_syntax$Elm$Syntax$TypeAnnotation$Typed,
@@ -24823,10 +24881,6 @@ var $author$project$Pages$Internal$RoutePattern$toVariant = function (pattern) {
 			noArgsOrNonEmptyRecordArg);
 	}
 };
-var $author$project$Internal$Compiler$getAliases = function (_v0) {
-	var ann = _v0.a;
-	return ann.aliases;
-};
 var $author$project$Elm$function = F2(
 	function (initialArgList, toFullExpression) {
 		if (!initialArgList.b) {
@@ -25485,60 +25539,6 @@ var $author$project$Gen$Maybe$andThen = F2(
 					andThenArg0
 				]));
 	});
-var $author$project$Internal$Compiler$addAlias = F4(
-	function (mod, name, ann, aliasCache) {
-		var annDetails = ann.a;
-		return A3(
-			$elm$core$Dict$insert,
-			A2($author$project$Internal$Compiler$formatAliasKey, mod, name),
-			{
-				target: annDetails.annotation,
-				variables: $author$project$Internal$Compiler$getGenerics(ann)
-			},
-			aliasCache);
-	});
-var $author$project$Elm$Annotation$alias = F4(
-	function (mod, name, vars, target) {
-		return $author$project$Internal$Compiler$Annotation(
-			{
-				aliases: A4(
-					$author$project$Internal$Compiler$addAlias,
-					mod,
-					name,
-					target,
-					A3(
-						$elm$core$List$foldl,
-						F2(
-							function (ann, aliases) {
-								return A2(
-									$author$project$Internal$Compiler$mergeAliases,
-									$author$project$Internal$Compiler$getAliases(ann),
-									aliases);
-							}),
-						$author$project$Internal$Compiler$getAliases(target),
-						vars)),
-				annotation: A2(
-					$stil4m$elm_syntax$Elm$Syntax$TypeAnnotation$Typed,
-					$author$project$Internal$Compiler$nodify(
-						_Utils_Tuple2(
-							mod,
-							$author$project$Internal$Format$formatType(name))),
-					A2(
-						$elm$core$List$map,
-						A2($elm$core$Basics$composeL, $author$project$Internal$Compiler$nodify, $author$project$Internal$Compiler$getInnerAnnotation),
-						vars)),
-				imports: function () {
-					if (!mod.b) {
-						return A2($elm$core$List$concatMap, $author$project$Internal$Compiler$getAnnotationImports, vars);
-					} else {
-						return _Utils_ap(
-							_List_fromArray(
-								[mod]),
-							A2($elm$core$List$concatMap, $author$project$Internal$Compiler$getAnnotationImports, vars));
-					}
-				}()
-			});
-	});
 var $author$project$Gen$ApiRoute$moduleName_ = _List_fromArray(
 	['ApiRoute']);
 var $author$project$Gen$ApiRoute$annotation_ = {
@@ -29673,220 +29673,7 @@ var $author$project$Gen$PagesMsg$call_ = {
 		})
 };
 var $author$project$Gen$QueryParams$call_ = {
-	andThen: F2(
-		function (andThenArg, andThenArg0) {
-			return A2(
-				$author$project$Elm$apply,
-				$author$project$Elm$value(
-					{
-						annotation: $elm$core$Maybe$Just(
-							A2(
-								$author$project$Elm$Annotation$function,
-								_List_fromArray(
-									[
-										A2(
-										$author$project$Elm$Annotation$function,
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a')
-											]),
-										A3(
-											$author$project$Elm$Annotation$namedWith,
-											_List_Nil,
-											'Parser',
-											_List_fromArray(
-												[
-													$author$project$Elm$Annotation$var('b')
-												]))),
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Parser',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a')
-											]))
-									]),
-								A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_Nil,
-									'Parser',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$var('b')
-										])))),
-						importFrom: _List_fromArray(
-							['QueryParams']),
-						name: 'andThen'
-					}),
-				_List_fromArray(
-					[andThenArg, andThenArg0]));
-		}),
-	fail: function (failArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[$author$project$Elm$Annotation$string]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$var('a')
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'fail'
-				}),
-			_List_fromArray(
-				[failArg]));
-	},
-	fromResult: function (fromResultArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[
-									A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_Nil,
-									'Result',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$string,
-											$author$project$Elm$Annotation$var('a')
-										]))
-								]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$var('a')
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'fromResult'
-				}),
-			_List_fromArray(
-				[fromResultArg]));
-	},
 	fromString: function (fromStringArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[$author$project$Elm$Annotation$string]),
-							A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'QueryParams', _List_Nil))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'fromString'
-				}),
-			_List_fromArray(
-				[fromStringArg]));
-	},
-	map2: F3(
-		function (map2Arg, map2Arg0, map2Arg1) {
-			return A2(
-				$author$project$Elm$apply,
-				$author$project$Elm$value(
-					{
-						annotation: $elm$core$Maybe$Just(
-							A2(
-								$author$project$Elm$Annotation$function,
-								_List_fromArray(
-									[
-										A2(
-										$author$project$Elm$Annotation$function,
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a'),
-												$author$project$Elm$Annotation$var('b')
-											]),
-										$author$project$Elm$Annotation$var('combined')),
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Parser',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a')
-											])),
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Parser',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('b')
-											]))
-									]),
-								A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_Nil,
-									'Parser',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$var('combined')
-										])))),
-						importFrom: _List_fromArray(
-							['QueryParams']),
-						name: 'map2'
-					}),
-				_List_fromArray(
-					[map2Arg, map2Arg0, map2Arg1]));
-		}),
-	oneOf: function (oneOfArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[
-									$author$project$Elm$Annotation$list(
-									A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Parser',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a')
-											])))
-								]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$var('a')
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'oneOf'
-				}),
-			_List_fromArray(
-				[oneOfArg]));
-	},
-	optionalString: function (optionalStringArg) {
 		return A2(
 			$author$project$Elm$apply,
 			$author$project$Elm$value(
@@ -29896,150 +29683,6 @@ var $author$project$Gen$QueryParams$call_ = {
 							$author$project$Elm$Annotation$function,
 							_List_fromArray(
 								[$author$project$Elm$Annotation$string]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Maybe',
-										_List_fromArray(
-											[$author$project$Elm$Annotation$string]))
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'optionalString'
-				}),
-			_List_fromArray(
-				[optionalStringArg]));
-	},
-	parse: F2(
-		function (parseArg, parseArg0) {
-			return A2(
-				$author$project$Elm$apply,
-				$author$project$Elm$value(
-					{
-						annotation: $elm$core$Maybe$Just(
-							A2(
-								$author$project$Elm$Annotation$function,
-								_List_fromArray(
-									[
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Parser',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('a')
-											])),
-										A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'QueryParams', _List_Nil)
-									]),
-								A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_Nil,
-									'Result',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$string,
-											$author$project$Elm$Annotation$var('a')
-										])))),
-						importFrom: _List_fromArray(
-							['QueryParams']),
-						name: 'parse'
-					}),
-				_List_fromArray(
-					[parseArg, parseArg0]));
-		}),
-	string: function (stringArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[$author$project$Elm$Annotation$string]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[$author$project$Elm$Annotation$string])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'string'
-				}),
-			_List_fromArray(
-				[stringArg]));
-	},
-	strings: function (stringsArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[$author$project$Elm$Annotation$string]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string)
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'strings'
-				}),
-			_List_fromArray(
-				[stringsArg]));
-	},
-	succeed: function (succeedArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[
-									$author$project$Elm$Annotation$var('a')
-								]),
-							A3(
-								$author$project$Elm$Annotation$namedWith,
-								_List_Nil,
-								'Parser',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$var('a')
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'succeed'
-				}),
-			_List_fromArray(
-				[succeedArg]));
-	},
-	toDict: function (toDictArg) {
-		return A2(
-			$author$project$Elm$apply,
-			$author$project$Elm$value(
-				{
-					annotation: $elm$core$Maybe$Just(
-						A2(
-							$author$project$Elm$Annotation$function,
-							_List_fromArray(
-								[
-									A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'QueryParams', _List_Nil)
-								]),
 							A3(
 								$author$project$Elm$Annotation$namedWith,
 								_List_Nil,
@@ -30051,10 +29694,10 @@ var $author$project$Gen$QueryParams$call_ = {
 									])))),
 					importFrom: _List_fromArray(
 						['QueryParams']),
-					name: 'toDict'
+					name: 'fromString'
 				}),
 			_List_fromArray(
-				[toDictArg]));
+				[fromStringArg]));
 	},
 	toString: function (toStringArg) {
 		return A2(
@@ -36082,7 +35725,6 @@ var $author$project$GenerateMain$otherFile = F2(
 																															A2($author$project$GenerateMain$routeTemplateFunction, 'view', route),
 																															_List_fromArray(
 																																[
-																																	maybePageUrl,
 																																	A2($author$project$Elm$get, 'global', model),
 																																	subModel,
 																																	$author$project$Elm$record(
@@ -36102,6 +35744,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																																			_Utils_Tuple2(
 																																			'path',
 																																			A2($author$project$Elm$get, 'path', page)),
+																																			_Utils_Tuple2('url', maybePageUrl),
 																																			_Utils_Tuple2(
 																																			'submit',
 																																			A2(
@@ -36165,6 +35808,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																											_Utils_Tuple2(
 																											'path',
 																											A2($author$project$Elm$get, 'path', page)),
+																											_Utils_Tuple2('url', $author$project$Elm$nothing),
 																											_Utils_Tuple2(
 																											'submit',
 																											A2(
@@ -36564,10 +36208,6 @@ var $author$project$GenerateMain$otherFile = F2(
 																										})),
 																								_List_fromArray(
 																									[
-																										A2(
-																										$author$project$Gen$Maybe$andThen,
-																										$author$project$Elm$get('pageUrl'),
-																										maybePagePath),
 																										sharedModel,
 																										$author$project$Elm$record(
 																										_List_fromArray(
@@ -36613,6 +36253,12 @@ var $author$project$GenerateMain$otherFile = F2(
 																															$author$project$Gen$Tuple$second(justRouteAndPath)
 																														]))),
 																												_Utils_Tuple2(
+																												'url',
+																												A2(
+																													$author$project$Gen$Maybe$andThen,
+																													$author$project$Elm$get('pageUrl'),
+																													maybePagePath)),
+																												_Utils_Tuple2(
 																												'submit',
 																												A2(
 																													$author$project$Elm$apply,
@@ -37270,9 +36916,12 @@ var $author$project$GenerateMain$otherFile = F2(
 																						_Utils_Tuple2(
 																						'query',
 																						A2(
-																							$author$project$Gen$Maybe$map,
-																							$author$project$Gen$QueryParams$call_.fromString,
-																							A2($author$project$Elm$get, 'query', record))),
+																							$author$project$Gen$Maybe$withDefault,
+																							$author$project$Gen$Dict$empty,
+																							A2(
+																								$author$project$Gen$Maybe$map,
+																								$author$project$Gen$QueryParams$call_.fromString,
+																								A2($author$project$Elm$get, 'query', record)))),
 																						_Utils_Tuple2(
 																						'fragment',
 																						A2($author$project$Elm$get, 'fragment', record))
@@ -37461,7 +37110,6 @@ var $author$project$GenerateMain$otherFile = F2(
 																						})),
 																				_List_fromArray(
 																					[
-																						pageUrl,
 																						$author$project$Elm$record(
 																						_List_fromArray(
 																							[
@@ -37478,6 +37126,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																								'path',
 																								A2($author$project$Elm$get, 'path', justPage)),
 																								_Utils_Tuple2(
+																								'url',
+																								$author$project$Elm$just(pageUrl)),
+																								_Utils_Tuple2(
 																								'submit',
 																								A2(
 																									$author$project$Elm$fn,
@@ -38148,7 +37799,6 @@ var $author$project$GenerateMain$otherFile = F2(
 																					})),
 																			_List_fromArray(
 																				[
-																					$author$project$Elm$nothing,
 																					A2(
 																					$elm$core$Maybe$withDefault,
 																					$author$project$Elm$record(_List_Nil),