dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-11-29 09:32:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more error message wiring.

Browse Source
This commit is contained in:
Dillon Kearns 2019-10-28 16:26:44 -07:00
parent ceb7842f26
commit d0012178cc
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Pages/Internal/Platform/Cli.elm
View File

@ -120,7 +120,7 @@ type alias Model =
type Error
= MissingSecret ErrorContext String
= MissingSecret String
| MetadataDecodeError ErrorContext String
| InternalError String
@ -344,10 +344,9 @@ init toModel contentCache siteMetadata config cliMsgConstructor flags =
]
)
Err error ->
( Model staticResponses secrets [ error ] |> toModel
Err errors ->
( Model staticResponses secrets errors |> toModel
, Errors "TODO" |> SendJsData
-- , Errors error |> SendJsData
)
-- |> Cmd.map cliMsgConstructor
@ -473,7 +472,7 @@ update siteMetadata config msg model =
)
performStaticHttpRequests : Secrets -> List ( PagePath pathKey, StaticHttp.Request a ) -> Result Error (Effect pathKey)
performStaticHttpRequests : Secrets -> List ( PagePath pathKey, StaticHttp.Request a ) -> Result (List Error) (Effect pathKey)
performStaticHttpRequests secrets staticRequests =
staticRequests
|> List.map
@ -491,9 +490,9 @@ performStaticHttpRequests secrets staticRequests =
(\unmasked ->
FetchHttp unmasked (Secrets.useFakeSecrets urlBuilder)
)
|> Result.mapError (\errorMessage -> MissingSecret { path = [] } errorMessage)
|> Result.mapError (\errorMessage -> MissingSecret errorMessage)
)
|> combineSimple
|> combineMultipleErrors
|> Result.map Batch
@ -502,6 +501,31 @@ combineSimple =
List.foldr (Result.map2 (::)) (Ok [])
combineMultipleErrors : List (Result error a) -> Result (List error) (List a)
combineMultipleErrors results =
List.foldr
(\result soFarResult ->
case soFarResult of
Ok soFarOk ->
case result of
Ok value ->
value :: soFarOk |> Ok
Err error ->
Err [ error ]
Err errorsSoFar ->
case result of
Ok _ ->
Err errorsSoFar
Err error ->
Err <| error :: errorsSoFar
)
(Ok [])
results
staticResponsesInit : List ( PagePath pathKey, StaticHttp.Request value ) -> StaticResponses
staticResponsesInit list =
list