elm-pages 3.0.0-beta.31 → 3.0.0-beta.33

package/README.md

@@ -81,7 +81,7 @@ https://github.com/dillonkearns/elm-pages/projects
 You will see an error if the NPM and Elm package do not have a matching Compatibility Key. Usually it's best to upgrade to the latest version of both the Elm and NPM
 packages when you upgrade. However, in case you want to install versions that are behind the latest, the Compatibility Key is included here for reference.
 
-Current Compatibility Key: 12.
+Current Compatibility Key: 13.
 
 ## Contributors ✨
 

package/generator/src/cli.js

@@ -103,9 +103,11 @@ async function main() {
 
         const portBackendTaskCompiled = esbuild
           .build({
-            entryPoints: [path.join(projectDirectory, "./custom-backend-task")],
+            entryPoints: [
+              path.resolve(projectDirectory, "./custom-backend-task"),
+            ],
             platform: "node",
-            outfile: path.join(
+            outfile: path.resolve(
               projectDirectory,
               ".elm-pages/compiled-ports/custom-backend-task.mjs"
             ),
@@ -126,14 +128,13 @@ async function main() {
           })
           .catch((error) => {
             const portBackendTaskFileFound =
-              globby.globbySync("./custom-backend-task.*").length > 0;
+              globby.globbySync(
+                path.resolve(projectDirectory, "./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
-              console.error(
-                "Failed to start custom-backend-task watcher",
-                error
-              );
+              console.error("Failed to load custom-backend-task file.", error);
             }
           });
         const portsPath = await portBackendTaskCompiled;
@@ -204,12 +205,12 @@ async function main() {
 
         const portBackendTaskFileFound =
           globby.globbySync(
-            path.join(projectDirectory, "custom-backend-task.*")
+            path.resolve(projectDirectory, "custom-backend-task.*")
           ).length > 0;
 
         const scriptRunner = `${
           portBackendTaskFileFound
-            ? `import * as customBackendTask from "${path.join(
+            ? `import * as customBackendTask from "${path.resolve(
                 projectDirectory,
                 "./custom-backend-task"
               )}";`

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 12;
+export const compatibilityKey = 13;
 
-export const packageVersion = "3.0.0-beta.31";
+export const packageVersion = "3.0.0-beta.33";

package/generator/src/render.js

@@ -91,6 +91,7 @@ export async function runGenerator(
     );
     return result;
   } catch (error) {
+    process.exitCode = 1;
     console.log(restoreColorSafe(error));
   }
 }

package/generator/src/request-cache.js

@@ -202,12 +202,26 @@ export function lookupOrPerform(
           },
         });
       } catch (error) {
-        console.trace("@@@ request-cache2 HTTP error", error);
-        reject({
-          title: "BackendTask.Http Error",
-          message: `${kleur.yellow().underline(request.url)} ${error.toString()}
-`,
-        });
+        if (error.code === "ECONNREFUSED") {
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "NetworkError" },
+          });
+        } else if (
+          error.code === "ETIMEDOUT" ||
+          error.code === "ERR_SOCKET_TIMEOUT"
+        ) {
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "Timeout" },
+          });
+        } else {
+          console.trace("elm-pages unhandled HTTP error", error);
+          resolve({
+            kind: "response-json",
+            value: { "elm-pages-internal-error": "NetworkError" },
+          });
+        }
       }
     }
   });

package/generator/src/resolve-elm-module.js

