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

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 packageVersion = "3.0.0-beta.31";
+export const packageVersion = "3.0.0-beta.32";

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.32",
   "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/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 )