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

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

@@ -0,0 +1,110 @@
+const { parentPort } = require("worker_threads");
+const { performance } = require("perf_hooks");
+
+// From templates/polyfills.js
+// Apply Node polyfills as necessary.
+var window = {
+  Date: Date,
+  addEventListener: function () {},
+  removeEventListener: function () {},
+};
+
+var location = {
+  href: "",
+  host: "",
+  hostname: "",
+  protocol: "",
+  origin: "",
+  port: "",
+  pathname: "",
+  search: "",
+  hash: "",
+  username: "",
+  password: "",
+};
+
+var document = {
+  body: {},
+  createTextNode: function () {},
+  location: location,
+};
+
+var oldConsoleWarn = console.warn;
+console.warn = function () {
+  if (
+    arguments.length === 1 &&
+    arguments[0].indexOf("Compiled in DEV mode") === 0
+  )
+    return;
+  return oldConsoleWarn.apply(console, arguments);
+};
+
+if (typeof FileList === "undefined") {
+  var FileList = function () {};
+}
+
+if (typeof File === "undefined") {
+  var File = function () {};
+}
+
+if (typeof XMLHttpRequest === "undefined") {
+  var XMLHttpRequest = function () {
+    return {
+      addEventListener: function () {},
+      open: function () {},
+      send: function () {},
+    };
+  };
+}
+
+if (typeof FormData === "undefined") {
+  var FormData = function () {
+    this._data = [];
+  };
+  FormData.prototype.append = function () {
+    this._data.push(Array.prototype.slice.call(arguments));
+  };
+}
+
+
+// Capture Debug.log from elm code
+let logs = [];
+console.elmlog = (str) => logs.push(str + "\n");
+
+// Compiled by elm-test-rs from templates/Runner.elm
+const { Elm } = require("./Runner.elm.js");
+
+// Start the Elm app
+const flags = { initialSeed: 1833568720, fuzzRuns: 100, filter: null };
+const app = Elm.Runner.init({ flags: flags });
+
+// Record the timing at which we received the last "runTest" message
+let startTime;
+
+// Communication from Supervisor to Elm runner via port
+parentPort.on("message", (msg) => {
+  if (msg.type_ == "askTestsCount") {
+    app.ports.askTestsCount.send();
+  } else if (msg.type_ == "runTest") {
+    startTime = performance.now();
+    app.ports.receiveRunTest.send(msg.id);
+  } else {
+    console.error("Invalid supervisor msg.type_:", msg.type_);
+  }
+});
+
+// Communication from Elm runner to Supervisor via port
+// Subscribe to outgoing Elm ports defined in templates/Runner.elm
+app.ports.sendResult.subscribe((msg) => {
+  msg.type_ = "testResult";
+  msg.duration = performance.now() - startTime;
+  msg.logs = logs;
+  parentPort.postMessage(msg);
+  logs.length = 0;
+});
+app.ports.sendTestsCount.subscribe((msg) => {
+  msg.type_ = "testsCount";
+  msg.logs = logs;
+  parentPort.postMessage(msg);
+  logs.length = 0;
+});

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

