elm-pages 3.0.0-beta.5 → 3.0.0-beta.6

package/codegen/elm-pages-codegen.js

@@ -38904,7 +38904,7 @@ _Platform_export({'Generate':{'init':$author$project$Generate$main(
 			$elm$json$Json$Decode$field,
 			'templates',
 			$elm$json$Json$Decode$list(
-				$elm$json$Json$Decode$list($elm$json$Json$Decode$string)))))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+				$elm$json$Json$Decode$list($elm$json$Json$Decode$string)))))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/Reporter.elm.js

@@ -6692,7 +6692,7 @@ _Platform_export({'Reporter':{'init':$author$project$Reporter$main(
 					'paths',
 					$elm$json$Json$Decode$list($elm$json$Json$Decode$string)));
 		},
-		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/Runner.elm.js

@@ -25732,7 +25732,7 @@ _Platform_export({'Runner':{'init':$author$project$Runner$main(
 				},
 				A2($elm$json$Json$Decode$field, 'fuzzRuns', $elm$json$Json$Decode$int));
 		},
-		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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: 4067606959, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1035103192, 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

@@ -75,19 +75,19 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 2;
+let workersCount = 10;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 4067606959,
+  initialSeed: 1035103192,
   fuzzRuns: 100,
-  mode: "consoleNoColor",
+  mode: "consoleColor",
   verbosity: verbosity,
   globs: [],
-  paths: ["/home/runner/work/elm-pages-v3-beta/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
+  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
 };
 reporter = Elm.Reporter.init({ flags: flags });
 

package/generator/review/elm-stuff/tests-0.19.1/js/Reporter.elm.js

@@ -6692,7 +6692,7 @@ _Platform_export({'Reporter':{'init':$author$project$Reporter$main(
 					'paths',
 					$elm$json$Json$Decode$list($elm$json$Json$Decode$string)));
 		},
-		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

package/generator/review/elm-stuff/tests-0.19.1/js/Runner.elm.js

@@ -27514,7 +27514,7 @@ _Platform_export({'Runner':{'init':$author$project$Runner$main(
 				},
 				A2($elm$json$Json$Decode$field, 'fuzzRuns', $elm$json$Json$Decode$int));
 		},
-		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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: 1129837679, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1889275192, 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

@@ -75,19 +75,19 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 2;
+let workersCount = 10;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1129837679,
+  initialSeed: 1889275192,
   fuzzRuns: 100,
-  mode: "consoleNoColor",
+  mode: "consoleColor",
   verbosity: verbosity,
   globs: [],
-  paths: ["/home/runner/work/elm-pages-v3-beta/elm-pages-v3-beta/generator/review/tests/Pages/Review/NoContractViolationsTest.elm"],
+  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/review/tests/Pages/Review/NoContractViolationsTest.elm"],
 };
 reporter = Elm.Reporter.init({ flags: flags });
 

package/generator/src/build.js

@@ -16,6 +16,7 @@ const { build } = require("vite");
 const preRenderHtml = require("./pre-render-html.js");
 const esbuild = require("esbuild");
 const { createHash } = require("crypto");
+const { merge_vite_configs } = require("./vite-utils.js");
 
 let pool = [];
 let pagesReady;
@@ -92,23 +93,25 @@ async function run(options) {
         );
         return {};
       });
-    const viteConfig = config.vite || {};
-
-    const buildComplete = build({
-      configFile: false,
-      root: process.cwd(),
-      base: options.base,
-      ssr: false,
-
-      build: {
-        manifest: true,
-        outDir: "dist",
-        rollupOptions: {
-          input: "elm-stuff/elm-pages/index.html",
+    const viteConfig = merge_vite_configs(
+      {
+        configFile: false,
+        root: process.cwd(),
+        base: options.base,
+        ssr: false,
+
+        build: {
+          manifest: true,
+          outDir: "dist",
+          rollupOptions: {
+            input: "elm-stuff/elm-pages/index.html",
+          },
         },
       },
-      ...viteConfig,
-    });
+      config.vite || {}
+    );
+
+    const buildComplete = build(viteConfig);
     const compileClientDone = compileElm(options);
     await buildComplete;
     await compileClientDone;

package/generator/src/dev-server.js

@@ -24,6 +24,7 @@ const busboy = require("busboy");
 const { createServer: createViteServer } = require("vite");
 const cliVersion = require("../../package.json").version;
 const esbuild = require("esbuild");
+const { merge_vite_configs } = require("./vite-utils.js");
 
 /**
  * @param {{ port: string; base: string; https: boolean; debug: boolean; }} options
@@ -131,13 +132,22 @@ async function start(options) {
       );
       return {};
     });
-  const vite = await createViteServer({
-    server: { middlewareMode: "ssr", base: options.base, port: options.port },
-    configFile: false,
-    root: process.cwd(),
-    base: options.base,
-    ...viteConfig,
-  });
+  const vite = await createViteServer(
+    merge_vite_configs(
+      {
+        server: {
+          middlewareMode: "ssr",
+          base: options.base,
+          port: options.port,
+        },
+        configFile: false,
+        root: process.cwd(),
+        base: options.base,
+      },
+
+      viteConfig
+    )
+  );
   esbuild
     .build({
       entryPoints: ["./port-data-source"],

package/generator/src/vite-utils.js

@@ -0,0 +1,78 @@
+/** This code is from https://github.com/sveltejs/kit/blob/3b457f67d4d7c59fc63bb3f600a490e4dacc2e62/packages/kit/src/exports/vite/utils.js */
+
+/**
+ * @param {...import('vite').UserConfig} configs
+ * @returns {import('vite').UserConfig}
+ */
+function merge_vite_configs(...configs) {
+  return deep_merge(
+    ...configs.map((config) => ({
+      ...config,
+      resolve: {
+        ...config.resolve,
+        alias: normalize_alias(config.resolve?.alias || {}),
+      },
+    }))
+  );
+}
+
+/**
+ * Takes zero or more objects and returns a new object that has all the values
+ * deeply merged together. None of the original objects will be mutated at any
+ * level, and the returned object will have no references to the original
+ * objects at any depth. If there's a conflict the last one wins, except for
+ * arrays which will be combined.
+ * @param {...Object} objects
+ * @returns {Record<string, any>} the merged object
+ */
+function deep_merge(...objects) {
+  const result = {};
+  /** @type {string[]} */
+  objects.forEach((o) => merge_into(result, o));
+  return result;
+}
+
+/**
+ * normalize kit.vite.resolve.alias as an array
+ * @param {import('vite').AliasOptions} o
+ * @returns {import('vite').Alias[]}
+ */
+function normalize_alias(o) {
+  if (Array.isArray(o)) return o;
+  return Object.entries(o).map(([find, replacement]) => ({
+    find,
+    replacement,
+  }));
+}
+
+/**
+ * Merges b into a, recursively, mutating a.
+ * @param {Record<string, any>} a
+ * @param {Record<string, any>} b
+ */
+function merge_into(a, b) {
+  /**
+   * Checks for "plain old Javascript object", typically made as an object
+   * literal. Excludes Arrays and built-in types like Buffer.
+   * @param {any} x
+   */
+  const is_plain_object = (x) =>
+    typeof x === "object" && x.constructor === Object;
+
+  for (const prop in b) {
+    if (is_plain_object(b[prop])) {
+      if (!is_plain_object(a[prop])) {
+        a[prop] = {};
+      }
+      merge_into(a[prop], b[prop]);
+    } else if (Array.isArray(b[prop])) {
+      if (!Array.isArray(a[prop])) {
+        a[prop] = [];
+      }
+      a[prop].push(...b[prop]);
+    } else {
+      a[prop] = b[prop];
+    }
+  }
+}
+module.exports = { merge_vite_configs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -45,7 +45,7 @@
     "object-hash": "^2.2.0",
     "serve-static": "^1.15.0",
     "terser": "^5.14.2",
-    "vite": "^3.0.9",
+    "vite": "^3.1.8",
     "which": "^2.0.2"
   },
   "devDependencies": {

package/src/Pages/Generate.elm

@@ -1,8 +1,28 @@
-module Pages.Generate exposing (Type(..), serverRender, buildWithLocalState, buildNoState, Builder)
+module Pages.Generate exposing
+    ( buildWithLocalState, buildNoState, Builder
+    , Type(..)
+    , serverRender
+    , preRender, single
+    )
 
 {-|
 
-@docs Type, serverRender, buildWithLocalState, buildNoState, Builder
+
+## Initializing the Generator Builder
+
+@docs buildWithLocalState, buildNoState, Builder
+
+@docs Type
+
+
+## Generating Server-Rendered Pages
+
+@docs serverRender
+
+
+## Generating pre-rendered pages
+
+@docs preRender, single
 
 -}
 
@@ -30,12 +50,18 @@ typeToDeclaration name type_ =
 
 {-| -}
 type Builder
-    = Builder
+    = ServerRender
         { data : ( Type, Elm.Expression -> Elm.Expression )
         , action : ( Type, Elm.Expression -> Elm.Expression )
         , head : Elm.Expression -> Elm.Expression
         , moduleName : List String
         }
+    | PreRender
+        { data : ( Type, Elm.Expression -> Elm.Expression )
+        , pages : Maybe Elm.Expression
+        , head : Elm.Expression -> Elm.Expression
+        , moduleName : List String
+        }
 
 
 {-| -}
@@ -47,7 +73,56 @@ serverRender :
     }
     -> Builder
 serverRender =
-    Builder
+    ServerRender
+
+
+{-| -}
+preRender :
+    { data : ( Type, Elm.Expression -> Elm.Expression )
+    , pages : Elm.Expression
+    , head : Elm.Expression -> Elm.Expression
+    , moduleName : List String
+    }
+    -> Builder
+preRender input =
+    --let
+    --    hasDynamicRouteSegments : Bool
+    --    hasDynamicRouteSegments =
+    --        RoutePattern.fromModuleName input.moduleName
+    --            -- TODO give error if not parseable here
+    --            |> Maybe.map RoutePattern.hasRouteParams
+    --            |> Maybe.withDefault False
+    --in
+    PreRender
+        { data = input.data
+        , pages =
+            input.pages
+                |> Elm.withType
+                    (Elm.Annotation.namedWith [ "DataSource" ]
+                        "DataSource"
+                        [ Elm.Annotation.list <| Elm.Annotation.named [] "RouteParams"
+                        ]
+                    )
+                |> Just
+        , head = input.head
+        , moduleName = input.moduleName
+        }
+
+
+{-| -}
+single :
+    { data : ( Type, Elm.Expression )
+    , head : Elm.Expression -> Elm.Expression
+    , moduleName : List String
+    }
+    -> Builder
+single input =
+    PreRender
+        { data = ( Tuple.first input.data, \_ -> Tuple.second input.data )
+        , pages = Nothing
+        , head = input.head
+        , moduleName = input.moduleName
+        }
 
 
 {-| -}
@@ -56,20 +131,42 @@ buildNoState :
     }
     -> Builder
     -> Elm.File
-buildNoState definitions (Builder builder) =
-    userFunction builder.moduleName
-        { view = \_ -> definitions.view
-        , localState = Nothing
-        , data = builder.data |> Tuple.second
-        , action = builder.action |> Tuple.second
-        , head = builder.head
-        , types =
-            { model = Alias (Elm.Annotation.record [])
-            , msg = Alias Elm.Annotation.unit
-            , data = builder.data |> Tuple.first
-            , actionData = builder.action |> Tuple.first
-            }
-        }
+buildNoState definitions builder_ =
+    case builder_ of
+        ServerRender builder ->
+            userFunction builder.moduleName
+                { view = \_ -> definitions.view
+                , localState = Nothing
+                , data = builder.data |> Tuple.second
+                , action = builder.action |> Tuple.second |> Action
+                , head = builder.head
+                , types =
+                    { model = Alias (Elm.Annotation.record [])
+                    , msg = Alias Elm.Annotation.unit
+                    , data = builder.data |> Tuple.first
+                    , actionData = builder.action |> Tuple.first
+                    }
+                }
+
+        PreRender builder ->
+            userFunction builder.moduleName
+                { view = \_ -> definitions.view
+                , localState = Nothing
+                , data = builder.data |> Tuple.second
+                , action = builder.pages |> Pages
+                , head = builder.head
+                , types =
+                    { model = Alias (Elm.Annotation.record [])
+                    , msg = Alias Elm.Annotation.unit
+                    , data = builder.data |> Tuple.first
+                    , actionData =
+                        Elm.Annotation.namedWith [ "DataSource" ]
+                            "DataSource"
+                            [ Elm.Annotation.list (Elm.Annotation.named [] "RouteParams")
+                            ]
+                            |> Alias
+                    }
+                }
 
 
 {-| -}
@@ -83,25 +180,57 @@ buildWithLocalState :
     }
     -> Builder
     -> Elm.File
-buildWithLocalState definitions (Builder builder) =
-    userFunction builder.moduleName
-        { view = definitions.view
-        , localState =
-            Just
-                { update = definitions.update
-                , init = definitions.init
-                , subscriptions = definitions.subscriptions
+buildWithLocalState definitions builder_ =
+    case builder_ of
+        ServerRender builder ->
+            userFunction builder.moduleName
+                { view = definitions.view
+                , localState =
+                    Just
+                        { update = definitions.update
+                        , init = definitions.init
+                        , subscriptions = definitions.subscriptions
+                        }
+                , data = builder.data |> Tuple.second
+                , action = builder.action |> Tuple.second |> Action
+                , head = builder.head
+                , types =
+                    { model = definitions.model
+                    , msg = definitions.msg
+                    , data = builder.data |> Tuple.first
+                    , actionData = builder.action |> Tuple.first
+                    }
+                }
+
+        PreRender builder ->
+            userFunction builder.moduleName
+                { view = definitions.view
+                , localState =
+                    Just
+                        { update = definitions.update
+                        , init = definitions.init
+                        , subscriptions = definitions.subscriptions
+                        }
+                , data = builder.data |> Tuple.second
+                , action = builder.pages |> Pages
+                , head = builder.head
+                , types =
+                    { model = definitions.model
+                    , msg = definitions.msg
+                    , data = builder.data |> Tuple.first
+                    , actionData =
+                        Elm.Annotation.namedWith [ "DataSource" ]
+                            "DataSource"
+                            [ Elm.Annotation.list (Elm.Annotation.named [] "RouteParams")
+                            ]
+                            |> Alias
+                    }
                 }
-        , data = builder.data |> Tuple.second
-        , action = builder.action |> Tuple.second
-        , head = builder.head
-        , types =
-            { model = definitions.model
-            , msg = definitions.msg
-            , data = builder.data |> Tuple.first
-            , actionData = builder.action |> Tuple.first
-            }
-        }
+
+
+type ActionOrPages
+    = Action (Elm.Expression -> Elm.Expression)
+    | Pages (Maybe Elm.Expression)
 
 
 {-| -}
@@ -116,7 +245,7 @@ userFunction :
                 , subscriptions : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
                 }
         , data : Elm.Expression -> Elm.Expression
-        , action : Elm.Expression -> Elm.Expression
+        , action : ActionOrPages
         , head : Elm.Expression -> Elm.Expression
         , types : { model : Type, msg : Type, data : Type, actionData : Type }
         }
