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

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: 4.
+Current Compatibility Key: 5.
 
 ## Contributors ✨
 

package/codegen/elm-pages-codegen.js

@@ -26209,9 +26209,6 @@ var $author$project$Gen$Pages$Internal$Platform$Cli$annotation_ = {
 						$author$project$Elm$Annotation$list(
 							A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'BuildError', _List_Nil))),
 						_Utils_Tuple2(
-						'allRawResponses',
-						A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'RequestsAndPending', _List_Nil)),
-						_Utils_Tuple2(
 						'maybeRequestJson',
 						A3(
 							$author$project$Elm$Annotation$namedWith,
@@ -27113,7 +27110,7 @@ var $author$project$Gen$BackendTask$call_ = {
 											A3(
 											$author$project$Elm$Annotation$namedWith,
 											_List_Nil,
-											'Catchable',
+											'Exception',
 											_List_fromArray(
 												[
 													$author$project$Elm$Annotation$var('error')
@@ -28201,7 +28198,7 @@ var $author$project$Gen$BackendTask$call_ = {
 											A3(
 											$author$project$Elm$Annotation$namedWith,
 											_List_Nil,
-											'Catchable',
+											'Exception',
 											_List_fromArray(
 												[
 													$author$project$Elm$Annotation$var('error')
@@ -28244,7 +28241,7 @@ var $author$project$Gen$BackendTask$call_ = {
 											A3(
 											$author$project$Elm$Annotation$namedWith,
 											_List_Nil,
-											'Catchable',
+											'Exception',
 											_List_fromArray(
 												[
 													$author$project$Elm$Annotation$var('error')
@@ -33792,7 +33789,7 @@ var $author$project$Gen$ApiRoute$values_ = {
 											'BackendTask',
 											_List_fromArray(
 												[
-													A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Never', _List_Nil),
+													A3($author$project$Elm$Annotation$namedWith, _List_Nil, 'Throwable', _List_Nil),
 													A3(
 													$author$project$Elm$Annotation$namedWith,
 													_List_fromArray(

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

package/generator/src/compatibility-key.js

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

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) {
-  app.ports.gotBatchSub.send(Object.fromEntries(pendingBackendTaskResponses));
-  pendingBackendTaskResponses = new Map();
-  // console.log("@@@ FLUSHING", temp.length);
+  // 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();
+  }
 }
 
 /**

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.15",
   "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/ApiRoute.elm

@@ -199,7 +199,7 @@ single handler =
 
 
 {-| -}
-serverRender : ApiRouteBuilder (Server.Request.Parser (BackendTask Never (Server.Response.Response Never Never))) constructor -> ApiRoute Response
+serverRender : ApiRouteBuilder (Server.Request.Parser (BackendTask Throwable (Server.Response.Response Never Never))) constructor -> ApiRoute Response
 serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
     ApiRoute
         { regex = Regex.fromString ("^" ++ pattern ++ "$") |> Maybe.withDefault Regex.never
@@ -225,7 +225,6 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
                                         case rendered of
                                             Just (Ok okRendered) ->
                                                 okRendered
-                                                    |> BackendTask.onError never
 
                                             Just (Err errors) ->
                                                 errors
@@ -233,13 +232,11 @@ serverRender ((ApiRouteBuilder patterns pattern _ _ _) as fullHandler) =
                                                     |> Server.Response.plainText
                                                     |> Server.Response.withStatusCode 400
                                                     |> BackendTask.succeed
-                                                    |> BackendTask.onError never
 
                                             Nothing ->
                                                 Server.Response.plainText "No matching request handler"
                                                     |> Server.Response.withStatusCode 400
                                                     |> BackendTask.succeed
-                                                    |> BackendTask.onError never
                                     )
                         )
                     |> Maybe.map (BackendTask.map (Server.Response.toJson >> Just))

package/src/BackendTask/Env.elm

@@ -8,22 +8,23 @@ down into the final `Data` value, it won't end up in the client!
 
     import BackendTask exposing (BackendTask)
     import BackendTask.Env
+    import Exception exposing (Throwable)
 
     type alias EnvVariables =
         { sendGridKey : String
         , siteUrl : String
         }
 
-    sendEmail : Email -> BackendTask ()
+    sendEmail : Email -> BackendTask Throwable ()
     sendEmail email =
         BackendTask.map2 EnvVariables
-            (BackendTask.Env.expect "SEND_GRID_KEY")
+            (BackendTask.Env.expect "SEND_GRID_KEY" |> BackendTask.throw)
             (BackendTask.Env.get "BASE_URL"
                 |> BackendTask.map (Maybe.withDefault "http://localhost:1234")
             )
             |> BackendTask.andThen (sendEmailBackendTask email)
 
-    sendEmailBackendTask : Email -> EnvVariables -> BackendTask ()
+    sendEmailBackendTask : Email -> EnvVariables -> BackendTask Throwable ()
     sendEmailBackendTask email envVariables =
         Debug.todo "Not defined here"
 
@@ -39,7 +40,7 @@ down into the final `Data` value, it won't end up in the client!
 import BackendTask exposing (BackendTask)
 import BackendTask.Http
 import BackendTask.Internal.Request
-import Exception exposing (Catchable)
+import Exception exposing (Exception)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import TerminalText
@@ -50,7 +51,8 @@ type Error
     = MissingEnvVariable String
 
 
-{-| Get an environment variable, or Nothing if there is no environment variable matching that name.
+{-| Get an environment variable, or Nothing if there is no environment variable matching that name. This `BackendTask`
+will never fail, but instead will return `Nothing` if the environment variable is missing.
 -}
 get : String -> BackendTask error (Maybe String)
 get envVariableName =
@@ -63,9 +65,9 @@ get envVariableName =
         }
 
 
-{-| Get an environment variable, or a BackendTask failure if there is no environment variable matching that name.
+{-| Get an environment variable, or a BackendTask Exception if there is no environment variable matching that name.
 -}
-expect : String -> BackendTask (Catchable Error) String
+expect : String -> BackendTask (Exception Error) String
 expect envVariableName =
     envVariableName
         |> get
@@ -73,7 +75,7 @@ expect envVariableName =
             (\maybeValue ->
                 maybeValue
                     |> Result.fromMaybe
-                        (Exception.Catchable (MissingEnvVariable envVariableName)
+                        (Exception.Exception (MissingEnvVariable envVariableName)
                             { title = "Missing Env Variable"
                             , body =
                                 [ TerminalText.text "BackendTask.Env.expect was expecting a variable `"

package/src/BackendTask/File.elm

@@ -51,7 +51,7 @@ plain old JSON in Elm.
 import BackendTask exposing (BackendTask)
 import BackendTask.Http
 import BackendTask.Internal.Request
-import Exception exposing (Catchable)
+import Exception exposing (Exception)
 import Json.Decode as Decode exposing (Decoder)
 import TerminalText
 
@@ -141,7 +141,7 @@ It's common to parse the body with a markdown parser or other format.
                 )
 
 -}
-bodyWithFrontmatter : (String -> Decoder frontmatter) -> String -> BackendTask (Catchable (FileReadError Decode.Error)) frontmatter
+bodyWithFrontmatter : (String -> Decoder frontmatter) -> String -> BackendTask (Exception (FileReadError Decode.Error)) frontmatter
 bodyWithFrontmatter frontmatterDecoder filePath =
     read filePath
         (body
@@ -213,7 +213,7 @@ the [`BackendTask`](BackendTask) API along with [`BackendTask.Glob`](BackendTask
             |> BackendTask.resolve
 
 -}
-onlyFrontmatter : Decoder frontmatter -> String -> BackendTask (Catchable (FileReadError Decode.Error)) frontmatter
+onlyFrontmatter : Decoder frontmatter -> String -> BackendTask (Exception (FileReadError Decode.Error)) frontmatter
 onlyFrontmatter frontmatterDecoder filePath =
     read filePath
         (frontmatter frontmatterDecoder)
@@ -240,7 +240,7 @@ Hey there! This is my first post :)
 Then data will yield the value `"Hey there! This is my first post :)"`.
 
 -}
-bodyWithoutFrontmatter : String -> BackendTask (Catchable (FileReadError decoderError)) String
+bodyWithoutFrontmatter : String -> BackendTask (Exception (FileReadError decoderError)) String
 bodyWithoutFrontmatter filePath =
     read filePath
         body
@@ -264,7 +264,7 @@ You could read a file called `hello.txt` in your root project directory like thi
         File.rawFile "hello.txt"
 
 -}
-rawFile : String -> BackendTask (Catchable (FileReadError decoderError)) String
+rawFile : String -> BackendTask (Exception (FileReadError decoderError)) String
 rawFile filePath =
     read filePath (Decode.field "rawFile" Decode.string)
 
@@ -286,7 +286,7 @@ The Decode will strip off any unused JSON data.
             "elm.json"
 
 -}
-jsonFile : Decoder a -> String -> BackendTask (Catchable (FileReadError Decode.Error)) a
+jsonFile : Decoder a -> String -> BackendTask (Exception (FileReadError Decode.Error)) a
 jsonFile jsonFileDecoder filePath =
     rawFile filePath
         |> BackendTask.andThen
@@ -295,7 +295,7 @@ jsonFile jsonFileDecoder filePath =
                     |> Decode.decodeString jsonFileDecoder
                     |> Result.mapError
                         (\jsonDecodeError ->
-                            Exception.Catchable (DecodingError jsonDecodeError)
+                            Exception.Exception (DecodingError jsonDecodeError)
                                 { title = "JSON Decoding Error"
                                 , body =
                                     [ TerminalText.text (Decode.errorToString jsonDecodeError)
@@ -314,7 +314,7 @@ body =
     Decode.field "withoutFrontmatter" Decode.string
 
 
-read : String -> Decoder a -> BackendTask (Catchable (FileReadError error)) a
+read : String -> Decoder a -> BackendTask (Exception (FileReadError error)) a
 read filePath decoder =
     BackendTask.Internal.Request.request
         { name = "read-file"
@@ -330,10 +330,10 @@ read filePath decoder =
         |> BackendTask.andThen BackendTask.fromResult
 
 
-errorDecoder : String -> Decoder (Catchable (FileReadError decoding))
+errorDecoder : String -> Decoder (Exception (FileReadError decoding))
 errorDecoder filePath =
     Decode.succeed
-        (Exception.Catchable FileDoesntExist
+        (Exception.Exception FileDoesntExist
             { title = "File Doesn't Exist"
             , body =
                 [ TerminalText.text "Couldn't find file at path `"

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 Exception exposing (Catchable, Throwable)
+import Exception exposing (Exception, Throwable)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import List.Extra
@@ -1054,7 +1054,7 @@ 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 (Catchable String) a
+expectUniqueMatch : Glob a -> BackendTask (Exception String) a
 expectUniqueMatch glob =
     glob
         |> toBackendTask

package/src/BackendTask/Http.elm

@@ -71,7 +71,22 @@ and describe your use case!
 
 ## Caching Options
 
-`elm-pages` performs GET requests using a local HTTP cache by default.
+`elm-pages` performs GET requests using a local HTTP cache by default. These requests are not performed using Elm's `elm/http`,
+but rather are performed in NodeJS. Under the hood it uses [the NPM package `make-fetch-happen`](https://github.com/npm/make-fetch-happen).
+Only GET requests made with `get`, `getJson`, or `getWithOptions` use local caching. Requests made with [`BackendTask.Http.request`](#request)
+are not cached, even if the method is set to `GET`.
+
+In dev mode, assets are cached more aggressively by default, whereas for a production build assets use a default to revalidate each cached response's freshness before using it (the `ForceRevalidate` [`CacheStrategy`](#CacheStrategy)).
+
+The default caching behavior for GET requests is to use a local cache in `.elm-pages/http-cache`. This uses the same caching behavior
+that browsers use to avoid re-downloading content when it hasn't changed. Servers can set HTTP response headers to explicitly control
+this caching behavior.
+
+  - [`cache-control` HTTP response headers](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control) let you set a length of time before considering an asset stale. This could mean that the server considers it acceptable for an asset to be somewhat outdated, or this could mean that the asset is guaranteed to be up-to-date until it is stale - those semantics are up to the server.
+  - `Last-Modified` and `ETag` HTTP response headers can be returned by the server allow [Conditional Requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/Conditional_requests). Conditional Requests let us send back the `Last-Modified` timestamp or `etag` hash for assets that are in our local cache to the server to check if the asset is fresh, and skip re-downloading it if it is unchanged (or download a fresh one otherwise).
+
+It's important to note that depending on how the server sets these HTTP response headers, we may have outdated data - either because the server explicitly allows assets to become outdated with their cache-control headers, OR because cache-control headers are not set. When these headers aren't explicitly set, [clients are allowed to cache assets for 10% of the amount of time since it was last modified](https://httpwg.org/specs/rfc7234.html#heuristic.freshness).
+For production builds, the default caching will ignore both the implicit and explicit information about an asset's freshness and _always_ revalidate it before using a locally cached response.
 
 @docs getWithOptions
 
@@ -89,7 +104,7 @@ import Base64
 import Bytes exposing (Bytes)
 import Bytes.Decode
 import Dict exposing (Dict)
-import Exception exposing (Catchable)
+import Exception exposing (Exception)
 import Json.Decode
 import Json.Encode as Encode
 import Pages.Internal.StaticHttpBody as Body
@@ -138,15 +153,16 @@ type alias Body =
     Body.Body
 
 
-{-| A simplified helper around [`BackendTask.Http.request`](#request), which builds up a BackendTask.Http GET request.
+{-| A simplified helper around [`BackendTask.Http.get`](#get), which builds up a BackendTask.Http GET request with `expectJson`.
 
     import BackendTask
     import BackendTask.Http
+    import Exception exposing (Exception)
     import Json.Decode as Decode exposing (Decoder)
 
-    getRequest : BackendTask Int
+    getRequest : BackendTask (Exception Error) Int
     getRequest =
-        BackendTask.Http.get
+        BackendTask.Http.getJson
             "https://api.github.com/repos/dillonkearns/elm-pages"
             (Decode.field "stargazers_count" Decode.int)
 
@@ -154,7 +170,7 @@ type alias Body =
 getJson :
     String
     -> Json.Decode.Decoder a
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 getJson url decoder =
     getWithOptions
         { url = url
@@ -167,11 +183,25 @@ getJson url decoder =
         }
 
 
-{-| -}
+{-| A simplified helper around [`BackendTask.Http.getWithOptions`](#getWithOptions), which builds up a GET request with
+the default retries, timeout, and HTTP caching options. If you need to configure those options or include HTTP request headers,
+use the more flexible `getWithOptions`.
+
+    import BackendTask
+    import BackendTask.Http
+    import Exception exposing (Exception)
+
+    getRequest : BackendTask (Exception Error) String
+    getRequest =
+        BackendTask.Http.get
+            "https://api.github.com/repos/dillonkearns/elm-pages"
+            BackendTask.Http.expectString
+
+-}
 get :
     String
     -> Expect a
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 get url expect =
     getWithOptions
         { url = url
@@ -185,6 +215,12 @@ get url expect =
 
 
 {-| Perform a GET request, with some additional options for the HTTP request, including options for caching behavior.
+
+  - `retries` - Default is 0. Will try performing request again if set to a number greater than 0.
+  - `timeoutInMs` - Default is no timeout.
+  - `cacheStrategy` - The [caching options are passed to the NPM package `make-fetch-happen`](https://github.com/npm/make-fetch-happen#opts-cache)
+  - `cachePath` - override the default directory for the local HTTP cache. This can be helpful if you want more granular control to clear some HTTP caches more or less frequently than others. Or you may want to preserve the local cache for some requests in your build server, but not store the cache for other requests.
+
 -}
 getWithOptions :
     { url : String
@@ -195,7 +231,7 @@ getWithOptions :
     , timeoutInMs : Maybe Int
     , cachePath : Maybe String
     }
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 getWithOptions request__ =
     let
         request_ : HashRequest.Request
@@ -222,7 +258,7 @@ post :
     String
     -> Body
     -> Expect a
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 post url body expect =
     request
         { url = url
@@ -361,7 +397,7 @@ request :
     , timeoutInMs : Maybe Int
     }
     -> Expect a
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 request request__ expect =
     let
         request_ : HashRequest.Request
@@ -439,7 +475,7 @@ with this as a low-level detail, or you can use functions like [BackendTask.Http
 requestRaw :
     HashRequest.Request
     -> Expect a
-    -> BackendTask (Catchable Error) a
+    -> BackendTask (Exception Error) a
 requestRaw request__ expect =
     let
         request_ : HashRequest.Request
@@ -537,7 +573,7 @@ requestRaw request__ expect =
                 |> BackendTask.fromResult
                 |> BackendTask.mapError
                     (\error ->
-                        Exception.Catchable error (errorToString error)
+                        Exception.Exception error (errorToString error)
                     )
         )