scarf-sh/tie
1
1
Fork 0
mirror of https://github.com/scarf-sh/tie.git synced 2024-11-27 00:15:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix generation of optional query parameters

Browse Source
This commit is contained in:
Alex Biehl 2022-02-20 20:43:05 +01:00
parent 193bbe2226
commit c1c9b1fdb4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Tie/Codegen/Operation.hs
View File

@ -331,12 +331,13 @@ codegenQueryParamGuard Param {name, required} continuation
)
)
| otherwise =
"case" <+> "fmap" <+> "(" <> "fmap" <+> "(" <> "Web.HttpApiData.parseUrlPiece" <+> "." <+> "Data.Text.Encoding.decodeUtf8" <> ")" <> ")" <+> "("
"case" <+> "Control.Monad.join" <+> "(" <> "fmap" <+> "(" <> "fmap" <+> "(" <> "Web.HttpApiData.parseUrlPiece" <+> "." <+> "Data.Text.Encoding.decodeUtf8" <> ")" <> ")" <+> "("
<> "Data.List.lookup" <+> "\""
<> toParamName name
<> "\"" <+> "("
<> "Network.Wai.queryString" <+> "request"
<> ")"
<> ")"
<> ")" <+> "of"
<> PP.line
<> PP.indent

4
test/golden/test1.yaml.out
View File

@ -77,7 +77,7 @@ application run api notFound request respond =
Just (Left err) ->
undefined
Just (Right page) ->
case fmap (fmap (Web.HttpApiData.parseUrlPiece . Data.Text.Encoding.decodeUtf8)) (Data.List.lookup "offset" (Network.Wai.queryString request)) of
case Control.Monad.join (fmap (fmap (Web.HttpApiData.parseUrlPiece . Data.Text.Encoding.decodeUtf8)) (Data.List.lookup "offset" (Network.Wai.queryString request))) of
Just (Left err) ->
undefined
_x ->
@ -99,7 +99,7 @@ application run api notFound request respond =
Just (Left err) ->
undefined
Just (Right page) ->
case fmap (fmap (Web.HttpApiData.parseUrlPiece . Data.Text.Encoding.decodeUtf8)) (Data.List.lookup "offset" (Network.Wai.queryString request)) of
case Control.Monad.join (fmap (fmap (Web.HttpApiData.parseUrlPiece . Data.Text.Encoding.decodeUtf8)) (Data.List.lookup "offset" (Network.Wai.queryString request))) of
Just (Left err) ->
undefined
_x ->