@@ -225,25 +354,84 @@ userFunction moduleName definitions =
                         }
                     )
 
-        dataFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression }
+        dataFn : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
         dataFn =
-            Elm.Declare.fn "data"
-                ( "routeParams"
-                , "RouteParams"
-                    |> Elm.Annotation.named []
-                    |> Just
-                )
-                (definitions.data >> Elm.withType (myType "Data"))
+            case definitions.action of
+                Pages Nothing ->
+                    Elm.Declare.function "data"
+                        []
+                        (\_ ->
+                            definitions.data Elm.unit
+                                |> Elm.withType
+                                    (case definitions.action of
+                                        Pages _ ->
+                                            Elm.Annotation.namedWith [ "DataSource" ]
+                                                "DataSource"
+                                                [ Elm.Annotation.named [] "Data"
+                                                ]
+
+                                        Action _ ->
+                                            myType "Data"
+                                    )
+                        )
 
-        actionFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression }
+                _ ->
+                    Elm.Declare.function "data"
+                        [ ( "routeParams"
+                          , "RouteParams"
+                                |> Elm.Annotation.named []
+                                |> Just
+                          )
+                        ]
+                        (\args ->
+                            case args of
+                                [ arg ] ->
+                                    definitions.data arg
+                                        |> Elm.withType
+                                            (case definitions.action of
+                                                Pages _ ->
+                                                    Elm.Annotation.namedWith [ "DataSource" ]
+                                                        "DataSource"
+                                                        [ Elm.Annotation.named [] "Data"
+                                                        ]
+
+                                                Action _ ->
+                                                    myType "Data"
+                                            )
+
+                                _ ->
+                                    Elm.unit
+                        )
+
+        actionFn : Maybe { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
         actionFn =
-            Elm.Declare.fn "action"
-                ( "routeParams"
-                , "RouteParams"
-                    |> Elm.Annotation.named []
-                    |> Just
-                )
-                (definitions.action >> Elm.withType (myType "ActionData"))
+            case definitions.action of
+                Action action_ ->
+                    Elm.Declare.function "action"
+                        [ ( "routeParams"
+                          , "RouteParams"
+                                |> Elm.Annotation.named []
+                                |> Just
+                          )
+                        ]
+                        (\args ->
+                            case args of
+                                [ arg ] ->
+                                    action_ arg |> Elm.withType (myType "ActionData")
+
+                                _ ->
+                                    Elm.unit
+                        )
+                        |> Just
+
+                Pages pages_ ->
+                    pages_
+                        |> Maybe.map
+                            (\justPagesExpression ->
+                                Elm.Declare.function "pages"
+                                    []
+                                    (\_ -> justPagesExpression)
+                            )
 
         headFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression }
         headFn =
