elm-pages 3.0.0-beta.14 → 3.0.0-beta.16

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

@@ -270,7 +270,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 +278,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: 4 };
+module.exports = { compatibilityKey: 6 };

package/generator/src/error-formatter.js

@@ -13,11 +13,12 @@ const kleur = require("kleur");
  * @param {string} rule
  * @param {string} path
  * */
-const parseHeader = (rule, path) =>
-  kleur.cyan(
-    `-- ${rule.replace("-", " ")} --------------- ${path || ""}
+function parseHeader(rule, path) {
+  return kleur.cyan(
+    `-- ${(rule || "").replace("-", " ")} --------------- ${path || ""}
 `
   );
+}
 
 /**
  * parseMsg :: String|Object -> String
@@ -137,7 +138,10 @@ const restoreProblem =
         parseHeader(info.rule, path),
         ...info.formatted.map(parseMsg),
       ].join("");
+    } else if (typeof info.message === "string") {
+      return info.message;
     } else {
+      // console.log("info.message", info.message);
       return [
         parseHeader(info.title, path),
         ...info.message.map(parseMsg),

package/generator/src/render.js

@@ -143,22 +143,10 @@ function runGeneratorAppHelp(
       if (fromElm.command === "log") {
         console.log(fromElm.value);
       } else if (fromElm.tag === "ApiResponse") {
-        const args = fromElm.args[0];
-        if (mode === "build") {
-          global.staticHttpCache = args.staticHttpCache;
-        }
-
-        resolve({
-          kind: "api-response",
-          is404: args.is404,
-          statusCode: args.statusCode,
-          body: args.body,
-        });
+        // Finished successfully
+        process.exit(0);
       } else if (fromElm.tag === "PageProgress") {
         const args = fromElm.args[0];
-        if (mode === "build") {
-          global.staticHttpCache = args.staticHttpCache;
-        }
 
         if (isBytes) {
           resolve({
@@ -653,9 +641,12 @@ 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();
-  // console.log("@@@ FLUSHING", temp.length);
+  // }
 }
 
 /**

package/generator/src/request-cache.js

@@ -1,5 +1,8 @@
 const path = require("path");
 const kleur = require("kleur");
+const fsPromises = require("fs/promises");
+
+const defaultHttpCachePath = "./.elm-pages/http-cache";
 
 /** @typedef {{kind: 'cache-response-path', value: string} | {kind: 'response-json', value: JSON}} Response */
 
@@ -11,8 +14,7 @@ const kleur = require("kleur");
  * @returns {Promise<Response>}
  */
 function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
-  const fetch = require("make-fetch-happen").defaults({
-    cachePath: "./.elm-pages/http-cache",
+  const makeFetchHappen = require("make-fetch-happen").defaults({
     cache: mode === "build" ? "no-cache" : "default",
   });
   return new Promise(async (resolve, reject) => {
@@ -81,7 +83,7 @@ function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
             resolve({
               kind: "response-json",
               value: jsonResponse({
-                "elm-pages-internal-error": "PortCallError",
+                "elm-pages-internal-error": "PortCallException",
                 error: portCallError,
               }),
             });
@@ -97,7 +99,7 @@ function lookupOrPerform(portsFile, mode, rawRequest, hasFsAccess, useCache) {
     } else {
       try {
         console.time(`fetch ${request.url}`);
-        const response = await fetch(request.url, {
+        const response = await safeFetch(makeFetchHappen, request.url, {
           method: request.method,
           body: request.body,
           headers: {
@@ -241,4 +243,32 @@ function jsonResponse(json) {
   return { bodyKind: "json", body: json };
 }
 
+async function safeFetch(makeFetchHappen, url, options) {
+  const { cachePath, ...optionsWithoutCachePath } = options;
+  const cachePathWithDefault = cachePath || defaultHttpCachePath;
+  if (await canAccess(cachePathWithDefault)) {
+    return await makeFetchHappen(url, {
+      cachePath: cachePathWithDefault,
+      ...options,
+    });
+  } else {
+    return await makeFetchHappen(url, {
+      cache: "no-store",
+      ...optionsWithoutCachePath,
+    });
+  }
+}
+
+async function canAccess(filePath) {
+  try {
+    await fsPromises.access(
+      filePath,
+      fsPromises.constants.R_OK | fsPromises.constants.W_OK
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 module.exports = { lookupOrPerform };

package/generator/static-code/hmr.js

@@ -224,8 +224,11 @@ function htmlSanitize(str, type) {
   );
 }
 
-const parseHeader = (title, path) =>
-  `-- ${title.replace("-", " ")} --------------- ${path}`;
+function parseHeader(title, path) {
+  return `-- ${(title || "ERROR").replace("-", " ")} --------------- ${
+    path || ""
+  }`;
+}
 
 /*
   |-------------------------------------------------------------------------------
@@ -253,6 +256,14 @@ const parseConsoleErrors =
    * */
   (info) => {
     if (info.rule) {
+      if (info.details) {
+        return joinMessage(
+          info.details.reduce(consoleMsg, {
+            error: [consoleHeader(info.rule, path)],
+            style: [styleColor("blue")],
+          })
+        );
+      }
       return joinMessage(
         info.formatted.reduce(consoleMsg, {
           error: [consoleHeader(info.rule, path)],
@@ -313,6 +324,9 @@ const parseHtmlErrors = (path) => (info) => {
   if (info.rule) {
     return info.formatted.reduce(htmlMsg, htmlHeader(info.rule, path));
   } else {
+    if (info.details) {
+      return info.details.reduce(htmlMsg, htmlHeader(info.title, path));
+    }
     return info.message.reduce(htmlMsg, htmlHeader(info.title, path));
   }
 };

package/package.json

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