Skip to content

Allow not parsing errors as JSON #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Allow not parsing errors as JSON #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8bc9fa6
Allow not parsing errors as JSON
asilvestre Feb 28, 2018
bb17c6b
Change logic
asilvestre Feb 28, 2018
159ec64
Fix
asilvestre Feb 28, 2018
ab6f005
Fix
asilvestre Feb 28, 2018
d3c3339
Merge pull request #1 from haskell-servant/master
asilvestre May 23, 2018
3aafbbb
Merge branch 'master' of https://github.com/haskell-servant/servant-js
asilvestre Nov 27, 2018
d81c839
Merge branch 'master' of https://github.com/asilvestre/servant-js
asilvestre Nov 27, 2018
172037f
Merge pull request #2 from asilvestre/update
asilvestre Nov 27, 2018
865e2ec
fix
asilvestre Nov 27, 2018
48d3a2d
Merge branch 'master' of https://github.com/asilvestre/servant-js
asilvestre Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Servant/JS/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ data CommonGeneratorOptions = CommonGeneratorOptions
-- ^ namespace on which we define the foreign function (empty mean local var)
, urlPrefix :: Text
-- ^ a prefix we should add to the Url in the codegen
, ignoreErrorParsingErrors :: Bool
-- ^ if a JSON request receives a non-JSON error response, report the plain text original error instead of a JSON parsing error
}

-- | Default options.
Expand All @@ -92,6 +94,7 @@ data CommonGeneratorOptions = CommonGeneratorOptions
-- > , errorCallback = "onError"
-- > , moduleName = ""
-- > , urlPrefix = ""
-- > , ignoreErrorParsingErrors = False
-- > }
-- @
defCommonGeneratorOptions :: CommonGeneratorOptions
Expand All @@ -103,6 +106,7 @@ defCommonGeneratorOptions = CommonGeneratorOptions
, errorCallback = "onError"
, moduleName = ""
, urlPrefix = ""
, ignoreErrorParsingErrors = False
}

-- | Attempts to reduce the function name provided to that allowed by @'Foreign'@.
Expand Down
7 changes: 4 additions & 3 deletions src/Servant/JS/Vanilla.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ generateVanillaJSWith opts req = "\n" <>
<> " xhr.open('" <> decodeUtf8 method <> "', " <> url <> ", true);\n"
<> reqheaders
<> " xhr.setRequestHeader('Accept', 'application/json');\n"
<> (if isJust (req ^. reqBody) && (req ^. reqBodyContentType == ReqBodyJSON) then " xhr.setRequestHeader('Content-Type', 'application/json');\n" else "")
<> (if isJust (req ^. reqBody) && (req ^. _reqBodyContentType == ReqBodyJSON) then " xhr.setRequestHeader('Content-Type', 'application/json');\n" else "")
<> " xhr.onreadystatechange = function () {\n"
<> " var res = null;\n"
<> " if (xhr.readyState === 4) {\n"
Expand All @@ -46,7 +46,8 @@ generateVanillaJSWith opts req = "\n" <>
<> " try { res = JSON.parse(xhr.responseText); } catch (e) { " <> onError <> "(e); }\n"
<> " if (res) " <> onSuccess <> "(res);\n"
<> " } else {\n"
<> " try { res = JSON.parse(xhr.responseText); } catch (e) { " <> onError <> "(e); }\n"
<> " try { res = JSON.parse(xhr.responseText); } catch (e) { " <> onError <> "(" <>
(if ignoreErrorParsingErrors opts then "xhr.responseText" else "e") <> "); }\n"
<> " if (res) " <> onError <> "(res);\n"
<> " }\n"
<> " }\n"
Expand Down Expand Up @@ -81,7 +82,7 @@ generateVanillaJSWith opts req = "\n" <>

dataBody =
if isJust (req ^. reqBody)
then if (req ^. reqBodyContentType == ReqBodyJSON) then "JSON.stringify(body)" else "body"
then if (req ^. _reqBodyContentType == ReqBodyJSON) then "JSON.stringify(body)" else "body"
else "null"


Expand Down