@@ -0,0 +1,187 @@
+process.chdir(__dirname);
+
+// From templates/polyfills.js
+// Apply Node polyfills as necessary.
+var window = {
+  Date: Date,
+  addEventListener: function () {},
+  removeEventListener: function () {},
+};
+
+var location = {
+  href: "",
+  host: "",
+  hostname: "",
+  protocol: "",
+  origin: "",
+  port: "",
+  pathname: "",
+  search: "",
+  hash: "",
+  username: "",
+  password: "",
+};
+
+var document = {
+  body: {},
+  createTextNode: function () {},
+  location: location,
+};
+
+var oldConsoleWarn = console.warn;
+console.warn = function () {
+  if (
+    arguments.length === 1 &&
+    arguments[0].indexOf("Compiled in DEV mode") === 0
+  )
+    return;
+  return oldConsoleWarn.apply(console, arguments);
+};
+
+if (typeof FileList === "undefined") {
+  var FileList = function () {};
+}
+
+if (typeof File === "undefined") {
+  var File = function () {};
+}
+
+if (typeof XMLHttpRequest === "undefined") {
+  var XMLHttpRequest = function () {
+    return {
+      addEventListener: function () {},
+      open: function () {},
+      send: function () {},
+    };
+  };
+}
+
+if (typeof FormData === "undefined") {
+  var FormData = function () {
+    this._data = [];
+  };
+  FormData.prototype.append = function () {
+    this._data.push(Array.prototype.slice.call(arguments));
+  };
+}
+
+
+const { Worker } = require("worker_threads");
+const readline = require("readline");
+const { performance } = require("perf_hooks");
+
+// Global variables
+let testsCount, todoTests;
+let reporter;
+let runners = [];
+let working = false;
+let workersCount = 10;
+let startWorkCallback = function(){};
+const verbosity = 0;
+
+// Create a long lived reporter worker
+const { Elm } = require("./Reporter.elm.js");
+const flags = {
+  initialSeed: 1833568720,
+  fuzzRuns: 100,
+  mode: "consoleColor",
+  verbosity: verbosity,
+  globs: [],
+  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/review/tests/Pages/Review/NoContractViolationsTest.elm"],
+};
+reporter = Elm.Reporter.init({ flags: flags });
+
+// Pipe the Elm stdout port to stdout
+reporter.ports.stdout.subscribe((str) => process.stdout.write(str));
+
+// When the reporter has finished clean runners
+reporter.ports.signalFinished.subscribe(async ({ exitCode, testsCount }) => {
+  await Promise.all(runners.map((runner) => runner.terminate()));
+  working = false;
+  startWorkCallback();
+  if (verbosity >= 1) {
+    console.warn("Running duration (since Node.js start):", Math.round(performance.now()), "ms\n");
+  }
+  process.exit(exitCode);
+});
+
+// When receiving a CLI message, start test workers
+// The message is a string containing "/path/to/node_runner.js"
+const rl = readline.createInterface({ input: process.stdin });
+rl.on("line", (runnerFile) => {
+  working ? registerWork(runnerFile) : startWork(runnerFile);
+});
+
+function registerWork(runnerFile) {
+  startWorkCallback = () => startWork(runnerFile);
+}
+
+function startWork(runnerFile) {
+  startWorkCallback = function(){};
+  working = true;
+  // Start first runner worker and prevent piped stdout and sdterr
+  runners[0] = new Worker(runnerFile, { stdout: true }); //, stderr: true });
+  runners[0].on("message", (msg) =>
+    handleRunnerMsg(runners[0], runnerFile, msg)
+  );
+  runners[0].on("online", () =>
+    runners[0].postMessage({ type_: "askTestsCount" })
+  );
+}
+
+// Handle a test result
+function handleRunnerMsg(runner, runnerFile, msg) {
+  if (msg.type_ == "testsCount") {
+    if (msg.logs.length > 0) {
+      console.warn("Debug logs captured when setting up tests: -----------\n");
+      msg.logs.forEach((str) => process.stderr.write(str));
+      console.warn("\n------------------------------------------------------\n");
+    }
+    setupWithTestsCount(runnerFile, msg);
+  } else if (msg.type_ == "testResult") {
+    dispatchWork(runner, todoTests.pop());
+    reporter.ports.incomingResult.send(msg);
+  } else {
+    console.error("Invalid runner msg.type_:", msg.type_);
+  }
+}
+
+// Reset supervisor tests count and reporter
+// Start work on all runners
+function setupWithTestsCount(runnerFile, msg) {
+  // Reset supervisor tests
+  testsCount = msg.testsCount;
+  todoTests = Array(testsCount)
+    .fill(0)
+    .map((_, id) => id)
+    .reverse();
+
+  // Reset reporter
+  reporter.ports.restart.send(msg);
+
+  // Send first runner job
+  if (testsCount == 0) {
+    console.error("No exposed values of type Test was found. Did you forget to expose them?");
+    return;
+  } else {
+    runners[0].postMessage({ type_: "runTest", id: todoTests.pop() });
+  }
+
+  // Create and send work to all other workers.
+  let max_workers = Math.min(workersCount, testsCount);
+  for (let i = 1; i < max_workers; i++) {
+    let runner = new Worker(runnerFile); //, { stdout: true, stderr: true });
+    runners[i] = runner;
+    runner.on("message", (msg) =>
+      handleRunnerMsg(runner, runnerFile, msg)
+    );
+    runner.on("online", () => dispatchWork(runner, todoTests.pop()));
+  }
+}
+
+// Ask runner to run some test.
+function dispatchWork(runner, testId) {
+  if (testId != undefined) {
+    runner.postMessage({ type_: "runTest", id: testId });
+  }
+}

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

