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

package/generator/dead-code-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: 4015861069, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 3582516438, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/dead-code-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: 4015861069,
+  initialSeed: 3582516438,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

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

package/generator/src/render.js

@@ -16,8 +16,6 @@ process.on("unhandledRejection", (error) => {
   console.error(error);
 });
 let foundErrors;
-let pendingBackendTaskResponses = new Map();
-let pendingBackendTaskCount;
 
 module.exports = { render, runGenerator };
 
@@ -44,8 +42,6 @@ async function render(
   const { fs, resetInMemoryFs } = require("./request-cache-fs.js")(hasFsAccess);
   resetInMemoryFs();
   foundErrors = false;
-  pendingBackendTaskResponses = new Map();
-  pendingBackendTaskCount = 0;
   // since init/update are never called in pre-renders, and BackendTask.Http is called using pure NodeJS HTTP fetching
   // we can provide a fake HTTP instead of xhr2 (which is otherwise needed for Elm HTTP requests from Node)
   XMLHttpRequest = {};
@@ -74,8 +70,6 @@ async function runGenerator(cliOptions, portsFile, elmModule) {
   const { fs, resetInMemoryFs } = require("./request-cache-fs.js")(true);
   resetInMemoryFs();
   foundErrors = false;
-  pendingBackendTaskResponses = new Map();
-  pendingBackendTaskCount = 0;
   // since init/update are never called in pre-renders, and BackendTask.Http is called using pure NodeJS HTTP fetching
   // we can provide a fake HTTP instead of xhr2 (which is otherwise needed for Elm HTTP requests from Node)
   XMLHttpRequest = {};
@@ -166,33 +160,39 @@ function runGeneratorAppHelp(
           );
         }
       } else if (fromElm.tag === "DoHttp") {
-        const requestHash = fromElm.args[0];
-        const requestToPerform = fromElm.args[1];
-        if (
-          requestToPerform.url !== "elm-pages-internal://port" &&
-          requestToPerform.url.startsWith("elm-pages-internal://")
-        ) {
-          runInternalJob(
-            requestHash,
-            app,
-            mode,
-            requestToPerform,
-            fs,
-            hasFsAccess,
-            patternsToWatch
-          );
-        } else {
-          runHttpJob(
-            requestHash,
-            portsFile,
-            app,
-            mode,
-            requestToPerform,
-            fs,
-            hasFsAccess,
-            fromElm.args[1]
-          );
-        }
+        app.ports.gotBatchSub.send(
+          Object.fromEntries(
+            await Promise.all(
+              fromElm.args[0].map(([requestHash, requestToPerform]) => {
+                if (
+                  requestToPerform.url !== "elm-pages-internal://port" &&
+                  requestToPerform.url.startsWith("elm-pages-internal://")
+                ) {
+                  return runInternalJob(
+                    requestHash,
+                    app,
+                    mode,
+                    requestToPerform,
+                    fs,
+                    hasFsAccess,
+                    patternsToWatch
+                  );
+                } else {
+                  return runHttpJob(
+                    requestHash,
+                    portsFile,
+                    app,
+                    mode,
+                    requestToPerform,
+                    fs,
+                    hasFsAccess,
+                    requestToPerform
+                  );
+                }
+              })
+            )
+          )
+        );
       } else if (fromElm.tag === "Errors") {
         foundErrors = true;
         reject(fromElm.args[0].errorsJson);
@@ -309,33 +309,39 @@ function runElmApp(
           );
         }
       } else if (fromElm.tag === "DoHttp") {
-        const requestHash = fromElm.args[0];
-        const requestToPerform = fromElm.args[1];
-        if (
-          requestToPerform.url !== "elm-pages-internal://port" &&
-          requestToPerform.url.startsWith("elm-pages-internal://")
-        ) {
-          runInternalJob(
-            requestHash,
-            app,
-            mode,
-            requestToPerform,
-            fs,
-            hasFsAccess,
-            patternsToWatch
-          );
-        } else {
-          runHttpJob(
-            requestHash,
-            portsFile,
-            app,
-            mode,
-            requestToPerform,
-            fs,
-            hasFsAccess,
-            fromElm.args[1]
-          );
-        }
+        app.ports.gotBatchSub.send(
+          Object.fromEntries(
+            await Promise.all(
+              fromElm.args[0].map(([requestHash, requestToPerform]) => {
+                if (
+                  requestToPerform.url !== "elm-pages-internal://port" &&
+                  requestToPerform.url.startsWith("elm-pages-internal://")
+                ) {
+                  return runInternalJob(
+                    requestHash,
+                    app,
+                    mode,
+                    requestToPerform,
+                    fs,
+                    hasFsAccess,
+                    patternsToWatch
+                  );
+                } else {
+                  return runHttpJob(
+                    requestHash,
+                    portsFile,
+                    app,
+                    mode,
+                    requestToPerform,
+                    fs,
+                    hasFsAccess,
+                    requestToPerform
+                  );
+                }
+              })
+            )
+          )
+        );
       } else if (fromElm.tag === "Errors") {
         foundErrors = true;
         reject(fromElm.args[0].errorsJson);
@@ -404,7 +410,6 @@ async function runHttpJob(
   hasFsAccess,
   useCache
 ) {
-  pendingBackendTaskCount += 1;
   try {
     const lookupResponse = await lookupOrPerform(
       portsFile,
@@ -416,25 +421,29 @@ async function runHttpJob(
 
     if (lookupResponse.kind === "cache-response-path") {
       const responseFilePath = lookupResponse.value;
-      pendingBackendTaskResponses.set(requestHash, {
-        request: requestToPerform,
-        response: JSON.parse(
-          (await fs.promises.readFile(responseFilePath, "utf8")).toString()
-        ),
-      });
+      return [
+        requestHash,
+        {
+          request: requestToPerform,
+          response: JSON.parse(
+            (await fs.promises.readFile(responseFilePath, "utf8")).toString()
+          ),
+        },
+      ];
     } else if (lookupResponse.kind === "response-json") {
-      pendingBackendTaskResponses.set(requestHash, {
-        request: requestToPerform,
-        response: lookupResponse.value,
-      });
+      return [
+        requestHash,
+        {
+          request: requestToPerform,
+          response: lookupResponse.value,
+        },
+      ];
     } else {
       throw `Unexpected kind ${lookupResponse}`;
     }
   } catch (error) {
-    sendError(app, error);
-  } finally {
-    pendingBackendTaskCount -= 1;
-    flushIfDone(app);
+    console.log("@@@ERROR", error);
+    // sendError(app, error);
   }
 }
 
@@ -461,43 +470,29 @@ async function runInternalJob(
   patternsToWatch
 ) {
   try {
-    pendingBackendTaskCount += 1;
-
     if (requestToPerform.url === "elm-pages-internal://log") {
-      pendingBackendTaskResponses.set(
-        requestHash,
-        await runLogJob(requestToPerform)
-      );
+      return [requestHash, await runLogJob(requestToPerform)];
     } else if (requestToPerform.url === "elm-pages-internal://read-file") {
-      pendingBackendTaskResponses.set(
+      return [
         requestHash,
-        await readFileJobNew(requestToPerform, patternsToWatch)
-      );
+        await readFileJobNew(requestToPerform, patternsToWatch),
+      ];
     } else if (requestToPerform.url === "elm-pages-internal://glob") {
-      pendingBackendTaskResponses.set(
-        requestHash,
-        await runGlobNew(requestToPerform, patternsToWatch)
-      );
+      return [requestHash, await runGlobNew(requestToPerform, patternsToWatch)];
     } else if (requestToPerform.url === "elm-pages-internal://env") {
-      pendingBackendTaskResponses.set(
-        requestHash,
-        await runEnvJob(requestToPerform, patternsToWatch)
-      );
+      return [requestHash, await runEnvJob(requestToPerform, patternsToWatch)];
     } else if (requestToPerform.url === "elm-pages-internal://encrypt") {
-      pendingBackendTaskResponses.set(
+      return [
         requestHash,
-        await runEncryptJob(requestToPerform, patternsToWatch)
-      );
+        await runEncryptJob(requestToPerform, patternsToWatch),
+      ];
     } else if (requestToPerform.url === "elm-pages-internal://decrypt") {
-      pendingBackendTaskResponses.set(
+      return [
         requestHash,
-        await runDecryptJob(requestToPerform, patternsToWatch)
-      );
+        await runDecryptJob(requestToPerform, patternsToWatch),
+      ];
     } else if (requestToPerform.url === "elm-pages-internal://write-file") {
-      pendingBackendTaskResponses.set(
-        requestHash,
-        await runWriteFileJob(requestToPerform)
-      );
+      return [requestHash, await runWriteFileJob(requestToPerform)];
     } else {
       throw `Unexpected internal BackendTask request format: ${kleur.yellow(
         JSON.stringify(2, null, requestToPerform)
@@ -505,9 +500,6 @@ async function runInternalJob(
     }
   } catch (error) {
     sendError(app, error);
-  } finally {
-    pendingBackendTaskCount -= 1;
-    flushIfDone(app);
   }
 }
 
@@ -628,27 +620,6 @@ async function runDecryptJob(req, patternsToWatch) {
   }
 }
 
-function flushIfDone(app) {
-  if (foundErrors) {
-    pendingBackendTaskResponses = new Map();
-  } else if (pendingBackendTaskCount === 0) {
-    // console.log(
-    //   `Flushing ${pendingBackendTaskResponses.length} items in ${timeUntilThreshold}ms`
-    // );
-
-    flushQueue(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();
-  // }
-}
-
 /**
  * @param {{ ports: { fromJsPort: { send: (arg0: { tag: string; data: any; }) => void; }; }; }} app
  * @param {{ message: string; title: string; }} error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.17",
+  "version": "3.0.0-beta.18",
   "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/Custom.elm

@@ -59,7 +59,7 @@ ${Object.keys(process.env).join("\n")}
 
 ## Performance
 
-As with any JavaScript or NodeJS code, avoid doing blocking IO operations. For example, avoid using `fs.readFileSync`, because blocking IO can slow down your elm-pages builds and dev server. `elm-pages` performances all `BackendTask`'s in parallel whenever possible.
+As with any JavaScript or NodeJS code, avoid doing blocking IO operations. For example, avoid using `fs.readFileSync`, because blocking IO can slow down your elm-pages builds and dev server. `elm-pages` performs all `BackendTask`'s in parallel whenever possible.
 So if you do `BackendTask.map2 Tuple.pair myHttpBackendTask myCustomBackendTask`, it will resolve those two in parallel. NodeJS performs best when you take advantage of its ability to do non-blocking I/O (file reads, HTTP requests, etc.). If you use `BackendTask.andThen`,
 it will need to resolve them in sequence rather than in parallel, but it's still best to avoid blocking IO operations in your Custom BackendTask definitions.
 

package/src/BackendTask/Glob.elm

@@ -229,7 +229,7 @@ import BackendTask exposing (BackendTask)
 import BackendTask.Http
 import BackendTask.Internal.Glob exposing (Glob(..))
 import BackendTask.Internal.Request
-import FatalError exposing (FatalError, Recoverable)
+import FatalError exposing (FatalError)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import List.Extra
@@ -1054,7 +1054,9 @@ so it's ideal to make this kind of assertion rather than having fallback behavio
 issues (like if we had instead ignored the case where there are two or more matching blog post files).
 
 -}
-expectUniqueMatch : Glob a -> BackendTask (Recoverable String) a
+expectUniqueMatch :
+    Glob a
+    -> BackendTask { fatal : FatalError, recoverable : String } a
 expectUniqueMatch glob =
     glob
         |> toBackendTask

package/src/BackendTask/Http.elm

@@ -104,7 +104,7 @@ import Base64
 import Bytes exposing (Bytes)
 import Bytes.Decode
 import Dict exposing (Dict)
-import FatalError exposing (FatalError, Recoverable)
+import FatalError exposing (FatalError)
 import Json.Decode
 import Json.Encode as Encode
 import Pages.Internal.StaticHttpBody as Body
@@ -170,7 +170,7 @@ type alias Body =
 getJson :
     String
     -> Json.Decode.Decoder a
-    -> BackendTask (Recoverable Error) a
+    -> BackendTask { fatal : FatalError, recoverable : Error } a
 getJson url decoder =
     getWithOptions
         { url = url
@@ -231,7 +231,7 @@ getWithOptions :
     , timeoutInMs : Maybe Int
     , cachePath : Maybe String
     }
-    -> BackendTask (Recoverable Error) a
+    -> BackendTask { fatal : FatalError, recoverable : Error } a
 getWithOptions request__ =
     let
         request_ : HashRequest.Request
@@ -258,7 +258,7 @@ post :
     String
     -> Body
     -> Expect a
-    -> BackendTask (Recoverable Error) a
+    -> BackendTask { fatal : FatalError, recoverable : Error } a
 post url body expect =
     request
         { url = url
@@ -397,7 +397,7 @@ request :
     , timeoutInMs : Maybe Int
     }
     -> Expect a
-    -> BackendTask (Recoverable Error) a
+    -> BackendTask { fatal : FatalError, recoverable : Error } a
 request request__ expect =
     let
         request_ : HashRequest.Request
@@ -475,7 +475,7 @@ with this as a low-level detail, or you can use functions like [BackendTask.Http
 requestRaw :
     HashRequest.Request
     -> Expect a
-    -> BackendTask (Recoverable Error) a
+    -> BackendTask { fatal : FatalError, recoverable : Error } a
 requestRaw request__ expect =
     let
         request_ : HashRequest.Request

package/src/FatalError.elm

@@ -1,7 +1,4 @@
-module FatalError exposing
-    ( FatalError, fromString, recoverable
-    , Recoverable
-    )
+module FatalError exposing (FatalError, 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
@@ -59,20 +56,11 @@ when these errors occur.
 
 @docs FatalError, fromString, recoverable
 
-@docs Recoverable
-
 -}
 
 import Pages.Internal.FatalError
 
 
-{-| -}
-type alias Recoverable error =
-    { fatal : FatalError
-    , recoverable : error
-    }
-
-
 {-| -}
 type alias FatalError =
     Pages.Internal.FatalError.FatalError
@@ -94,7 +82,7 @@ fromString string =
 
 
 {-| -}
-recoverable : { title : String, body : String } -> value -> Recoverable value
+recoverable : { title : String, body : String } -> error -> { fatal : FatalError, recoverable : error }
 recoverable info value =
     { fatal = build info
     , recoverable = value

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

@@ -209,8 +209,13 @@ perform site renderRequest config effect =
         Effect.Batch list ->
             flatten site renderRequest config list
 
-        Effect.FetchHttp unmasked ->
-            ToJsPayload.DoHttp (Pages.StaticHttp.Request.hash unmasked) unmasked
+        Effect.FetchHttp requests ->
+            requests
+                |> List.map
+                    (\request ->
+                        ( Pages.StaticHttp.Request.hash request, request )
+                    )
+                |> ToJsPayload.DoHttp
                 |> Codec.encoder (ToJsPayload.successCodecNew2 canonicalSiteUrl "")
                 |> config.toJsPort
                 |> Cmd.map never
@@ -817,10 +822,7 @@ nextStepToEffect model nextStep =
             ( { model
                 | staticResponses = updatedStaticResponsesModel
               }
-            , (httpRequests
-                |> List.map Effect.FetchHttp
-              )
-                |> Effect.Batch
+            , Effect.FetchHttp httpRequests
             )
 
         StaticResponses.FinishedWithErrors errors ->

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

@@ -7,7 +7,7 @@ import Pages.StaticHttp.Request as StaticHttp
 
 type Effect
     = NoEffect
-    | FetchHttp StaticHttp.Request
+    | FetchHttp (List StaticHttp.Request)
     | Batch (List Effect)
     | SendSinglePage ToJsSuccessPayloadNewCombined
     | SendSinglePageNew Bytes ToJsSuccessPayloadNewCombined

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

@@ -183,8 +183,13 @@ perform config effect =
         Effect.Batch list ->
             flatten config list
 
-        Effect.FetchHttp unmasked ->
-            ToJsPayload.DoHttp (Pages.StaticHttp.Request.hash unmasked) unmasked
+        Effect.FetchHttp requests ->
+            requests
+                |> List.map
+                    (\request ->
+                        ( Pages.StaticHttp.Request.hash request, request )
+                    )
+                |> ToJsPayload.DoHttp
                 |> Codec.encoder (ToJsPayload.successCodecNew2 canonicalSiteUrl "")
                 |> config.toJsPort
                 |> Cmd.map never
@@ -349,10 +354,7 @@ nextStepToEffect model nextStep =
             ( { model
                 | staticResponses = updatedStaticResponsesModel
               }
-            , (httpRequests
-                |> List.map Effect.FetchHttp
-              )
-                |> Effect.Batch
+            , Effect.FetchHttp httpRequests
             )
 
         StaticResponses.Finish () ->

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

@@ -89,7 +89,7 @@ headCodec canonicalSiteUrl currentPagePath =
 type ToJsSuccessPayloadNewCombined
     = PageProgress ToJsSuccessPayloadNew
     | SendApiResponse { body : Json.Encode.Value, staticHttpCache : Dict String String, statusCode : Int }
-    | DoHttp String Pages.StaticHttp.Request.Request
+    | DoHttp (List ( String, Pages.StaticHttp.Request.Request ))
     | Port String
     | Errors (List BuildError)
     | ApiResponse
@@ -109,8 +109,8 @@ successCodecNew2 canonicalSiteUrl currentPagePath =
                 PageProgress payload ->
                     success payload
 
-                DoHttp hash requestUrl ->
-                    vDoHttp hash requestUrl
+                DoHttp hashRequestPairs ->
+                    vDoHttp hashRequestPairs
 
                 SendApiResponse record ->
                     vSendApiResponse record
@@ -121,10 +121,7 @@ successCodecNew2 canonicalSiteUrl currentPagePath =
         |> Codec.variant1 "Errors" Errors errorCodec
         |> Codec.variant0 "ApiResponse" ApiResponse
         |> Codec.variant1 "PageProgress" PageProgress (successCodecNew canonicalSiteUrl currentPagePath)
-        |> Codec.variant2 "DoHttp"
-            DoHttp
-            Codec.string
-            Pages.StaticHttp.Request.codec
+        |> Codec.variant1 "DoHttp" DoHttp (Codec.list (Codec.tuple Codec.string Pages.StaticHttp.Request.codec))
         |> Codec.variant1 "ApiResponse"
             SendApiResponse
             (Codec.object (\body staticHttpCache statusCode -> { body = body, staticHttpCache = staticHttpCache, statusCode = statusCode })

package/src/Pages/Script.elm

@@ -34,7 +34,7 @@ import BackendTask.Http
 import BackendTask.Internal.Request
 import Cli.OptionsParser as OptionsParser
 import Cli.Program as Program
-import FatalError exposing (FatalError, Recoverable)
+import FatalError exposing (FatalError)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import Pages.Internal.Script
@@ -52,7 +52,7 @@ type Error
 
 
 {-| -}
-writeFile : { path : String, body : String } -> BackendTask (Recoverable Error) ()
+writeFile : { path : String, body : String } -> BackendTask { fatal : FatalError, recoverable : Error } ()
 writeFile { path, body } =
     BackendTask.Internal.Request.request
         { name = "write-file"