elm-pages 3.0.0-beta.9 → 3.0.0

package/src/RenderRequest.elm

@@ -13,15 +13,15 @@ import Internal.ApiRoute
 import Json.Decode as Decode
 import Json.Encode as Encode
 import Pages.ProgramConfig exposing (ProgramConfig)
-import Path exposing (Path)
 import Regex
 import Url exposing (Url)
+import UrlPath exposing (UrlPath)
 
 
 type RequestPayload route
-    = Page { path : Path, frontmatter : route }
+    = Page { path : UrlPath, frontmatter : route }
     | Api ( String, ApiRoute.ApiRoute ApiRoute.Response )
-    | NotFound Path
+    | NotFound UrlPath
 
 
 type RenderRequest route
@@ -32,7 +32,7 @@ default : RenderRequest route
 default =
     SinglePage
         HtmlAndJson
-        (NotFound (Path.fromString "/error"))
+        (NotFound (UrlPath.fromString "/error"))
         Encode.null
 
 
@@ -119,12 +119,12 @@ requestPayloadDecoder config =
                                     ( path, justApi ) |> Api
 
                                 Nothing ->
-                                    NotFound (Path.fromString path)
+                                    NotFound (UrlPath.fromString path)
 
                         else
                             Page
                                 { frontmatter = route
-                                , path = config.routeToPath route |> Path.join
+                                , path = config.routeToPath route |> UrlPath.join
                                 }
 
                     Nothing ->
@@ -133,7 +133,7 @@ requestPayloadDecoder config =
                                 ( path, justApi ) |> Api
 
                             Nothing ->
-                                NotFound (Path.fromString path)
+                                NotFound (UrlPath.fromString path)
             )
     )
         |> Decode.field "path"

package/src/RequestsAndPending.elm

@@ -1,16 +1,14 @@
-module RequestsAndPending exposing (RequestsAndPending, Response(..), ResponseBody(..), batchDecoder, bodyEncoder, decoder, get)
+module RequestsAndPending exposing (HttpError(..), RawResponse, RequestsAndPending, Response(..), ResponseBody(..), bodyEncoder, get)
 
 import Base64
 import Bytes exposing (Bytes)
-import Codec
 import Dict exposing (Dict)
 import Json.Decode as Decode exposing (Decoder)
 import Json.Encode as Encode
-import Pages.StaticHttp.Request
 
 
 type alias RequestsAndPending =
-    Dict String (Maybe Response)
+    Decode.Value
 
 
 type ResponseBody
@@ -20,18 +18,6 @@ type ResponseBody
     | WhateverBody
 
 
-batchDecoder : Decoder (List { request : Pages.StaticHttp.Request.Request, response : Response })
-batchDecoder =
-    Decode.map2 (\request response -> { request = request, response = response })
-        (Decode.field "request"
-            (Pages.StaticHttp.Request.codec
-                |> Codec.decoder
-            )
-        )
-        (Decode.field "response" decoder)
-        |> Decode.list
-
-
 decoder : Decoder Response
 decoder =
     Decode.map2 Response
@@ -115,8 +101,39 @@ responseDecoder =
         (Decode.field "url" Decode.string)
 
 
-get : String -> RequestsAndPending -> Maybe Response
+get : String -> RequestsAndPending -> Maybe (Result HttpError Response)
 get key requestsAndPending =
-    requestsAndPending
-        |> Dict.get key
-        |> Maybe.andThen identity
+    Decode.decodeValue
+        (Decode.field key
+            (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/Result/Extra.elm

@@ -0,0 +1,26 @@
+module Result.Extra exposing (combine, isOk, merge)
+
+
+isOk : Result x a -> Bool
+isOk result =
+    case result of
+        Ok _ ->
+            True
+
+        Err _ ->
+            False
+
+
+merge : Result a a -> a
+merge r =
+    case r of
+        Ok rr ->
+            rr
+
+        Err rr ->
+            rr
+
+
+combine : List (Result x a) -> Result x (List a)
+combine =
+    List.foldr (Result.map2 (::)) (Ok [])