elm-pages 3.0.0-beta.20 → 3.0.0-beta.21

package/generator/review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision10/install/elm.json

@@ -0,0 +1,25 @@
+{
+    "type": "application",
+    "source-directories": [
+        "."
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "elm/core": "1.0.5",
+            "elm/json": "1.1.3",
+            "elm-explorations/test": "2.1.0"
+        },
+        "indirect": {
+            "elm/bytes": "1.0.8",
+            "elm/html": "1.0.0",
+            "elm/random": "1.0.0",
+            "elm/time": "1.0.0",
+            "elm/virtual-dom": "1.0.3"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

package/generator/review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision7/install/elm.json

@@ -0,0 +1,41 @@
+{
+    "type": "application",
+    "source-directories": [
+        "."
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "elm/core": "1.0.5",
+            "elm/html": "1.0.0",
+            "elm/regex": "1.0.0",
+            "elm-community/result-extra": "2.4.0",
+            "elm-explorations/test": "2.0.1",
+            "jfmengels/elm-review": "2.10.0",
+            "mdgriffith/elm-codegen": "2.0.0",
+            "stil4m/elm-syntax": "7.2.9",
+            "the-sett/elm-syntax-dsl": "6.0.2"
+        },
+        "indirect": {
+            "Chadtech/elm-bool-extra": "2.4.2",
+            "elm/bytes": "1.0.8",
+            "elm/json": "1.1.3",
+            "elm/parser": "1.1.0",
+            "elm/project-metadata-utils": "1.0.2",
+            "elm/random": "1.0.0",
+            "elm/time": "1.0.0",
+            "elm/virtual-dom": "1.0.3",
+            "elm-community/basics-extra": "4.1.0",
+            "elm-community/list-extra": "8.7.0",
+            "elm-community/maybe-extra": "5.3.0",
+            "miniBill/elm-unicode": "1.0.2",
+            "rtfeldman/elm-hex": "1.0.0",
+            "stil4m/structured-writer": "1.0.3",
+            "the-sett/elm-pretty-printer": "3.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

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

@@ -7897,7 +7897,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

@@ -29498,7 +29498,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: 939943801, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1807620680, 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: 939943801,
+  initialSeed: 1807620680,
   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/cli.js

@@ -17,15 +17,13 @@ import * as url from "url";
 
 import * as commander from "commander";
 import { runElmCodegenInstall } from "./elm-codegen.js";
+import { packageVersion } from "./compatibility-key.js";
 
 const Argument = commander.Argument;
 const Option = commander.Option;
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import * as packageJson from "../../package.json" assert { type: "json" };
-const packageVersion = packageJson.version;
-
 async function main() {
   const program = new commander.Command();
 
@@ -178,7 +176,9 @@ async function main() {
         );
         await renderer.runGenerator(
           unprocessedCliOptions,
-          await import(url.pathToFileURL(path.resolve(portsPath)).href),
+          portsPath
+            ? await import(url.pathToFileURL(path.resolve(portsPath)).href)
+            : null,
           await requireElm("./script/elm-stuff/elm-pages/elm.cjs"),
           moduleName
         );
@@ -251,9 +251,17 @@ async function main() {
           "./script/elm-stuff/elm-pages/elm.js",
           "./script/elm-stuff/elm-pages/elm.cjs"
         );
-        const scriptRunner = `import * as customBackendTask from "${path.resolve(
-          "./custom-backend-task.ts"
-        )}";
+        // TODO allow no custom-backend-task
+        const portBackendTaskFileFound =
+          globbySync("./custom-backend-task.*").length > 0;
+
+        const scriptRunner = `${
+          portBackendTaskFileFound
+            ? `import * as customBackendTask from "${path.resolve(
+                "./custom-backend-task"
+              )}";`
+            : "const customBackendTask = {};"
+        }
 import * as renderer from "./render.js";
 import { default as Elm } from "${path.resolve(
           "./script/elm-stuff/elm-pages/elm.cjs"

package/generator/src/compatibility-key.js

@@ -1 +1,3 @@
-export const compatibilityKey = 6;
+export const compatibilityKey = 7;
+
+export const packageVersion = "3.0.0-beta.21";

package/generator/src/dev-server.js

@@ -27,10 +27,8 @@ import { merge_vite_configs } from "./vite-utils.js";
 import { templateHtml } from "./pre-render-html.js";
 import { resolveConfig } from "./config.js";
 import { globbySync } from "globby";
-import * as packageJson from "../../package.json" assert { type: "json" };
 import { fileURLToPath } from "url";
 
-const cliVersion = packageJson.version;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -41,16 +39,6 @@ export async function start(options) {
   let threadReadyQueue = [];
   let pool = [];
 
-  function restartPool() {
-    pool.forEach((thread) => thread.worker.terminate());
-    const poolSize = Math.max(1, cpuCount / 2 - 1);
-    pool = [];
-
-    for (let index = 0; index < poolSize; index++) {
-      pool.push(initWorker(options.base));
-    }
-  }
-
   ensureDirSync(path.join(process.cwd(), ".elm-pages", "http-response-cache"));
   const cpuCount = os.cpus().length;
 
@@ -275,7 +263,6 @@ export async function start(options) {
           }
         }
         elmMakeRunning = true;
-        restartPool();
         if (codegenError) {
           const errorJson = JSON.stringify({
             type: "compile-errors",

package/generator/src/pre-render-html.js

@@ -1,9 +1,7 @@
 import * as seo from "./seo-renderer.js";
-import * as packageJson from "../../package.json" assert { type: "json" };
-import * as path from "path";
-import { fileURLToPath } from "url";
-
-const cliVersion = packageJson.version;
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { packageVersion } from "./compatibility-key.js";
 
 /** @typedef { { head: any[]; errors: any[]; html: string; route: string; title: string; } } Arg */
 /** @typedef { { tag : 'PageProgress'; args : Arg[] } } PageProgress */
@@ -47,7 +45,7 @@ export function templateHtml(devMode, userHeadTagsTemplate) {
             "../static-code/elm-pages.js"
           )}" type="module"></script>`
     }
-    ${indent(userHeadTagsTemplate({ cliVersion }))}
+    ${indent(userHeadTagsTemplate({ cliVersion: packageVersion }))}
     <!-- PLACEHOLDER_HEAD_AND_DATA -->
   </head>
   <body>

package/generator/src/render-worker.js

@@ -4,7 +4,7 @@ import * as fs from "./dir-helpers.js";
 import { readFileSync, writeFileSync } from "node:fs";
 import { stat } from "fs/promises";
 import { parentPort, threadId, workerData } from "node:worker_threads";
-import * as url from "url";
+import * as url from "node:url";
 
 async function run({ mode, pathname, serverRequest, portsFilePath }) {
   console.time(`${threadId} ${pathname}`);
@@ -49,6 +49,9 @@ async function requireElm(mode) {
     "elm-stuff/elm-pages/elm.cjs"
   );
   let elmImportPath = compiledElmPath;
+  let pathAsUrl = url.pathToFileURL(compiledElmPath);
+  const changedTime = (await stat(compiledElmPath)).mtimeMs;
+  pathAsUrl.searchParams.append("changed", `${changedTime}`);
   const warnOriginal = console.warn;
   console.warn = function () {};
   const Elm = (await import(elmImportPath)).default;

package/generator/src/request-cache.js

@@ -92,20 +92,44 @@ export function lookupOrPerform(
             }),
           });
         } else {
+          console.time(`BackendTask.Custom.run "${portName}"`);
           try {
             resolve({
               kind: "response-json",
-              value: jsonResponse(await portBackendTask[portName](input)),
+              value: jsonResponse(
+                toElmJson(await portBackendTask[portName](input))
+              ),
             });
           } catch (portCallError) {
-            resolve({
-              kind: "response-json",
-              value: jsonResponse({
-                "elm-pages-internal-error": "CustomBackendTaskException",
-                error: portCallError,
-              }),
-            });
+            if (portCallError instanceof Error) {
+              resolve({
+                kind: "response-json",
+                value: jsonResponse({
+                  "elm-pages-internal-error": "NonJsonException",
+                  error: portCallError.message,
+                  stack: portCallError.stack || null,
+                }),
+              });
+            }
+            try {
+              resolve({
+                kind: "response-json",
+                value: jsonResponse({
+                  "elm-pages-internal-error": "CustomBackendTaskException",
+                  error: JSON.parse(JSON.stringify(portCallError, null, 0)),
+                }),
+              });
+            } catch (jsonDecodeError) {
+              resolve({
+                kind: "response-json",
+                value: jsonResponse({
+                  "elm-pages-internal-error": "NonJsonException",
+                  error: portCallError.toString(),
+                }),
+              });
+            }
           }
+          console.timeEnd(`BackendTask.Custom.run "${portName}"`);
         }
       } catch (error) {
         console.trace(error);
@@ -189,6 +213,33 @@ export function lookupOrPerform(
   });
 }
 
+/**
+ * @param {unknown} obj
+ * @returns {JSON}
+ */
+function toElmJson(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(toElmJson);
+  } else if (typeof obj === "object") {
+    for (let key in obj) {
+      const value = obj[key];
+      if (typeof value === "undefined") {
+        obj[key] = null;
+      } else if (value instanceof Date) {
+        obj[key] = {
+          "__elm-pages-normalized__": {
+            kind: "Date",
+            value: Math.floor(value.getTime()),
+          },
+        };
+        // } else if (value instanceof Object) {
+        //   toElmJson(obj);
+      }
+    }
+  }
+  return obj;
+}
+
 /**
  * @param {{url: string; headers: {[x: string]: string}; method: string; body: Body } } elmRequest
  */

