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

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_ = {
@@ -26333,17 +26333,6 @@ var $author$project$Gen$PagesMsg$annotation_ = {
 					])));
 	}
 };
-var $author$project$Gen$Platform$Sub$annotation_ = {
-	sub: function (subArg0) {
-		return A3(
-			$author$project$Elm$Annotation$namedWith,
-			_List_fromArray(
-				['Sub']),
-			'Sub',
-			_List_fromArray(
-				[subArg0]));
-	}
-};
 var $author$project$Gen$Server$Response$moduleName_ = _List_fromArray(
 	['Server', 'Response']);
 var $author$project$Gen$Server$Response$annotation_ = {
@@ -26960,43 +26949,6 @@ var $author$project$GenerateMain$applyIdentityTo = function (to) {
 		_List_fromArray(
 			[$author$project$Gen$Basics$values_.identity]));
 };
-var $author$project$Gen$Platform$Sub$batch = function (batchArg) {
-	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,
-									'Sub',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$var('msg')
-										])))
-							]),
-						A3(
-							$author$project$Elm$Annotation$namedWith,
-							_List_Nil,
-							'Sub',
-							_List_fromArray(
-								[
-									$author$project$Elm$Annotation$var('msg')
-								])))),
-				importFrom: _List_fromArray(
-					['Sub']),
-				name: 'batch'
-			}),
-		_List_fromArray(
-			[
-				$author$project$Elm$list(batchArg)
-			]));
-};
 var $author$project$Gen$BackendTask$call_ = {
 	allowFatal: function (allowFatalArg) {
 		return A2(
@@ -29720,8 +29672,8 @@ var $author$project$Gen$PagesMsg$call_ = {
 					[mapArg, mapArg0]));
 		})
 };
-var $author$project$Gen$Platform$Sub$call_ = {
-	batch: function (batchArg) {
+var $author$project$Gen$QueryParams$call_ = {
+	fromString: function (fromStringArg) {
 		return A2(
 			$author$project$Elm$apply,
 			$author$project$Elm$value(
@@ -29730,34 +29682,70 @@ var $author$project$Gen$Platform$Sub$call_ = {
 						A2(
 							$author$project$Elm$Annotation$function,
 							_List_fromArray(
-								[
-									$author$project$Elm$Annotation$list(
-									A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Sub',
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('msg')
-											])))
-								]),
+								[$author$project$Elm$Annotation$string]),
 							A3(
 								$author$project$Elm$Annotation$namedWith,
 								_List_Nil,
-								'Sub',
+								'Dict',
 								_List_fromArray(
 									[
-										$author$project$Elm$Annotation$var('msg')
+										$author$project$Elm$Annotation$string,
+										$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string)
 									])))),
 					importFrom: _List_fromArray(
-						['Sub']),
-					name: 'batch'
+						['QueryParams']),
+					name: 'fromString'
 				}),
 			_List_fromArray(
-				[batchArg]));
+				[fromStringArg]));
 	},
