mirror of
https://github.com/dillonkearns/elm-pages-v3-beta.git
synced 2024-12-23 03:42:04 +03:00
Wire through new type, with some failing tests for now.
This commit is contained in:
Dillon Kearns
parent
862094dfb1
commit
cef74a2c6e
@ -140,13 +140,13 @@ map fn requestInfo =
|
||||
RequestError error ->
|
||||
RequestError error
|
||||
|
||||
Request ( urls, lookupFn ) ->
|
||||
Request
|
||||
Request partiallyStripped ( urls, lookupFn ) ->
|
||||
Request partiallyStripped
|
||||
( urls
|
||||
, \appType rawResponses ->
|
||||
lookupFn appType rawResponses
|
||||
|> (\( partiallyStripped, nextRequest ) ->
|
||||
( partiallyStripped, map fn nextRequest )
|
||||
|> (\nextRequest ->
|
||||
map fn nextRequest
|
||||
)
|
||||
)
|
||||
|
||||
@ -232,36 +232,36 @@ map2 fn request1 request2 =
|
||||
( _, RequestError error ) ->
|
||||
RequestError error
|
||||
|
||||
( Request ( urls1, lookupFn1 ), Request ( urls2, lookupFn2 ) ) ->
|
||||
( Request newDict1 ( urls1, lookupFn1 ), Request newDict2 ( urls2, lookupFn2 ) ) ->
|
||||
let
|
||||
value : ApplicationType -> RequestsAndPending -> ( Dict String WhatToDo, DataSource c )
|
||||
value : ApplicationType -> RequestsAndPending -> DataSource c
|
||||
value appType rawResponses =
|
||||
case ( lookupFn1 appType rawResponses, lookupFn2 appType rawResponses ) of
|
||||
( ( newDict1, newValue1 ), ( newDict2, newValue2 ) ) ->
|
||||
( combineReducedDicts newDict1 newDict2, map2 fn newValue1 newValue2 )
|
||||
( newValue1, newValue2 ) ->
|
||||
map2 fn newValue1 newValue2
|
||||
in
|
||||
Request
|
||||
Request (combineReducedDicts newDict1 newDict2)
|
||||
( urls1 ++ urls2
|
||||
, value
|
||||
)
|
||||
|
||||
( Request ( urls1, lookupFn1 ), Done value2 ) ->
|
||||
Request
|
||||
( Request dict1 ( urls1, lookupFn1 ), Done value2 ) ->
|
||||
Request dict1
|
||||
( urls1
|
||||
, \appType rawResponses ->
|
||||
lookupFn1 appType rawResponses
|
||||
|> (\( dict1, value1 ) ->
|
||||
( dict1, map2 fn value1 (Done value2) )
|
||||
|> (\value1 ->
|
||||
map2 fn value1 (Done value2)
|
||||
)
|
||||
)
|
||||
|
||||
( Done value2, Request ( urls1, lookupFn1 ) ) ->
|
||||
Request
|
||||
( Done value2, Request dict1 ( urls1, lookupFn1 ) ) ->
|
||||
Request dict1
|
||||
( urls1
|
||||
, \appType rawResponses ->
|
||||
lookupFn1 appType rawResponses
|
||||
|> (\( dict1, value1 ) ->
|
||||
( dict1, map2 fn (Done value2) value1 )
|
||||
|> (\value1 ->
|
||||
map2 fn (Done value2) value1
|
||||
)
|
||||
)
|
||||
|
||||
@ -290,9 +290,9 @@ lookupHelp strippedSoFar appType requestInfo rawResponses =
|
||||
RequestError error ->
|
||||
Err error
|
||||
|
||||
Request ( urls, lookupFn ) ->
|
||||
Request strippedResponses ( urls, lookupFn ) ->
|
||||
lookupFn appType rawResponses
|
||||
|> (\( strippedResponses, nextRequest ) ->
|
||||
|> (\nextRequest ->
|
||||
lookupHelp (Dict.union strippedResponses strippedSoFar)
|
||||
appType
|
||||
(addUrls urls nextRequest)
|
||||
@ -309,8 +309,8 @@ addUrls urlsToAdd requestInfo =
|
||||
RequestError error ->
|
||||
RequestError error
|
||||
|
||||
Request ( initialUrls, function ) ->
|
||||
Request ( initialUrls ++ urlsToAdd, function )
|
||||
Request stripped ( initialUrls, function ) ->
|
||||
Request stripped ( initialUrls ++ urlsToAdd, function )
|
||||
|
||||
Done value ->
|
||||
Done value
|
||||
@ -333,7 +333,7 @@ lookupUrls requestInfo =
|
||||
-- TODO should this have URLs passed through?
|
||||
[]
|
||||
|
||||
Request ( urls, _ ) ->
|
||||
Request stripped ( urls, _ ) ->
|
||||
urls
|
||||
|
||||
Done _ ->
|
||||
@ -359,7 +359,8 @@ from the previous response to build up the URL, headers, etc. that you send to t
|
||||
-}
|
||||
andThen : (a -> DataSource b) -> DataSource a -> DataSource b
|
||||
andThen fn requestInfo =
|
||||
Request
|
||||
-- TODO should this be non-empty Dict? Or should it be passed down some other way?
|
||||
Request Dict.empty
|
||||
( lookupUrls requestInfo
|
||||
, \appType rawResponses ->
|
||||
lookup appType
|
||||
@ -370,10 +371,11 @@ andThen fn requestInfo =
|
||||
Err error ->
|
||||
-- TODO should I pass through strippedResponses here?
|
||||
--( strippedResponses, fn value )
|
||||
( Dict.empty, RequestError error )
|
||||
RequestError error
|
||||
|
||||
Ok ( strippedResponses, value ) ->
|
||||
( strippedResponses, fn value )
|
||||
-- TODO maybe use strippedResponses here?
|
||||
fn value
|
||||
)
|
||||
)
|
||||
|
||||
@ -404,10 +406,10 @@ andThen fn requestInfo =
|
||||
-}
|
||||
succeed : a -> DataSource a
|
||||
succeed value =
|
||||
Request
|
||||
Request Dict.empty
|
||||
( []
|
||||
, \_ _ ->
|
||||
( Dict.empty, Done value )
|
||||
Done value
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -244,7 +244,7 @@ unoptimizedRequest :
|
||||
unoptimizedRequest requestWithSecrets expect =
|
||||
case expect of
|
||||
ExpectJson decoder ->
|
||||
Request
|
||||
Request Dict.empty
|
||||
( [ requestWithSecrets ]
|
||||
, \appType rawResponseDict ->
|
||||
case appType of
|
||||
@ -353,7 +353,7 @@ unoptimizedRequest requestWithSecrets expect =
|
||||
)
|
||||
|
||||
ExpectUnoptimizedJson decoder ->
|
||||
Request
|
||||
Request Dict.empty
|
||||
( [ requestWithSecrets ]
|
||||
, \_ rawResponseDict ->
|
||||
rawResponseDict
|
||||
@ -403,7 +403,7 @@ unoptimizedRequest requestWithSecrets expect =
|
||||
)
|
||||
|
||||
ExpectString mapStringFn ->
|
||||
Request
|
||||
Request Dict.empty
|
||||
( [ requestWithSecrets ]
|
||||
, \_ rawResponseDict ->
|
||||
rawResponseDict
|
||||
@ -440,11 +440,12 @@ unoptimizedRequest requestWithSecrets expect =
|
||||
)
|
||||
|
||||
|
||||
toResult : Result Pages.StaticHttpRequest.Error ( Dict.Dict k v, RawRequest value ) -> ( Dict.Dict k v, RawRequest value )
|
||||
toResult : Result Pages.StaticHttpRequest.Error ( Dict.Dict String Pages.StaticHttpRequest.WhatToDo, RawRequest value ) -> RawRequest value
|
||||
toResult result =
|
||||
case result of
|
||||
Err error ->
|
||||
( Dict.empty, RequestError error )
|
||||
RequestError error
|
||||
|
||||
Ok okValue ->
|
||||
Ok ( stripped, okValue ) ->
|
||||
-- TODO do I need to use stripped here?
|
||||
okValue
|
||||
|
||||
@ -14,8 +14,9 @@ import TerminalText as Terminal
|
||||
|
||||
type RawRequest value
|
||||
= Request
|
||||
(Dict String WhatToDo)
|
||||
( List (Secrets.Value Pages.StaticHttp.Request.Request)
|
||||
, ApplicationType -> RequestsAndPending -> ( Dict String WhatToDo, RawRequest value )
|
||||
, ApplicationType -> RequestsAndPending -> RawRequest value
|
||||
)
|
||||
| RequestError Error
|
||||
| Done value
|
||||
@ -73,9 +74,9 @@ strippedResponsesHelp usedSoFar appType request rawResponses =
|
||||
RequestError error ->
|
||||
usedSoFar
|
||||
|
||||
Request ( _, lookupFn ) ->
|
||||
Request partiallyStrippedResponses ( _, lookupFn ) ->
|
||||
case lookupFn appType rawResponses of
|
||||
( partiallyStrippedResponses, followupRequest ) ->
|
||||
followupRequest ->
|
||||
strippedResponsesHelp
|
||||
(Dict.merge
|
||||
(\key a -> Dict.insert key a)
|
||||
@ -136,9 +137,9 @@ resolve appType request rawResponses =
|
||||
RequestError error ->
|
||||
Err error
|
||||
|
||||
Request ( _, lookupFn ) ->
|
||||
Request _ ( _, lookupFn ) ->
|
||||
case lookupFn appType rawResponses of
|
||||
( _, nextRequest ) ->
|
||||
nextRequest ->
|
||||
resolve appType nextRequest rawResponses
|
||||
|
||||
Done value ->
|
||||
@ -154,9 +155,9 @@ resolveUrls appType request rawResponses =
|
||||
-- TODO do I need to preserve the URLs here? -- urlList
|
||||
)
|
||||
|
||||
Request ( urlList, lookupFn ) ->
|
||||
Request _ ( urlList, lookupFn ) ->
|
||||
case lookupFn appType rawResponses of
|
||||
( _, nextRequest ) ->
|
||||
nextRequest ->
|
||||
resolveUrls appType nextRequest rawResponses
|
||||
|> Tuple.mapSecond ((++) urlList)
|
||||
|
||||
@ -199,9 +200,9 @@ cacheRequestResolutionHelp foundUrls appType request rawResponses =
|
||||
UserCalledStaticHttpFail _ ->
|
||||
HasPermanentError error
|
||||
|
||||
Request ( urlList, lookupFn ) ->
|
||||
Request _ ( urlList, lookupFn ) ->
|
||||
case lookupFn appType rawResponses of
|
||||
( _, nextRequest ) ->
|
||||
nextRequest ->
|
||||
cacheRequestResolutionHelp urlList appType nextRequest rawResponses
|
||||
|
||||
Done _ ->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user