elm-pages 3.0.0-beta.34 → 3.0.0-beta.36

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

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1263909344,
+  initialSeed: 2714937880,
   fuzzRuns: 100,
   mode: "consoleColor",
   verbosity: verbosity,

package/generator/src/build.js

@@ -505,7 +505,7 @@ function runElmMake(mode, options, elmEntrypointPath, outputPath, cwd) {
 /**
  * @param {string} filePath
  */
-async function runTerser(filePath) {
+export async function runTerser(filePath) {
   console.log("Running terser");
   const minifiedElm = await terser.minify(
     (await fsPromises.readFile(filePath)).toString(),

package/generator/src/cli.js

@@ -19,6 +19,7 @@ import * as commander from "commander";
 import { runElmCodegenInstall } from "./elm-codegen.js";
 import { packageVersion } from "./compatibility-key.js";
 import { resolveInputPathOrModuleName } from "./resolve-elm-module.js";
+import { runTerser } from "./build.js";
 
 const Argument = commander.Argument;
 const Option = commander.Option;
@@ -90,6 +91,7 @@ async function main() {
     .description("run an elm-pages script")
     .allowUnknownOption()
     .allowExcessArguments()
+    .helpOption(false) // allow --help to propogate to the Script to show usage
     .action(async (elmModulePath, options, options2) => {
       const unprocessedCliOptions = options2.args.splice(
         options2.processedArgs.length,
@@ -193,6 +195,7 @@ async function main() {
 
       let executableName = await lamderaOrElmFallback();
       await build.compileCliApp({ debug: options.debug, executableName });
+      // await runTerser(`${projectDirectory}/elm-stuff/elm-pages/elm.js`);
       fs.renameSync(
         `${projectDirectory}/elm-stuff/elm-pages/elm.js`,
         `${projectDirectory}/elm-stuff/elm-pages/elm.cjs`
@@ -244,9 +247,29 @@ await(async()=>{let{dirname:e}=await import("path"),{fileURLToPath:i}=await impo
           outfile: path.resolve(cwd, options.output),
           external: ["node:*", ...options.external],
           minify: true,
+          pure: [
+            "A2",
+            "A3",
+            "A4",
+            "A5",
+            "A6",
+            "A7",
+            "A8",
+            "A9",
+            "F2",
+            "F3",
+            "F3",
+            "F4",
+            "F5",
+            "F6",
+            "F7",
+            "F8",
+            "F9",
+          ],
           absWorkingDir: projectDirectory,
           banner: { js: `#!/usr/bin/env node\n\n${ESM_REQUIRE_SHIM}` },
         });
+        // await runTerser(path.resolve(cwd, options.output));
       } catch (error) {
         console.log(restoreColorSafe(error));
         process.exit(1);
@@ -325,16 +348,11 @@ async function requireElm(compiledElmPath) {
 function generatorWrapperFile(moduleName) {
   return `port module Main exposing (main)
 
-import BackendTask exposing (BackendTask)
-import FatalError
-import Cli.Program as Program
-import Json.Decode as Decode
-import Json.Encode as Encode
 import Pages.Internal.Platform.GeneratorApplication
 import ${moduleName}
 
 
-main : Program.StatefulProgram Pages.Internal.Platform.GeneratorApplication.Model Pages.Internal.Platform.GeneratorApplication.Msg (BackendTask FatalError.FatalError ()) Pages.Internal.Platform.GeneratorApplication.Flags
+main : Pages.Internal.Platform.GeneratorApplication.Program
 main =
     Pages.Internal.Platform.GeneratorApplication.app
         { data = ${moduleName}.run
@@ -345,13 +363,13 @@ main =
         }
 
 
-port toJsPort : Encode.Value -> Cmd msg
+port toJsPort : Pages.Internal.Platform.GeneratorApplication.JsonValue -> Cmd msg
 
 
-port fromJsPort : (Decode.Value -> msg) -> Sub msg
+port fromJsPort : (Pages.Internal.Platform.GeneratorApplication.JsonValue -> msg) -> Sub msg
 
 
-port gotBatchSub : (Decode.Value -> msg) -> Sub msg
+port gotBatchSub : (Pages.Internal.Platform.GeneratorApplication.JsonValue -> msg) -> Sub msg
 `;
 }
 function collect(value, previous) {

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 14;
+export const compatibilityKey = 15;
 
-export const packageVersion = "3.0.0-beta.34";
+export const packageVersion = "3.0.0-beta.36";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.34",
+  "version": "3.0.0-beta.36",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -27,45 +27,45 @@
   "dependencies": {
     "busboy": "^1.6.0",
     "chokidar": "^3.5.3",
-    "commander": "^10.0.0",
+    "commander": "^10.0.1",
     "connect": "^3.7.0",
     "cookie-signature": "^1.2.1",
     "cross-spawn": "7.0.3",
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.17.12",
+    "esbuild": "^0.17.18",
     "fs-extra": "^11.1.1",
-    "globby": "13.1.3",
+    "globby": "13.1.4",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
-    "make-fetch-happen": "^11.0.3",
-    "memfs": "^3.4.13",
+    "make-fetch-happen": "^11.1.1",
+    "memfs": "^3.5.1",
     "micromatch": "^4.0.5",
     "serve-static": "^1.15.0",
-    "terser": "^5.16.8",
-    "vite": "^4.2.1",
-    "which": "^3.0.0"
+    "terser": "^5.17.1",
+    "vite": "^4.3.5",
+    "which": "^3.0.1"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.2",
     "@types/fs-extra": "^11.0.1",
     "@types/make-fetch-happen": "^10.0.1",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^18.15.7",
+    "@types/node": "^20.1.0",
     "@types/serve-static": "^1.15.1",
-    "cypress": "^12.8.1",
+    "cypress": "^12.11.0",
     "elm-codegen": "^0.3.0",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-review": "^2.10.1",
-    "elm-test": "^0.19.1-revision11",
-    "elm-tooling": "^1.13.1",
+    "elm-review": "^2.10.2",
+    "elm-test": "^0.19.1-revision12",
+    "elm-tooling": "^1.14.0",
     "elm-verify-examples": "^5.2.0",
     "elmi-to-json": "^1.4.3",
-    "typescript": "^5.0.2",
-    "vite": "^4.2.1",
-    "vitest": "^0.29.7"
+    "typescript": "^5.0.4",
+    "vite": "^4.3.5",
+    "vitest": "^0.31.0"
   },
   "files": [
     "generator/src/",

package/src/BackendTask/File.elm

@@ -65,7 +65,7 @@ frontmatter frontmatterDecoder =
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPost : BackendTask BlogPostMetadata
     blogPost =
@@ -101,7 +101,7 @@ It's common to parse the body with a markdown parser or other format.
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
     import Html exposing (Html)
 
     example :
@@ -151,13 +151,28 @@ bodyWithFrontmatter :
             }
             frontmatter
 bodyWithFrontmatter frontmatterDecoder filePath =
-    read filePath
-        (body
-            |> Decode.andThen
-                (\bodyString ->
-                    frontmatter (frontmatterDecoder bodyString)
-                )
-        )
+    BackendTask.Internal.Request.request2
+        { name = "read-file"
+        , body = BackendTask.Http.stringBody "" filePath
+        , expect =
+            body
+                |> Decode.andThen
+                    (\bodyString ->
+                        frontmatter (frontmatterDecoder bodyString)
+                    )
+        , errorDecoder = Decode.field "errorCode" (errorDecoder filePath)
+        , onError =
+            \frontmatterDecodeError ->
+                { fatal =
+                    { title = "BackendTask.File Decoder Error"
+                    , body =
+                        "I encountered a Json Decoder error from a call to BackendTask.File.bodyWithFrontmatter.\n\n"
+                            ++ Decode.errorToString frontmatterDecodeError
+                    }
+                        |> FatalError.build
+                , recoverable = DecodingError frontmatterDecodeError
+                }
+        }
 
 
 {-| -}
@@ -174,7 +189,7 @@ just the metadata.
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPost : BackendTask BlogPostMetadata
     blogPost =
@@ -198,7 +213,7 @@ the [`BackendTask`](BackendTask) API along with [`BackendTask.Glob`](BackendTask
 
     import BackendTask exposing (BackendTask)
     import BackendTask.File as File
-    import Decode as Decode exposing (Decoder)
+    import Decode exposing (Decoder)
 
     blogPostFiles : BackendTask (List String)
     blogPostFiles =
@@ -231,8 +246,23 @@ onlyFrontmatter :
             }
             frontmatter
 onlyFrontmatter frontmatterDecoder filePath =
-    read filePath
-        (frontmatter frontmatterDecoder)
+    BackendTask.Internal.Request.request2
+        { name = "read-file"
+        , body = BackendTask.Http.stringBody "" filePath
+        , expect = frontmatter frontmatterDecoder
+        , errorDecoder = Decode.field "errorCode" (errorDecoder filePath)
+        , onError =
+            \frontmatterDecodeError ->
+                { fatal =
+                    { title = "BackendTask.File Decoder Error"
+                    , body =
+                        "I encountered a Json Decoder error from a call to BackendTask.File.onlyFrontmatter.\n\n"
+                            ++ Decode.errorToString frontmatterDecodeError
+                    }
+                        |> FatalError.build
+                , recoverable = DecodingError frontmatterDecodeError
+                }
+        }
 
 
 {-| Same as `bodyWithFrontmatter` except it doesn't include the frontmatter.

package/src/BackendTask/Internal/Request.elm

@@ -1,7 +1,9 @@
-module BackendTask.Internal.Request exposing (request)
+module BackendTask.Internal.Request exposing (request, request2)
 
 import BackendTask exposing (BackendTask)
-import BackendTask.Http exposing (Body, Expect)
+import BackendTask.Http exposing (Body, Error(..), Expect)
+import Json.Decode exposing (Decoder)
+import Json.Encode as Encode
 
 
 request :
@@ -22,7 +24,46 @@ request ({ name, body, expect } as params) =
         }
         expect
         |> BackendTask.onError
-            (\_ ->
+            (\error ->
                 -- TODO avoid crash here, this should be handled as an internal error
                 request params
             )
+
+
+request2 :
+    { name : String
+    , body : Body
+    , expect : Decoder a
+    , errorDecoder : Decoder error
+    , onError : Json.Decode.Error -> error
+    }
+    -> BackendTask error a
+request2 ({ name, body, expect, onError, errorDecoder } as params) =
+    -- elm-review: known-unoptimized-recursion
+    BackendTask.Http.request
+        { url = "elm-pages-internal://" ++ name
+        , method = "GET"
+        , headers = []
+        , body = body
+        , timeoutInMs = Nothing
+        , retries = Nothing
+        }
+        (BackendTask.Http.expectJson Json.Decode.value)
+        |> BackendTask.onError
+            (\error ->
+                BackendTask.succeed Encode.null
+            )
+        |> BackendTask.andThen
+            (\decodeValue ->
+                case Json.Decode.decodeValue errorDecoder decodeValue of
+                    Ok a ->
+                        BackendTask.fail a
+
+                    Err _ ->
+                        case Json.Decode.decodeValue expect decodeValue of
+                            Ok a ->
+                                BackendTask.succeed a
+
+                            Err e ->
+                                BackendTask.fail (onError e)
+            )

package/src/FatalError.elm

@@ -1,4 +1,4 @@
-module FatalError exposing (FatalError, fromString, recoverable)
+module FatalError exposing (FatalError, build, fromString, recoverable)
 
 {-| The Elm language doesn't have the concept of exceptions or special control flow for errors. It just has
 Custom Types, and by convention types like `Result` and the `Err` variant are used to represent possible failure states
@@ -54,7 +54,7 @@ issue.
 In the case of server-rendered Routes (`RouteBuilder.serverRender`), `elm-pages` will show your 500 error page
 when these errors occur.
 
-@docs FatalError, fromString, recoverable
+@docs FatalError, build, fromString, recoverable
 
 -}
 
@@ -66,7 +66,8 @@ type alias FatalError =
     Pages.Internal.FatalError.FatalError
 
 
-{-| -}
+{-| Create a FatalError with a title and body.
+-}
 build : { title : String, body : String } -> FatalError
 build info =
     Pages.Internal.FatalError.FatalError info

package/src/Pages/Internal/Platform/CompatibilityKey.elm

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    14
+    15

package/src/Pages/Internal/Platform/GeneratorApplication.elm

@@ -1,8 +1,8 @@
-module Pages.Internal.Platform.GeneratorApplication exposing (Flags, Model, Msg(..), init, requestDecoder, update, app)
+module Pages.Internal.Platform.GeneratorApplication exposing (Program, Flags, Model, Msg(..), init, requestDecoder, update, app, JsonValue)
 
 {-| Exposed for internal use only (used in generated code).
 
-@docs Flags, Model, Msg, init, requestDecoder, update, app
+@docs Program, Flags, Model, Msg, init, requestDecoder, update, app, JsonValue
 
 -}
 
@@ -25,6 +25,16 @@ import Pages.StaticHttp.Request
 import TerminalText as Terminal
 
 
+{-| -}
+type alias JsonValue =
+    Decode.Value
+
+
+{-| -}
+type alias Program =
+    Program.StatefulProgram Model Msg (BackendTask FatalError.FatalError ()) Flags
+
+
 {-| -}
 type alias Flags =
     { compatibilityKey : Int
@@ -47,7 +57,7 @@ type Msg
 {-| -}
 app :
     GeneratorProgramConfig
-    -> Program.StatefulProgram Model Msg (BackendTask FatalError ()) Flags
+    -> Program
 app config =
     let
         cliConfig : Program.Config (BackendTask FatalError ())

package/src/Pages/Internal/Platform/StaticResponses.elm

@@ -68,13 +68,7 @@ nextStep allRawResponses staticResponses { errors } =
                     )
     in
     if pendingRequests then
-        let
-            newThing : List HashRequest.Request
-            newThing =
-                urlsToPerform
-                    |> List.Extra.uniqueBy HashRequest.hash
-        in
-        Continue newThing progressedBackendTask
+        Continue urlsToPerform progressedBackendTask
 
     else
         let

package/src/Stub.elm

@@ -0,0 +1,56 @@
+module Stub exposing (..)
+
+import Json.Decode as Decode
+import Set exposing (Set)
+
+
+type alias Id =
+    Int
+
+
+type alias Model =
+    { nextId : Id
+    , sentIds : Set Id
+    }
+
+
+
+--task : Task error value
+--task =
+--    Pending
+--        (\id -> id)
+--        (\value model -> ( model, Done (Ok value) ))
+
+
+type Task error value
+    = Pending (Id -> Id) (Decode.Value -> Model -> ( Model, Task error value ))
+    | Done (Result error value)
+
+
+map2 : (value1 -> value2 -> combined) -> Task error value1 -> Task error value2 -> Task error combined
+map2 mapFn task1 task2 =
+    case ( task1, task2 ) of
+        ( Done resolved1, Done resolved2 ) ->
+            Debug.todo ""
+
+        ( Pending toId1 resolved1, Pending toId2 resolved2 ) ->
+            Pending
+                (\id ->
+                    max (toId1 id) (toId2 id)
+                        |> nextId
+                )
+                (\value id ->
+                    Debug.todo ""
+                )
+
+        _ ->
+            Debug.todo ""
+
+
+nextId id =
+    id + 1
+
+
+
+--(Task toId1 resolve1)
+--(Task toId2 resolve2)