-	map: F2(
-		function (mapArg, mapArg0) {
+	toString: function (toStringArg) {
+		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)
+								]),
+							$author$project$Elm$Annotation$string)),
+					importFrom: _List_fromArray(
+						['QueryParams']),
+					name: 'toString'
+				}),
+			_List_fromArray(
+				[toStringArg]));
+	}
+};
+var $author$project$Gen$Tuple$call_ = {
+	first: function (firstArg) {
+		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$tuple,
+									$author$project$Elm$Annotation$var('a'),
+									$author$project$Elm$Annotation$var('b'))
+								]),
+							$author$project$Elm$Annotation$var('a'))),
+					importFrom: _List_fromArray(
+						['Tuple']),
+					name: 'first'
+				}),
+			_List_fromArray(
+				[firstArg]));
+	},
+	mapBoth: F3(
+		function (mapBothArg, mapBothArg0, mapBothArg1) {
 			return A2(
 				$author$project$Elm$apply,
 				$author$project$Elm$value(
@@ -29773,490 +29761,18 @@ var $author$project$Gen$Platform$Sub$call_ = {
 											[
 												$author$project$Elm$Annotation$var('a')
 											]),
-										$author$project$Elm$Annotation$var('msg')),
-										A3(
-										$author$project$Elm$Annotation$namedWith,
-										_List_Nil,
-										'Sub',
+										$author$project$Elm$Annotation$var('x')),
+										A2(
+										$author$project$Elm$Annotation$function,
 										_List_fromArray(
 											[
-												$author$project$Elm$Annotation$var('a')
-											]))
-									]),
-								A3(
-									$author$project$Elm$Annotation$namedWith,
-									_List_Nil,
-									'Sub',
-									_List_fromArray(
-										[
-											$author$project$Elm$Annotation$var('msg')
-										])))),
-						importFrom: _List_fromArray(
-							['Sub']),
-						name: 'map'
-					}),
-				_List_fromArray(
-					[mapArg, mapArg0]));
-		})
-};
-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(
-				{
-					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(
-									[
-										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,
-								'Dict',
-								_List_fromArray(
-									[
-										$author$project$Elm$Annotation$string,
-										$author$project$Elm$Annotation$list($author$project$Elm$Annotation$string)
-									])))),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'toDict'
-				}),
-			_List_fromArray(
-				[toDictArg]));
-	},
-	toString: function (toStringArg) {
-		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)
-								]),
-							$author$project$Elm$Annotation$string)),
-					importFrom: _List_fromArray(
-						['QueryParams']),
-					name: 'toString'
-				}),
-			_List_fromArray(
-				[toStringArg]));
-	}
-};
-var $author$project$Gen$Tuple$call_ = {
-	first: function (firstArg) {
-		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$tuple,
-									$author$project$Elm$Annotation$var('a'),
-									$author$project$Elm$Annotation$var('b'))
-								]),
-							$author$project$Elm$Annotation$var('a'))),
-					importFrom: _List_fromArray(
-						['Tuple']),
-					name: 'first'
-				}),
-			_List_fromArray(
-				[firstArg]));
-	},
-	mapBoth: F3(
-		function (mapBothArg, mapBothArg0, mapBothArg1) {
-			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('x')),
-										A2(
-										$author$project$Elm$Annotation$function,
-										_List_fromArray(
-											[
-												$author$project$Elm$Annotation$var('b')
-											]),
-										$author$project$Elm$Annotation$var('y')),
-										A2(
-										$author$project$Elm$Annotation$tuple,
-										$author$project$Elm$Annotation$var('a'),
-										$author$project$Elm$Annotation$var('b'))
+												$author$project$Elm$Annotation$var('b')
+											]),
+										$author$project$Elm$Annotation$var('y')),
+										A2(
+										$author$project$Elm$Annotation$tuple,
+										$author$project$Elm$Annotation$var('a'),
+										$author$project$Elm$Annotation$var('b'))
 									]),
 								A2(
 									$author$project$Elm$Annotation$tuple,
@@ -31869,21 +31385,6 @@ var $author$project$Gen$Basics$never = function (neverArg) {
 		_List_fromArray(
 			[neverArg]));
 };