@@ -0,0 +1 @@
+{"type": "commonjs"}

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

@@ -0,0 +1,26 @@
+port module Reporter exposing (main)
+
+import ElmTestRunner.Reporter exposing (Flags, Model, Msg)
+import Json.Decode exposing (Value)
+
+
+port restart : ({ kind : String, testsCount : Int } -> msg) -> Sub msg
+
+
+port incomingResult : ({ duration : Float, result : Value, logs : List String } -> msg) -> Sub msg
+
+
+port signalFinished : { exitCode : Int, testsCount : Int } -> Cmd msg
+
+
+port stdout : String -> Cmd msg
+
+
+main : Program Flags Model Msg
+main =
+    ElmTestRunner.Reporter.worker
+        { restart = restart
+        , incomingResult = incomingResult
+        , stdout = stdout
+        , signalFinished = signalFinished
+        }

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

@@ -0,0 +1,62 @@
+port module Runner exposing (main)
+
+import Pages.Review.NoContractViolationsTest
+
+import ElmTestRunner.Runner exposing (Flags, Model, Msg)
+import Json.Encode exposing (Value)
+import Test exposing (Test)
+
+
+port askTestsCount : (Value -> msg) -> Sub msg
+
+
+port sendTestsCount : { kind : String, testsCount : Int } -> Cmd msg
+
+
+port receiveRunTest : (Int -> msg) -> Sub msg
+
+
+port sendResult : { id : Int, result : Value } -> Cmd msg
+
+
+{-| The implementation of this function will be replaced in the generated JS
+with a version that returns `Just value` if `value` is a `Test`, otherwise `Nothing`.
+If you rename or change this function you also need to update the regex that looks for it.
+-}
+check : a -> Maybe Test
+check =
+    checkHelperReplaceMe___
+
+
+checkHelperReplaceMe___ : a -> b
+checkHelperReplaceMe___ _ =
+    Debug.todo """The regex for replacing this Debug.todo with some real code must have failed since you see this message!
+
+Please report this bug: https://github.com/mpizenberg/elm-test-rs/issues/new
+"""
+
+
+tests : List Test
+tests =
+    [ check Pages.Review.NoContractViolationsTest.all ]
+        |> List.filterMap identity
+
+
+main : Program Flags Model Msg
+main =
+    let
+        concatenatedTest =
+            case tests of
+                [] ->
+                    Nothing
+
+                _ ->
+                    Just (Test.concat tests)
+    in
+    concatenatedTest
+        |> ElmTestRunner.Runner.worker
+            { askTestsCount = askTestsCount
+            , sendTestsCount = sendTestsCount
+            , receiveRunTest = receiveRunTest
+            , sendResult = sendResult
+            }

package/generator/src/RouteBuilder.elm

@@ -97,7 +97,7 @@ import Pages.Fetcher
 import Pages.FormState
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.RoutePattern exposing (RoutePattern)
-import Pages.Msg
+import PagesMsg exposing (PagesMsg)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Transition
 import Path exposing (Path)
@@ -117,7 +117,7 @@ type alias StatefulRoute routeParams data action model msg =
         -> Shared.Model
         -> model
         -> StaticPayload data action routeParams
-        -> View (Pages.Msg.Msg msg)
+        -> View (PagesMsg msg)
     , head :
         StaticPayload data action routeParams
         -> List Head.Tag
@@ -176,7 +176,7 @@ buildNoState :
         Maybe PageUrl
         -> Shared.Model
         -> StaticPayload data action routeParams
-        -> View (Pages.Msg.Msg ())
+        -> View (PagesMsg ())
     }
     -> Builder routeParams data action
     -> StatefulRoute routeParams data action {} ()