package/generator/template/app/Api.elm

@@ -1,16 +1,17 @@
 module Api exposing (routes)
 
-import ApiRoute exposing (ApiRoute)
+import ApiRoute
 import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Html exposing (Html)
 import Pages.Manifest as Manifest
 import Route exposing (Route)
 
 
 routes :
-    BackendTask (List Route)
+    BackendTask FatalError (List Route)
     -> (Maybe { indent : Int, newLines : Bool } -> Html Never -> String)
-    -> List (ApiRoute ApiRoute.Response)
+    -> List (ApiRoute.ApiRoute ApiRoute.Response)
 routes getStaticRoutes htmlToString =
     []
 

package/generator/template/app/Effect.elm

@@ -0,0 +1,123 @@
+module Effect exposing (Effect(..), batch, fromCmd, map, none, perform)
+
+import Browser.Navigation
+import Form.FormData exposing (FormData)
+import Http
+import Json.Decode as Decode
+import Pages.Fetcher
+import Url exposing (Url)
+
+
+type Effect msg
+    = None
+    | Cmd (Cmd msg)
+    | Batch (List (Effect msg))
+    | SetField { formId : String, name : String, value : String }
+    | FetchRouteData
+        { data : Maybe FormData
+        , toMsg : Result Http.Error Url -> msg
+        }
+    | Submit
+        { values : FormData
+        , toMsg : Result Http.Error Url -> msg
+        }
+    | SubmitFetcher (Pages.Fetcher.Fetcher msg)
+
+
+type alias RequestInfo =
+    { contentType : String
+    , body : String
+    }
+
+
+none : Effect msg
+none =
+    None
+
+
+batch : List (Effect msg) -> Effect msg
+batch =
+    Batch
+
+
+fromCmd : Cmd msg -> Effect msg
+fromCmd =
+    Cmd
+
+
+map : (a -> b) -> Effect a -> Effect b
+map fn effect =
+    case effect of
+        None ->
+            None
+
+        Cmd cmd ->
+            Cmd (Cmd.map fn cmd)
+
+        Batch list ->
+            Batch (List.map (map fn) list)
+
+        FetchRouteData fetchInfo ->
+            FetchRouteData
+                { data = fetchInfo.data
+                , toMsg = fetchInfo.toMsg >> fn
+                }
+
+        Submit fetchInfo ->
+            Submit
+                { values = fetchInfo.values
+                , toMsg = fetchInfo.toMsg >> fn
+                }
+
+        SetField info ->
+            SetField info
+
+        SubmitFetcher fetcher ->
+            fetcher
+                |> Pages.Fetcher.map fn
+                |> SubmitFetcher
+
+
+perform :
+    { fetchRouteData :
+        { data : Maybe FormData
+        , toMsg : Result Http.Error Url -> pageMsg
+        }
+        -> Cmd msg
+    , submit :
+        { values : FormData
+        , toMsg : Result Http.Error Url -> pageMsg
+        }
+        -> Cmd msg
+    , runFetcher :
+        Pages.Fetcher.Fetcher pageMsg
+        -> Cmd msg
+    , fromPageMsg : pageMsg -> msg
+    , key : Browser.Navigation.Key
+    , setField : { formId : String, name : String, value : String } -> Cmd msg
+    }
+    -> Effect pageMsg
+    -> Cmd msg
+perform ({ fromPageMsg, key } as helpers) effect =
+    case effect of
+        None ->
+            Cmd.none
+
+        Cmd cmd ->
+            Cmd.map fromPageMsg cmd
+
+        SetField info ->
+            helpers.setField info
+
+        Batch list ->
+            Cmd.batch (List.map (perform helpers) list)
+
+        FetchRouteData fetchInfo ->
+            helpers.fetchRouteData
+                fetchInfo
+
+        Submit record ->
+            helpers.submit record
+
+        SubmitFetcher record ->
+            helpers.runFetcher record