-var $author$project$Gen$Platform$Sub$none = $author$project$Elm$value(
-	{
-		annotation: $elm$core$Maybe$Just(
-			A3(
-				$author$project$Elm$Annotation$namedWith,
-				_List_Nil,
-				'Sub',
-				_List_fromArray(
-					[
-						$author$project$Elm$Annotation$var('msg')
-					]))),
-		importFrom: _List_fromArray(
-			['Sub']),
-		name: 'none'
-	});
 var $author$project$Elm$nothing = $author$project$Elm$maybe($elm$core$Maybe$Nothing);
 var $author$project$Gen$Json$Encode$object = function (objectArg) {
 	return A2(
@@ -32652,6 +32153,79 @@ var $author$project$Gen$ApiRoute$single = function (singleArg) {
 		_List_fromArray(
 			[singleArg]));
 };
+var $author$project$GenerateMain$subType = function (inner) {
+	return A3(
+		$author$project$Elm$Annotation$namedWith,
+		_List_fromArray(
+			['Platform', 'Sub']),
+		'Sub',
+		_List_fromArray(
+			[inner]));
+};
+var $author$project$GenerateMain$subBatch = function (batchArg) {
+	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(
+								$author$project$GenerateMain$subType(
+									$author$project$Elm$Annotation$var('msg')))
+							]),
+						$author$project$GenerateMain$subType(
+							$author$project$Elm$Annotation$var('msg')))),
+				importFrom: _List_fromArray(
+					['Platform', 'Sub']),
+				name: 'batch'
+			}),
+		_List_fromArray(
+			[
+				$author$project$Elm$list(batchArg)
+			]));
+};
+var $author$project$GenerateMain$subMap = F2(
+	function (mapArg, mapArg0) {
+		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('msg')),
+									$author$project$GenerateMain$subType(
+									$author$project$Elm$Annotation$var('a'))
+								]),
+							$author$project$GenerateMain$subType(
+								$author$project$Elm$Annotation$var('msg')))),
+					importFrom: _List_fromArray(
+						['Platform', 'Sub']),
+					name: 'map'
+				}),
+			_List_fromArray(
+				[mapArg, mapArg0]));
+	});
+var $author$project$GenerateMain$subNone = $author$project$Elm$value(
+	{
+		annotation: $elm$core$Maybe$Just(
+			$author$project$GenerateMain$subType(
+				$author$project$Elm$Annotation$var('msg'))),
+		importFrom: _List_fromArray(
+			['Platform', 'Sub']),
+		name: 'none'
+	});
 var $author$project$Gen$ApiRoute$succeed = function (succeedArg) {
 	return A2(
 		$author$project$Elm$apply,
@@ -36151,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(
@@ -36171,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(
@@ -36234,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(
@@ -36633,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(
@@ -36682,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,
@@ -37339,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))
@@ -37530,7 +37110,6 @@ var $author$project$GenerateMain$otherFile = F2(
 																						})),
 																				_List_fromArray(
 																					[
-																						pageUrl,
 																						$author$project$Elm$record(
 																						_List_fromArray(
 																							[
@@ -37547,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,
@@ -38175,7 +37757,7 @@ var $author$project$GenerateMain$otherFile = F2(
 				function (maybeRoute, path, model) {
 					return A2(
 						$author$project$Elm$withType,
-						$author$project$Gen$Platform$Sub$annotation_.sub(
+						$author$project$GenerateMain$subType(
 							A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')),
 						A2(
 							$author$project$Elm$Case$maybe,
@@ -38199,7 +37781,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																$author$project$Elm$Case$patternToBranch,
 																function (templateModel) {
 																	return A2(
-																		$author$project$Gen$Platform$Sub$call_.map,
+																		$author$project$GenerateMain$subMap,
 																		A2($author$project$GenerateMain$routeVariantExpression, $author$project$GenerateMain$Msg, route),
 																		A2(
 																			$author$project$Elm$apply,
@@ -38217,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),
@@ -38230,12 +37811,12 @@ var $author$project$GenerateMain$otherFile = F2(
 																A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$Model, 'templateModel', route)),
 																$author$project$Elm$Case$otherwise(
 																function (_v10) {
-																	return $author$project$Gen$Platform$Sub$none;
+																	return $author$project$GenerateMain$subNone;
 																})
 															]));
 												}));
 									}),
-								nothing: $author$project$Gen$Platform$Sub$none
+								nothing: $author$project$GenerateMain$subNone
 							}));
 				}));
 		var subscriptions = A5(
@@ -38266,13 +37847,13 @@ var $author$project$GenerateMain$otherFile = F2(
 				function (route, path, model) {
 					return A2(
 						$author$project$Elm$withType,
-						$author$project$Gen$Platform$Sub$annotation_.sub(
+						$author$project$GenerateMain$subType(
 							A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')),
-						$author$project$Gen$Platform$Sub$batch(
+						$author$project$GenerateMain$subBatch(
 							_List_fromArray(
 								[
 									A2(
-									$author$project$Gen$Platform$Sub$call_.map,
+									$author$project$GenerateMain$subMap,
 									$author$project$Elm$val('MsgGlobal'),
 									A2(
 										$author$project$Elm$apply,
@@ -38590,7 +38171,7 @@ var $author$project$GenerateMain$otherFile = F2(
 					}(),
 					gotBatchSub: function () {
 						if (phase.$ === 'Browser') {
-							return $author$project$Gen$Platform$Sub$none;
+							return $author$project$GenerateMain$subNone;
 						} else {
 							return $author$project$GenerateMain$applyIdentityTo(
 								$author$project$Elm$val('gotBatchSub'));