@@ -212,7 +212,7 @@ buildWithLocalState :
         -> Shared.Model
         -> model
         -> StaticPayload data action routeParams
-        -> View (Pages.Msg.Msg msg)
+        -> View (PagesMsg msg)
     , init : Maybe PageUrl -> Shared.Model -> StaticPayload data action routeParams -> ( model, Effect msg )
     , update : PageUrl -> Shared.Model -> StaticPayload data action routeParams -> msg -> model -> ( model, Effect msg )
     , subscriptions : Maybe PageUrl -> routeParams -> Path -> Shared.Model -> model -> Sub msg
@@ -258,7 +258,7 @@ buildWithSharedState :
         -> Shared.Model
         -> model
         -> StaticPayload data action routeParams
-        -> View (Pages.Msg.Msg msg)
+        -> View (PagesMsg msg)
     , init : Maybe PageUrl -> Shared.Model -> StaticPayload data action routeParams -> ( model, Effect msg )
     , update : PageUrl -> Shared.Model -> StaticPayload data action routeParams -> msg -> model -> ( model, Effect msg, Maybe Shared.Msg )
     , subscriptions : Maybe PageUrl -> routeParams -> Path -> Shared.Model -> model -> Sub msg

package/generator/src/build.js

@@ -17,7 +17,7 @@ import * as esbuild from "esbuild";
 import { createHash } from "crypto";
 import { merge_vite_configs } from "./vite-utils.js";
 import { resolveConfig } from "./config.js";
-import { globbySync } from "globby";
+import * as globby from "globby";
 import { fileURLToPath } from "url";
 import { copyFile } from "fs/promises";
 
@@ -166,7 +166,7 @@ export async function run(options) {
       })
       .catch((error) => {
         const portBackendTaskFileFound =
-          globbySync("./custom-backend-task.*").length > 0;
+          globby.globbySync("./custom-backend-task.*").length > 0;
         if (portBackendTaskFileFound) {
           // don't present error if there are no files matching custom-backend-task
           // if there are files matching custom-backend-task, warn the user in case something went wrong loading it
@@ -416,7 +416,7 @@ async function spawnElmMake(mode, options, elmEntrypointPath, outputPath, cwd) {
       "function appendSubmitter (myFormData, event) { event.submitter && event.submitter.name && event.submitter.name.length > 0 ? myFormData.append(event.submitter.name, event.submitter.value) : myFormData;  return myFormData }; return " +
         (options.debug
           ? "_Json_wrap(Array.from(appendSubmitter(new FormData(_Json_unwrap(event).target), _Json_unwrap(event))))"
-          : "Array.from(new FormData(event.target))")
+          : "[...(appendSubmitter(new FormData(event.target), event))]")
     )
   );
 }

package/generator/src/cli.js

@@ -9,7 +9,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { restoreColorSafe } from "./error-formatter.js";
 import * as renderer from "./render.js";
-import { globbySync } from "globby";
+import * as globby from "globby";
 import * as esbuild from "esbuild";
 import { rewriteElmJson } from "./rewrite-elm-json.js";
 import { ensureDirSync } from "./file-helpers.js";