@@ -268,49 +456,87 @@ userFunction moduleName definitions =
                 )
             )
          , Elm.declaration "route"
-            (serverRender_
-                { action =
-                    \routeParams ->
-                        actionFn.call routeParams
-                            |> Elm.withType (myType "ActionData")
-                , data =
-                    \routeParams ->
-                        dataFn.call routeParams
-                            |> Elm.withType (myType "Data")
-                , head = headFn.call
-                }
-                |> (case localDefinitions of
-                        Just local ->
-                            buildWithLocalState_
-                                { view = viewFn.call
-                                , update = local.updateFn.call
-                                , init = local.initFn.call
-                                , subscriptions = local.subscriptionsFn.call
-                                }
-                                >> Elm.withType
-                                    (Elm.Annotation.namedWith [ "RouteBuilder" ]
-                                        "StatefulRoute"
-                                        [ localType "RouteParams"
-                                        , localType "Data"
-                                        , localType "ActionData"
-                                        , localType "Model"
-                                        , localType "Msg"
-                                        ]
-                                    )
+            (case definitions.action of
+                Action _ ->
+                    serverRender_
+                        { action =
+                            \routeParams ->
+                                actionFn
+                                    |> Maybe.map
+                                        (\justActionFn ->
+                                            justActionFn.call [ routeParams ]
+                                                |> Elm.withType (myType "ActionData")
+                                        )
+                                    |> Maybe.withDefault Elm.unit
+                        , data =
+                            \routeParams ->
+                                dataFn.call [ routeParams ]
+                                    |> Elm.withType (myType "Data")
+                        , head = headFn.call
+                        }
 
+                Pages _ ->
+                    (case actionFn of
                         Nothing ->
-                            buildNoState_
-                                { view = viewFn.call Elm.unit
+                            single_
+                                { data =
+                                    dataFn.call []
+                                        |> Elm.withType
+                                            (Elm.Annotation.namedWith [ "DataSource" ]
+                                                "DataSource"
+                                                [ Elm.Annotation.named [] "Data"
+                                                ]
+                                            )
+                                , head = headFn.call
                                 }
-                                >> Elm.withType
-                                    (Elm.Annotation.namedWith [ "RouteBuilder" ]
-                                        "StatelessRoute"
-                                        [ localType "RouteParams"
-                                        , localType "Data"
-                                        , localType "ActionData"
-                                        ]
-                                    )
-                   )
+
+                        Just justActionFn ->
+                            preRender_
+                                { pages = justActionFn.call []
+                                , data =
+                                    \routeParams ->
+                                        dataFn.call [ routeParams ]
+                                            |> Elm.withType
+                                                (Elm.Annotation.namedWith [ "DataSource" ]
+                                                    "DataSource"
+                                                    [ Elm.Annotation.named [] "Data"
+                                                    ]
+                                                )
+                                , head = headFn.call
+                                }
+                    )
+                        |> (case localDefinitions of
+                                Just local ->
+                                    buildWithLocalState_
+                                        { view = viewFn.call
+                                        , update = local.updateFn.call
+                                        , init = local.initFn.call
+                                        , subscriptions = local.subscriptionsFn.call
+                                        }
+                                        >> Elm.withType
+                                            (Elm.Annotation.namedWith [ "RouteBuilder" ]
+                                                "StatefulRoute"
+                                                [ localType "RouteParams"
+                                                , localType "Data"
+                                                , localType "ActionData"
+                                                , localType "Model"
+                                                , localType "Msg"
+                                                ]
+                                            )
+
+                                Nothing ->
+                                    buildNoState_
+                                        { view = viewFn.call Elm.unit
+                                        }
+                                        >> Elm.withType
+                                            (Elm.Annotation.namedWith [ "RouteBuilder" ]
+                                                "StatelessRoute"
+                                                [ localType "RouteParams"
+                                                , localType "Data"
+                                                , localType "ActionData"
+                                                ]
+                                            )
+                           )
             )
          ]
             ++ (case localDefinitions of
@@ -326,10 +552,13 @@ userFunction moduleName definitions =
             ++ [ definitions.types.data |> typeToDeclaration "Data"
                , definitions.types.actionData |> typeToDeclaration "ActionData"
                , dataFn.declaration
-               , actionFn.declaration
                , headFn.declaration
                , viewFn.declaration
                ]
+            ++ ([ actionFn |> Maybe.map .declaration
+                ]
+                    |> List.filterMap identity
+               )
         )
 
 
@@ -463,6 +692,128 @@ serverRender_ serverRenderArg =
         ]
 
 