package/generator/template/app/ErrorPage.elm

@@ -1,6 +1,36 @@
-module ErrorPage exposing (ErrorPage(..), internalError, notFound, statusCode, view)
+module ErrorPage exposing (ErrorPage(..), Model, Msg, head, init, internalError, notFound, statusCode, update, view)
 
+import Effect exposing (Effect)
+import Head
 import Html exposing (Html)
+import View exposing (View)
+
+
+type Msg
+    = NoOp
+
+
+type alias Model =
+    {}
+
+
+init : ErrorPage -> ( Model, Effect Msg )
+init errorPage =
+    ( {}
+    , Effect.none
+    )
+
+
+update : ErrorPage -> Msg -> Model -> ( Model, Effect Msg )
+update errorPage msg model =
+    case msg of
+        NoOp ->
+            ( {}, Effect.none )
+
+
+head : ErrorPage -> List Head.Tag
+head errorPage =
+    []
 
 
 type ErrorPage
@@ -18,13 +48,14 @@ internalError =
     InternalError
 
 
-view : ErrorPage -> { body : Html msg, title : String }
-view error =
+view : ErrorPage -> Model -> View Msg
+view error model =
     { body =
-        Html.div []
-            [ Html.text "Hi! This is a NotFound error"
+        [ Html.div []
+            [ Html.p [] [ Html.text "Page not found. Maybe try another URL?" ]
             ]
-    , title = "Error"
+        ]
+    , title = "Page Not Found"
     }
 
 

package/generator/template/app/Route/Index.elm

@@ -1,14 +1,17 @@
-module Route.Index exposing (Data, Model, Msg, route)
+module Route.Index exposing (ActionData, Data, Model, Msg, route)
 
 import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
 import Head.Seo as Seo
 import Html
-import Html.Attributes as Attr
+import Html.Styled.Attributes as Attr
+import Pages.Msg
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
 import Path
-import RouteBuilder exposing (StatelessRoute, StaticPayload)
+import Route
+import RouteBuilder exposing (StatefulRoute, StatelessRoute, StaticPayload)
 import Shared
 import View exposing (View)
 
@@ -25,7 +28,7 @@ type alias RouteParams =
     {}
 
 
-type alias Data =
+type alias ActionData =
     {}
 
 
@@ -38,9 +41,13 @@ route =
         |> RouteBuilder.buildNoState { view = view }
 
 
-data : BackendTask Data
+type alias Data =
+    ()
+
+
+data : BackendTask FatalError Data
 data =
-    BackendTask.succeed Data
+    BackendTask.succeed ()
 
 
 head :
@@ -67,7 +74,7 @@ view :
     Maybe PageUrl
     -> Shared.Model
     -> StaticPayload Data ActionData RouteParams
-    -> View Msg
+    -> View (Pages.Msg.Msg Msg)
 view maybeUrl sharedModel static =
     { title = "elm-pages is running"
     , body =