@@ -52,10 +52,11 @@ export function resolveInputPathOrModuleName(inputPathOrModuleName) {
   if (
     /^[A-Z][a-zA-Z0-9_]*(\.[A-Z][a-zA-Z0-9_]*)*$/.test(inputPathOrModuleName)
   ) {
+    const absolutePathForScript = path.resolve("./script/src");
     return {
       moduleName: inputPathOrModuleName,
-      projectDirectory: "./script",
-      sourceDirectory: "./script/src",
+      projectDirectory: path.resolve("./script"),
+      sourceDirectory: path.resolve("./script/src"),
     };
   } else {
     return getElmModuleName(inputPathOrModuleName);

package/package.json

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

package/src/BackendTask/Http.elm

@@ -494,19 +494,25 @@ requestRaw request__ expect =
         (\maybeMockResolver rawResponseDict ->
             (case maybeMockResolver of
                 Just mockResolver ->
-                    mockResolver request_
+                    mockResolver request_ |> Maybe.map Ok
 
                 Nothing ->
                     rawResponseDict |> RequestsAndPending.get (request_ |> HashRequest.hash)
             )
                 |> (\maybeResponse ->
                         case maybeResponse of
-                            Just rawResponse ->
+                            Just (Ok rawResponse) ->
                                 Ok rawResponse
 
                             Nothing ->
                                 --Err (Pages.StaticHttpRequest.UserCalledStaticHttpFail ("INTERNAL ERROR - expected request" ++ request_.url))
                                 Err (BadBody Nothing ("INTERNAL ERROR - expected request" ++ request_.url))
+
+                            Just (Err RequestsAndPending.NetworkError) ->
+                                Err NetworkError
+
+                            Just (Err RequestsAndPending.Timeout) ->
+                                Err Timeout
                    )
                 |> Result.andThen
                     (\(RequestsAndPending.Response maybeResponse body) ->

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

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

package/src/RequestsAndPending.elm

@@ -1,4 +1,4 @@
-module RequestsAndPending exposing (RawResponse, RequestsAndPending, Response(..), ResponseBody(..), bodyEncoder, get)
+module RequestsAndPending exposing (HttpError(..), RawResponse, RequestsAndPending, Response(..), ResponseBody(..), bodyEncoder, get)
 
 import Base64
 import Bytes exposing (Bytes)
@@ -101,11 +101,39 @@ responseDecoder =
         (Decode.field "url" Decode.string)
 
 
-get : String -> RequestsAndPending -> Maybe Response
+get : String -> RequestsAndPending -> Maybe (Result HttpError Response)
 get key requestsAndPending =
     Decode.decodeValue
         (Decode.field key
-            (Decode.field "response" decoder)
+            (Decode.field "response"
+                (Decode.oneOf
+                    [ Decode.field "elm-pages-internal-error" errorDecoder |> Decode.map Err
+                    , decoder |> Decode.map Ok
+                    ]
+                )
+            )
         )
         requestsAndPending
         |> Result.toMaybe
+
+
+type HttpError
+    = NetworkError
+    | Timeout
+
+
+errorDecoder : Decoder HttpError
+errorDecoder =
+    Decode.string
+        |> Decode.andThen
+            (\errorCode ->
+                case errorCode of
+                    "NetworkError" ->
+                        Decode.succeed NetworkError
+
+                    "Timeout" ->
+                        Decode.succeed Timeout
+
+                    _ ->
+                        Decode.fail "Unhandled error code."
+            )

package/src/Scaffold/Form.elm

@@ -44,17 +44,7 @@ type alias Context =
     }
 
 
-{-| -}
-formWithFields :
-    Bool
-    -> List ( String, Kind )
-    ->
-        ({ formState : Context
-         , params : List { name : String, kind : Kind, param : Elm.Expression }
-         }
-         -> Elm.Expression
-        )
-    -> { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
+formWithFields : Bool -> List ( String, Kind ) -> ({ formState : { errors : Elm.Expression, isTransitioning : Elm.Expression, submitAttempted : Elm.Expression, data : Elm.Expression, expression : Elm.Expression }, params : List { name : String, kind : Kind, param : Elm.Expression } } -> Elm.Expression) -> { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
 formWithFields elmCssView fields viewFn =
     Elm.Declare.function "form"
         []
@@ -235,15 +225,11 @@ provide { fields, view, elmCssView } =
 
     else
         let
-            form : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
+            form : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
             form =
                 formWithFields elmCssView fields view
 
-            formHandlersDeclaration :
-                { declaration : Elm.Declaration
-                , call : List Elm.Expression -> Elm.Expression
-                , callFrom : List String -> List Elm.Expression -> Elm.Expression
-                }
+            formHandlersDeclaration : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
             formHandlersDeclaration =
                 -- TODO customizable formHandlers name?
                 Elm.Declare.function "formHandlers"

package/src/Scaffold/Route.elm

@@ -516,6 +516,7 @@ userFunction moduleName definitions =
             { declaration : Elm.Declaration
             , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
             , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+            , value : List String -> Elm.Expression
             }
         viewFn =
             case definitions.localState of
@@ -545,6 +546,7 @@ userFunction moduleName definitions =
                             { declaration : Elm.Declaration
                             , call : Elm.Expression -> Elm.Expression -> Elm.Expression
                             , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                            , value : List String -> Elm.Expression
                             }
                         viewDeclaration =
                             Elm.Declare.fn2 "view"
@@ -568,6 +570,7 @@ userFunction moduleName definitions =
                     { declaration = viewDeclaration.declaration
                     , call = \app shared _ -> viewDeclaration.call app shared
                     , callFrom = \a _ c d -> viewDeclaration.callFrom a c d
+                    , value = viewDeclaration.value
                     }
 
         localDefinitions :
@@ -576,9 +579,20 @@ userFunction moduleName definitions =
                     { declaration : Elm.Declaration
                     , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
                     , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , value : List String -> Elm.Expression
+                    }
+                , initFn :
+                    { declaration : Elm.Declaration
+                    , call : Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , value : List String -> Elm.Expression
+                    }
+                , subscriptionsFn :
+                    { declaration : Elm.Declaration
+                    , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , value : List String -> Elm.Expression
                     }
-                , initFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression }
-                , subscriptionsFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression }
                 , state : State
                 }
         localDefinitions =
@@ -626,7 +640,7 @@ userFunction moduleName definitions =
                         }
                     )
 
-        dataFn : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
+        dataFn : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
         dataFn =
             case definitions.action of
                 Pages Nothing ->
@@ -669,7 +683,7 @@ userFunction moduleName definitions =
                                     Elm.unit
                         )
 
-        actionFn : Maybe { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression }
+        actionFn : Maybe { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
         actionFn =
             case definitions.action of
                 Action action_ ->
@@ -699,7 +713,7 @@ userFunction moduleName definitions =
                                     (\_ -> justPagesExpression)
                             )
 
-        headFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression }
+        headFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
         headFn =
             Elm.Declare.fn "head"
                 ( "app", Just appType )