+preRender_ :
+    { data : Elm.Expression -> Elm.Expression
+    , pages : Elm.Expression
+    , head : Elm.Expression -> Elm.Expression
+    }
+    -> Elm.Expression
+preRender_ serverRenderArg =
+    Elm.apply
+        (Elm.value
+            { importFrom = [ "RouteBuilder" ]
+            , name = "preRender"
+            , annotation =
+                Just
+                    (Elm.Annotation.function
+                        [ Elm.Annotation.record
+                            [ ( "data"
+                              , Elm.Annotation.function
+                                    [ Elm.Annotation.var "routeParams" ]
+                                    (Elm.Annotation.namedWith
+                                        [ "DataSource" ]
+                                        "DataSource"
+                                        [ Elm.Annotation.var "data"
+                                        ]
+                                    )
+                              )
+                            , ( "pages"
+                              , Elm.Annotation.namedWith
+                                    [ "DataSource" ]
+                                    "DataSource"
+                                    [ Elm.Annotation.list (Elm.Annotation.named [] "RouteParams")
+                                    ]
+                              )
+                            , ( "head"
+                              , Elm.Annotation.function
+                                    [ Elm.Annotation.namedWith
+                                        [ "RouteBuilder" ]
+                                        "StaticPayload"
+                                        [ Elm.Annotation.var "data"
+                                        , Elm.Annotation.var "action"
+                                        , Elm.Annotation.var "routeParams"
+                                        ]
+                                    ]
+                                    (Elm.Annotation.list
+                                        (Elm.Annotation.namedWith [ "Head" ] "Tag" [])
+                                    )
+                              )
+                            ]
+                        ]
+                        (Elm.Annotation.namedWith
+                            [ "RouteBuilder" ]
+                            "Builder"
+                            [ Elm.Annotation.named [] "RouteParams"
+                            , Elm.Annotation.named [] "Data"
+                            , Elm.Annotation.named [] "Action"
+                            ]
+                        )
+                    )
+            }
+        )
+        [ Elm.record
+            [ Tuple.pair "data" (Elm.functionReduced "serverRenderUnpack" serverRenderArg.data)
+            , Tuple.pair "pages" serverRenderArg.pages
+            , Tuple.pair "head" (Elm.functionReduced "serverRenderUnpack" serverRenderArg.head)
+            ]
+        ]
+
+
+single_ :
+    { data : Elm.Expression
+    , head : Elm.Expression -> Elm.Expression
+    }
+    -> Elm.Expression
+single_ serverRenderArg =
+    Elm.apply
+        (Elm.value
+            { importFrom = [ "RouteBuilder" ]
+            , name = "single"
+            , annotation =
+                Just
+                    (Elm.Annotation.function
+                        [ Elm.Annotation.record
+                            [ ( "data"
+                              , Elm.Annotation.namedWith
+                                    [ "DataSource" ]
+                                    "DataSource"
+                                    [ Elm.Annotation.var "data"
+                                    ]
+                              )
+                            , ( "head"
+                              , Elm.Annotation.function
+                                    [ Elm.Annotation.namedWith
+                                        [ "RouteBuilder" ]
+                                        "StaticPayload"
+                                        [ Elm.Annotation.var "data"
+                                        , Elm.Annotation.var "action"
+                                        , Elm.Annotation.var "routeParams"
+                                        ]
+                                    ]
+                                    (Elm.Annotation.list
+                                        (Elm.Annotation.namedWith [ "Head" ] "Tag" [])
+                                    )
+                              )
+                            ]
+                        ]
+                        (Elm.Annotation.namedWith
+                            [ "RouteBuilder" ]
+                            "Builder"
+                            [ Elm.Annotation.named [] "RouteParams"
+                            , Elm.Annotation.named [] "Data"
+                            , Elm.Annotation.named [] "Action"
+                            ]
+                        )
+                    )
+            }
+        )
+        [ Elm.record
+            [ Tuple.pair "data" serverRenderArg.data
+            , Tuple.pair "head" (Elm.functionReduced "serverRenderUnpack" serverRenderArg.head)
+            ]
+        ]
+
+
 buildWithLocalState_ :
     { view :
         Elm.Expression

package/src/Pages/Internal/Platform.elm

@@ -423,9 +423,7 @@ update config appMsg model =
                         )
 
                     else