@@ -148,7 +148,7 @@ async function main() {
           })
           .catch((error) => {
             const portBackendTaskFileFound =
-              globbySync("./custom-backend-task.*").length > 0;
+              globby.globbySync("./custom-backend-task.*").length > 0;
             if (portBackendTaskFileFound) {
               // don't present error if there are no files matching custom-backend-task
               // if there are files matching custom-backend-task, warn the user in case something went wrong loading it
@@ -247,7 +247,7 @@ async function main() {
         );
         // TODO allow no custom-backend-task
         const portBackendTaskFileFound =
-          globbySync("./custom-backend-task.*").length > 0;
+          globby.globbySync("./custom-backend-task.*").length > 0;
 
         const scriptRunner = `${
           portBackendTaskFileFound

package/generator/src/codegen.js

@@ -1,5 +1,5 @@
 import * as fs from "node:fs";
-import * as fsExtra from "fs-extra/esm";
+import * as fsExtra from "fs-extra";
 import { rewriteElmJson } from "./rewrite-elm-json.js";
 import { rewriteClientElmJson } from "./rewrite-client-elm-json.js";
 import { elmPagesCliFile, elmPagesUiFile } from "./elm-file-constants.js";

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 9;
+export const compatibilityKey = 11;
 
-export const packageVersion = "3.0.0-beta.25";
+export const packageVersion = "3.0.0-beta.27";

package/generator/src/dev-server.js

@@ -26,7 +26,7 @@ import * as esbuild from "esbuild";
 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 globby from "globby";
 import { fileURLToPath } from "url";
 
 const __filename = fileURLToPath(import.meta.url);
@@ -206,7 +206,7 @@ export async function start(options) {
               });
             } catch (e) {
               const portBackendTaskFileFound =
-                globbySync("./custom-backend-task.*").length > 0;
+                globby.globbySync("./custom-backend-task.*").length > 0;
               if (portBackendTaskFileFound) {
                 // don't present error if there are no files matching custom-backend-task
                 // if there are files matching custom-backend-task, warn the user in case something went wrong loading it

package/generator/src/generate-template-module-connector.js

@@ -1,4 +1,4 @@
-import { globbySync } from "globby";
+import * as globby from "globby";
 import * as path from "path";
 import { default as mm } from "micromatch";
 import * as routeHelpers from "./route-codegen-helpers.js";
@@ -10,14 +10,16 @@ import { fileURLToPath } from "url";
  * @param {'browser' | 'cli'} phase
  */
 export async function generateTemplateModuleConnector(basePath, phase) {
-  const templates = globbySync(["app/Route/**/*.elm"], {}).map((file) => {
-    const captures = mm.capture("app/Route/**/*.elm", file);
-    if (captures) {
-      return path.join(captures[0], captures[1]).split(path.sep);
-    } else {
-      return [];
-    }
-  });
+  const templates = globby
+    .globbySync(["app/Route/**/*.elm"], {})
+    .map((file) => {
+      const captures = mm.capture("app/Route/**/*.elm", file);
+      if (captures) {
+        return path.join(captures[0], captures[1]).split(path.sep);
+      } else {
+        return [];
+      }
+    });
   if (templates.length <= 0) {
     throw {
       path: "",

package/generator/src/init.js

@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import { copySync } from "fs-extra/esm";
+import * as fsExtra from "fs-extra";
 import * as path from "path";
 import * as kleur from "kleur/colors";
 import { fileURLToPath } from "url";
@@ -17,7 +17,7 @@ export async function run(name) {
 
   if (!fs.existsSync(name)) {
     try {
-      copySync(template, appRoot);
+      fsExtra.copySync(template, appRoot);
       fs.renameSync(
         path.resolve(appRoot, "gitignore"),
         path.resolve(appRoot, ".gitignore")

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

@@ -6,7 +6,7 @@ import Head
 import Head.Seo as Seo
 import Html
 import Html.Styled.Attributes as Attr
-import Pages.Msg
+import PagesMsg exposing (PagesMsg)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
 import Path
@@ -74,7 +74,7 @@ view :
     Maybe PageUrl
     -> Shared.Model
     -> StaticPayload Data ActionData RouteParams
-    -> View (Pages.Msg.Msg Msg)
+    -> View (PagesMsg Msg)
 view maybeUrl sharedModel static =
     { title = "elm-pages is running"
     , body =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.25",
+  "version": "3.0.0-beta.27",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -34,9 +34,9 @@
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.17.8",
+    "esbuild": "0.17.10",
     "fs-extra": "^11.1.0",
-    "globby": "^13.1.3",
+    "globby": "13.1.3",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.2",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.1",
     "@types/make-fetch-happen": "^10.0.1",
     "@types/micromatch": "^4.0.2",
     "@types/node": "^18.11.9",
@@ -63,8 +63,8 @@
     "elm-tooling": "^1.12.0",
     "elm-verify-examples": "^5.2.0",
     "elmi-to-json": "^1.2.0",
-    "mocha": "^10.2.0",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "vitest": "^0.28.5"
   },
   "files": [
     "generator/src/",