elm-pages 3.0.0-beta.15 → 3.0.0-beta.17

package/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm

@@ -15,7 +15,7 @@ all =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -70,7 +70,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -100,7 +100,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = BackendTask.fail (Exception.fromString "")
+       , data = BackendTask.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -115,7 +115,7 @@ data =
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
@@ -169,7 +169,7 @@ data =
                                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
@@ -200,7 +200,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = DS.fail (Exception.fromString "")
+       , data = DS.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -217,7 +217,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -272,7 +272,7 @@ data =
 import Server.Request as Request
 
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -301,7 +301,7 @@ type alias Data =
 route : StatelessRoute RouteParams Data ActionData
 route =
     RouteBuilder.preRender
-        { data = \\_ -> BackendTask.fail (Exception.fromString "")
+        { data = \\_ -> BackendTask.fail (FatalError.fromString "")
         , head = head
         , pages = pages
         }
@@ -318,7 +318,7 @@ data =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -355,7 +355,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -390,7 +390,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -419,7 +419,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -456,7 +456,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -491,7 +491,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -520,7 +520,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 type alias Model =
     {}
@@ -549,7 +549,7 @@ route =
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import BackendTask exposing (BackendTask)
 import RouteBuilder exposing (Page, StaticPayload)
@@ -581,7 +581,7 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    RouteBuilder.single
        { head = head
-       , data = BackendTask.fail (Exception.fromString "")
+       , data = BackendTask.fail (FatalError.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
@@ -597,7 +597,7 @@ data =
                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import Browser.Navigation
 import BackendTask
@@ -648,7 +648,7 @@ type alias Model =
                                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
-import Exception
+import FatalError
 
 import Browser.Navigation
 import BackendTask
@@ -669,7 +669,7 @@ template =
     { init = init
     , update = update
     , view = view
-    , data = BackendTask.fail (Exception.fromString "")
+    , data = BackendTask.fail (FatalError.fromString "")
     , subscriptions = subscriptions
     , onPageChange = Just OnPageChange
     }

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: 1951305281, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1374716823, 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: 1951305281,
+  initialSeed: 1374716823,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/RouteBuilder.elm

@@ -89,7 +89,7 @@ import BackendTask exposing (BackendTask)
 import Dict exposing (Dict)
 import Effect exposing (Effect)
 import ErrorPage exposing (ErrorPage)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 import Http
 import Json.Decode
@@ -109,9 +109,9 @@ import View exposing (View)
 
 {-| -}
 type alias StatefulRoute routeParams data action model msg =
-    { data : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-    , action : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response action ErrorPage)
-    , staticRoutes : BackendTask Throwable (List routeParams)
+    { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+    , staticRoutes : BackendTask FatalError (List routeParams)
     , view :
         Maybe PageUrl
         -> Shared.Model
@@ -124,7 +124,7 @@ type alias StatefulRoute routeParams data action model msg =
     , init : Maybe PageUrl -> Shared.Model -> StaticPayload data action routeParams -> ( model, Effect msg )
     , update : PageUrl -> StaticPayload data action routeParams -> msg -> model -> Shared.Model -> ( model, Effect msg, Maybe Shared.Msg )
     , subscriptions : Maybe PageUrl -> routeParams -> Path -> model -> Shared.Model -> Sub msg
-    , handleRoute : { moduleName : List String, routePattern : RoutePattern } -> (routeParams -> List ( String, String )) -> routeParams -> BackendTask Throwable (Maybe NotFoundReason)
+    , handleRoute : { moduleName : List String, routePattern : RoutePattern } -> (routeParams -> List ( String, String )) -> routeParams -> BackendTask FatalError (Maybe NotFoundReason)
     , kind : String
     , onAction : Maybe (action -> msg)
     }
@@ -154,9 +154,9 @@ type alias StaticPayload data action routeParams =
 {-| -}
 type Builder routeParams data action
     = WithData
-        { data : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-        , action : Json.Decode.Value -> routeParams -> BackendTask Throwable (Server.Response.Response action ErrorPage)
-        , staticRoutes : BackendTask Throwable (List routeParams)
+        { data : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+        , action : Json.Decode.Value -> routeParams -> BackendTask FatalError (Server.Response.Response action ErrorPage)
+        , staticRoutes : BackendTask FatalError (List routeParams)
         , head :
             StaticPayload data action routeParams
             -> List Head.Tag
@@ -165,7 +165,7 @@ type Builder routeParams data action
             { moduleName : List String, routePattern : RoutePattern }
             -> (routeParams -> List ( String, String ))
             -> routeParams
-            -> BackendTask Throwable (Maybe NotFoundReason)
+            -> BackendTask FatalError (Maybe NotFoundReason)
         , kind : String
         }
 
@@ -292,14 +292,14 @@ buildWithSharedState config builderState =
 
 {-| -}
 single :
-    { data : BackendTask Throwable data
+    { data : BackendTask FatalError data
     , head : StaticPayload data action {} -> List Head.Tag
     }
     -> Builder {} data action
 single { data, head } =
     WithData
         { data = \_ _ -> data |> BackendTask.map Server.Response.render
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = BackendTask.succeed [ {} ]
         , head = head
         , serverless = False
@@ -310,15 +310,15 @@ single { data, head } =
 
 {-| -}
 preRender :
-    { data : routeParams -> BackendTask Throwable data
-    , pages : BackendTask Throwable (List routeParams)
+    { data : routeParams -> BackendTask FatalError data
+    , pages : BackendTask FatalError (List routeParams)
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
 preRender { data, head, pages } =
     WithData
         { data = \_ -> data >> BackendTask.map Server.Response.render
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = pages
         , head = head
         , serverless = False
@@ -348,15 +348,15 @@ preRender { data, head, pages } =
 
 {-| -}
 preRenderWithFallback :
-    { data : routeParams -> BackendTask Throwable (Server.Response.Response data ErrorPage)
-    , pages : BackendTask Throwable (List routeParams)
+    { data : routeParams -> BackendTask FatalError (Server.Response.Response data ErrorPage)
+    , pages : BackendTask FatalError (List routeParams)
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
 preRenderWithFallback { data, head, pages } =
     WithData
         { data = \_ -> data
-        , action = \_ _ -> BackendTask.fail (Exception.fromString "Internal Error - actions should never be called for statically generated pages.")
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "Internal Error - actions should never be called for statically generated pages.")
         , staticRoutes = pages
         , head = head
         , serverless = False
@@ -369,8 +369,8 @@ preRenderWithFallback { data, head, pages } =
 
 {-| -}
 serverRender :
-    { data : routeParams -> Server.Request.Parser (BackendTask Throwable (Server.Response.Response data ErrorPage))
-    , action : routeParams -> Server.Request.Parser (BackendTask Throwable (Server.Response.Response action ErrorPage))
+    { data : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response data ErrorPage))
+    , action : routeParams -> Server.Request.Parser (BackendTask FatalError (Server.Response.Response action ErrorPage))
     , head : StaticPayload data action routeParams -> List Head.Tag
     }
     -> Builder routeParams data action
@@ -386,7 +386,7 @@ serverRender { data, action, head } =
                                 |> Result.mapError Json.Decode.errorToString
                                 |> BackendTask.fromResult
                                 -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (Exception.fromString error))
+                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
                        )
                 )
                     |> BackendTask.andThen
@@ -397,7 +397,7 @@ serverRender { data, action, head } =
 
                                 Err error ->
                                     Server.Request.errorsToString error
-                                        |> Exception.fromString
+                                        |> FatalError.fromString
                                         |> BackendTask.fail
                         )
         , action =
@@ -410,7 +410,7 @@ serverRender { data, action, head } =
                                 |> Result.mapError Json.Decode.errorToString
                                 |> BackendTask.fromResult
                                 -- TODO include title and better error context and formatting
-                                |> BackendTask.onError (\error -> BackendTask.fail (Exception.fromString error))
+                                |> BackendTask.onError (\error -> BackendTask.fail (FatalError.fromString error))
                        )
                 )
                     |> BackendTask.andThen
@@ -421,7 +421,7 @@ serverRender { data, action, head } =
 
                                 Err error ->
                                     Server.Request.errorsToString error
-                                        |> Exception.fromString
+                                        |> FatalError.fromString
                                         |> BackendTask.fail
                         )
         , staticRoutes = BackendTask.succeed []

package/generator/src/SharedTemplate.elm

@@ -2,7 +2,7 @@ module SharedTemplate exposing (SharedTemplate)
 
 import BackendTask
 import Effect exposing (Effect)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Html exposing (Html)
 import Pages.Flags exposing (Flags)
 import Pages.PageUrl exposing (PageUrl)
@@ -36,7 +36,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         -> (msg -> mappedMsg)
         -> View mappedMsg
         -> { body : List (Html mappedMsg), title : String }
-    , data : BackendTask.BackendTask Throwable sharedData
+    , data : BackendTask.BackendTask FatalError sharedData
     , subscriptions : Path -> sharedModel -> Sub msg
     , onPageChange :
         Maybe

package/generator/src/SiteConfig.elm

@@ -1,11 +1,11 @@
 module SiteConfig exposing (SiteConfig)
 
 import BackendTask exposing (BackendTask)
-import Exception exposing (Throwable)
+import FatalError exposing (FatalError)
 import Head
 
 
 type alias SiteConfig =
     { canonicalUrl : String
-    , head : BackendTask Throwable (List Head.Tag)
+    , head : BackendTask FatalError (List Head.Tag)
     }

package/generator/src/build.js

@@ -143,9 +143,9 @@ async function run(options) {
 
     const portBackendTaskCompiled = esbuild
       .build({
-        entryPoints: ["./port-data-source"],
+        entryPoints: ["./custom-backend-task"],
         platform: "node",
-        outfile: ".elm-pages/compiled-ports/port-data-source.js",
+        outfile: ".elm-pages/compiled-ports/custom-backend-task.js",
         assetNames: "[name]-[hash]",
         chunkNames: "chunks/[name]-[hash]",
         outExtension: { ".js": ".js" },
@@ -161,11 +161,11 @@ async function run(options) {
       })
       .catch((error) => {
         const portBackendTaskFileFound =
-          globby.sync("./port-data-source.*").length > 0;
+          globby.sync("./custom-backend-task.*").length > 0;
         if (portBackendTaskFileFound) {
-          // don't present error if there are no files matching port-data-source
-          // if there are files matching port-data-source, warn the user in case something went wrong loading it
-          console.error("Failed to start port-data-source watcher", error);
+          // 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
+          console.error("Failed to start custom-backend-task watcher", error);
         }
       });
     // TODO extract common code for compiling ports file?
@@ -617,7 +617,7 @@ async function runAdapter(adaptFn, processedIndexTemplate) {
       apiRoutePatterns: JSON.parse(
         await fsPromises.readFile("./dist/api-patterns.json", "utf-8")
       ),
-      portsFilePath: "./.elm-pages/compiled-ports/port-data-source.js",
+      portsFilePath: "./.elm-pages/compiled-ports/custom-backend-task.js",
       htmlTemplate: processedIndexTemplate,
     });
     console.log("Success - Adapter script complete");

package/generator/src/cli.js

@@ -131,9 +131,9 @@ async function main() {
 
         const portBackendTaskCompiled = esbuild
           .build({
-            entryPoints: ["./port-data-source"],
+            entryPoints: ["./custom-backend-task"],
             platform: "node",
-            outfile: ".elm-pages/compiled-ports/port-data-source.js",
+            outfile: ".elm-pages/compiled-ports/custom-backend-task.js",
             assetNames: "[name]-[hash]",
             chunkNames: "chunks/[name]-[hash]",
             outExtension: { ".js": ".js" },
@@ -151,11 +151,14 @@ async function main() {
           })
           .catch((error) => {
             const portBackendTaskFileFound =
-              globby.sync("./port-data-source.*").length > 0;
+              globby.sync("./custom-backend-task.*").length > 0;
             if (portBackendTaskFileFound) {
-              // don't present error if there are no files matching port-data-source
-              // if there are files matching port-data-source, warn the user in case something went wrong loading it
-              console.error("Failed to start port-data-source watcher", error);
+              // 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
+              console.error(
+                "Failed to start custom-backend-task watcher",
+                error
+              );
             }
           });
         const portsPath = await portBackendTaskCompiled;
@@ -270,7 +273,7 @@ function generatorWrapperFile(moduleName) {
 
 import Bytes
 import BackendTask exposing (BackendTask)
-import Exception
+import FatalError
 import Cli.Program as Program
 import Json.Decode as Decode
 import Json.Encode as Encode
@@ -278,7 +281,7 @@ import Pages.Internal.Platform.GeneratorApplication
 import ${moduleName}
 
 
-main : Program.StatefulProgram Pages.Internal.Platform.GeneratorApplication.Model Pages.Internal.Platform.GeneratorApplication.Msg (BackendTask Exception.Throwable ()) Pages.Internal.Platform.GeneratorApplication.Flags
+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.app
         { data = ${moduleName}.run

package/generator/src/compatibility-key.js

@@ -1 +1 @@
-module.exports = { compatibilityKey: 5 };
+module.exports = { compatibilityKey: 6 };

package/generator/src/dev-server.js

@@ -140,7 +140,7 @@ async function start(options) {
   );
   esbuild
     .build({
-      entryPoints: ["./port-data-source"],
+      entryPoints: ["./custom-backend-task"],
       platform: "node",
       assetNames: "[name]-[hash]",
       chunkNames: "chunks/[name]-[hash]",
@@ -171,15 +171,15 @@ async function start(options) {
       ],
     })
     .then((result) => {
-      console.log("Watching port-data-source...");
+      console.log("Watching custom-backend-task...");
     })
     .catch((error) => {
       const portBackendTaskFileFound =
-        globby.sync("./port-data-source.*").length > 0;
+        globby.sync("./custom-backend-task.*").length > 0;
       if (portBackendTaskFileFound) {
-        // don't present error if there are no files matching port-data-source
-        // if there are files matching port-data-source, warn the user in case something went wrong loading it
-        console.error("Failed to start port-data-source watcher", error);
+        // 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
+        console.error("Failed to start custom-backend-task watcher", error);
       }
     });
 

package/generator/src/render-test.js

@@ -27,7 +27,7 @@ async function run({ pathname, serverRequest }) {
     console.log("Compiling DONE");
 
     const portsFilePath =
-      ".elm-pages/compiled-ports/port-data-source-FA2IJND6.js";
+      ".elm-pages/compiled-ports/custom-backend-task-FA2IJND6.js";
     const mode = "dev-server";
 
     const renderResult = await renderer.render(

package/generator/src/render.js

@@ -642,11 +642,11 @@ function flushIfDone(app) {
 
 function flushQueue(app) {
   // TODO - could the case where flush is called with size 0 be avoided on the Elm side?
-  if (pendingBackendTaskResponses.size > 0) {
-    // console.log("@@@ FLUSHING", pendingBackendTaskResponses.size);
-    app.ports.gotBatchSub.send(Object.fromEntries(pendingBackendTaskResponses));
-    pendingBackendTaskResponses = new Map();
-  }
+  // if (pendingBackendTaskResponses.size > 0) {
+  // console.log("@@@ FLUSHING", pendingBackendTaskResponses.size);
+  app.ports.gotBatchSub.send(Object.fromEntries(pendingBackendTaskResponses));
+  pendingBackendTaskResponses = new Map();
+  // }
 }
 
 /**

package/generator/src/request-cache.js

@@ -43,21 +43,21 @@ function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
             resolve({
               kind: "response-json",
               value: jsonResponse({
-                "elm-pages-internal-error": "PortNotDefined",
+                "elm-pages-internal-error": "CustomBackendTaskNotDefined",
               }),
             });
           } else if (portBackendTaskImportError === "missing") {
             resolve({
               kind: "response-json",
               value: jsonResponse({
-                "elm-pages-internal-error": "MissingPortsFile",
+                "elm-pages-internal-error": "MissingCustomBackendTaskFile",
               }),
             });
           } else {
             resolve({
               kind: "response-json",
               value: jsonResponse({
-                "elm-pages-internal-error": "ErrorInPortsFile",
+                "elm-pages-internal-error": "ErrorInCustomBackendTaskFile",
                 error:
                   (portBackendTaskImportError &&
                     portBackendTaskImportError.stack) ||
@@ -83,7 +83,7 @@ function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
             resolve({
               kind: "response-json",
               value: jsonResponse({
-                "elm-pages-internal-error": "PortCallException",
+                "elm-pages-internal-error": "CustomBackendTaskException",
                 error: portCallError,
               }),
             });
@@ -92,7 +92,7 @@ function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
       } catch (error) {
         console.trace(error);
         reject({
-          title: "BackendTask.Port Error",
+          title: "BackendTask.Custom Error",
           message: error.toString(),
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.15",
+  "version": "3.0.0-beta.17",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",