-                        ( { model
-                            | url = url
-                          }
+                        ( model
                         , NoEffect
                         )
                             -- TODO is it reasonable to always re-fetch route data if you re-navigate to the current route? Might be a good
@@ -605,27 +603,32 @@ update config appMsg model =
                                 , actionData = newActionData
                                 }
 
-                            ( userModel, _ ) =
+                            ( userModel, userEffect ) =
                                 -- TODO if urlWithoutRedirectResolution is different from the url with redirect resolution, then
                                 -- instead of calling update, call pushUrl (I think?)
                                 -- TODO include user Cmd
-                                config.update model.pageFormState
-                                    (model.inFlightFetchers |> toFetcherState)
-                                    (model.transition |> Maybe.map Tuple.second)
-                                    newSharedData
-                                    newPageData
-                                    model.key
-                                    (config.onPageChange
-                                        { protocol = model.url.protocol
-                                        , host = model.url.host
-                                        , port_ = model.url.port_
-                                        , path = urlPathToPath urlWithoutRedirectResolution
-                                        , query = urlWithoutRedirectResolution.query
-                                        , fragment = urlWithoutRedirectResolution.fragment
-                                        , metadata = config.urlToRoute urlWithoutRedirectResolution
-                                        }
-                                    )
-                                    previousPageData.userModel
+                                if stayingOnSamePath then
+                                    ( previousPageData.userModel, NoEffect )
+
+                                else
+                                    config.update model.pageFormState
+                                        (model.inFlightFetchers |> toFetcherState)
+                                        (model.transition |> Maybe.map Tuple.second)
+                                        newSharedData
+                                        newPageData
+                                        model.key
+                                        (config.onPageChange
+                                            { protocol = model.url.protocol
+                                            , host = model.url.host
+                                            , port_ = model.url.port_
+                                            , path = urlPathToPath urlWithoutRedirectResolution
+                                            , query = urlWithoutRedirectResolution.query
+                                            , fragment = urlWithoutRedirectResolution.fragment
+                                            , metadata = config.urlToRoute urlWithoutRedirectResolution
+                                            }
+                                        )
+                                        previousPageData.userModel
+                                        |> Tuple.mapSecond UserCmd
 
                             updatedModel : Model userModel pageData actionData sharedData
                             updatedModel =
@@ -656,10 +659,13 @@ update config appMsg model =
                             , currentPath = newUrl.path
                           }
                         , if not stayingOnSamePath && scrollToTopWhenDone then
-                            ScrollToTop
+                            Batch
+                                [ ScrollToTop
+                                , userEffect
+                                ]
 
                           else
-                            NoEffect
+                            userEffect
                         )
                             |> (case maybeUserMsg of
                                     Just userMsg ->
@@ -1392,7 +1398,8 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
                     , actionData = newActionData
                     }
 
-                ( userModel, _ ) =
+                -- TODO use userEffect here?
+                ( userModel, userEffect ) =
                     -- TODO if urlWithoutRedirectResolution is different from the url with redirect resolution, then
                     -- instead of calling update, call pushUrl (I think?)
                     -- TODO include user Cmd