Skip to content
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

Jump to bottom

lib: remove result variable from asData #167

Merged
merged 1 commit into from
May 18, 2020
Merged

lib: remove result variable from asData #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions lib/utils/fun.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,16 @@ const isJsonContentType = (contentType) =>
contentType && contentType.match(/(json)/i);

const asData = (data, contentType) => {
let result = data;

// pattern matching alike
result = isString(result) &&
!isBase64(result) &&
const maybeJson = isString(data) &&
!isBase64(data) &&
isJsonContentType(contentType)
? JSON.parse(result)
: result;

result = isBinary(result)
? asBase64(result)
: result;
? JSON.parse(data)
: data;

return result;
return isBinary(maybeJson)
? asBase64(maybeJson)
: maybeJson;
};

module.exports = {
Expand Down