Skip to content

Commit

Permalink
merge headers on partial, fix merging body
Browse files Browse the repository at this point in the history
  • Loading branch information
zackify committed Jan 10, 2017
1 parent f7a150e commit 119c307
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "legible",
"version": "0.2.4",
"version": "0.2.5",
"description": "cleanly code your api requests",
"main": "dist/index.js",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/partial.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default (strings, ...vars) => {

return (strings, ...vars) => {
let { options, url } = normalize(strings, vars, partial)
let mergedOptions = { ...partial.options, ...options }
let headers = { ...partial.options.headers, ...options.headers }
let mergedOptions = { ...partial.options, ...options, ...{ headers } }
let finalUrl = url || partial.url

return fetch(finalUrl, mergedOptions)
Expand Down
1 change: 1 addition & 0 deletions src/utilities/normalize.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export default (strings, vars, partial = {}) => {
}
}
if (!data.options.method) delete data.options.method
if (!data.options.body) delete data.options.body

return data
}

0 comments on commit 119c307

Please sign in to comment.