Merge branch 'feature/newResponse'

Author: raphaelpor

README.md

@@ -52,44 +52,53 @@ const fitch = require('fitch')
 ### Make your first request:
 ```js
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
+
+/* Response:
+{
+  data: { foo: 'bar' },
+  status: 200,
+  statusText: 'Ok',
+  headers: { Content-Type: application/json },
+}
+*/
 ```
 
 ## Methods available:
 ### get
 ```js
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### post
 ```js
 const req = {body: {name: 'Happy cat'}}
 
 fitch.post(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### put
 ```js
 const req = {body: {name: 'Happy cat'}}
 
 fitch.put(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### patch
 ```js
 const req = {body: {name: 'Happy cat'}}
 
 fitch.patch(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### del
 ```js
 fitch.del(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ## Use with custom configuration
@@ -107,7 +116,7 @@ const config = {
 }
 
 fitch.get(apiUrl, config)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 See more about fetch configuration at: [Fetch API](https://developer.mozilla.org/pt-BR/docs/Web/API/Fetch_API).
 

docs/Config.md

@@ -14,7 +14,7 @@ Receives a json object, that is transformed to string by Fitch.js, before send t
 const req = { body: { name: 'Happy cat' } }
 
 fitch.post(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **dataType** *(string)*
@@ -32,14 +32,14 @@ See more at [MDN](https://developer.mozilla.org/en-US/docs/Web/API/Body).
 const config = { dataType: 'blob' }
 
 fitch.get('image.jpg', config)
-  .then((imageBlob) => {
-    const objectURL = URL.createObjectURL(imageBlob)
+  .then((response) => {
+    const objectURL = URL.createObjectURL(response.data)
     myImage.src = objectURL
   })
 
 // Default: json.
 fitch.get('file.json')
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **params** *(object)*
@@ -55,7 +55,7 @@ const config = {
 }
 
 fitch.get(apiUrl, config)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **raw** *(boolean)*

docs/Intro.md

@@ -23,7 +23,16 @@ import fitch from 'fitch'
 const apiUrl = 'https://localhost:8080/'
 
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
+
+/* Response:
+{
+  data: { foo: 'bar' },
+  status: 200,
+  statusText: 'Ok',
+  headers: { Content-Type: application/json },
+}
+*/
 ```
 
 Also, you can use cdn:

docs/Methods.md

@@ -4,7 +4,7 @@
 
 ```js
 fitch.get(apiUrl, config)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **Note:** GET method doesn't allow `body` inside config object.
@@ -15,7 +15,7 @@ fitch.get(apiUrl, config)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.post(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **put(url, config)**
@@ -24,7 +24,7 @@ fitch.post(apiUrl, req)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.put(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **patch(url, config)**
@@ -33,14 +33,14 @@ fitch.put(apiUrl, req)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.patch(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **del(url, config)**
 
 ```js
 fitch.del(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ## Concurrency
@@ -67,7 +67,7 @@ If Fetch throws an error, we can handle this using `catch()`:
 
 ```js
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
   .catch(err => console.error(err))
 ```
 

docs/pt-br/Config.md

@@ -14,7 +14,7 @@ Recebe um objeto json, que é transformado para string antes fazer a chamada.
 const req = { body: { name: 'Happy cat' } }
 
 fitch.post(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **dataType** *(string)*
@@ -32,14 +32,14 @@ Veja mais em [MDN](https://developer.mozilla.org/en-US/docs/Web/API/Body).
 const config = { dataType: 'blob' }
 
 fitch.get('image.jpg', config)
-  .then((imageBlob) => {
-    const objectURL = URL.createObjectURL(imageBlob)
+  .then((response) => {
+    const objectURL = URL.createObjectURL(response.data)
     myImage.src = objectURL
   })
 
 // Exemplo padrão (json).
 fitch.get('file.json')
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **params** *(objeto)*
@@ -55,7 +55,7 @@ const config = {
 }
 
 fitch.get(apiUrl, config)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ### **raw** *(boolean)*

docs/pt-br/Intro.md

@@ -21,7 +21,16 @@ import fitch from 'fitch'
 const apiUrl = 'https://localhost:8080/'
 
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
+
+  /* Resposta:
+  {
+    data: { foo: 'bar' },
+    status: 200,
+    statusText: 'Ok',
+    headers: { Content-Type: application/json },
+  }
+  */
 ```
 
 Também é possível usar o CDN:

docs/pt-br/Methods.md

@@ -4,7 +4,7 @@
 
 ```js
 fitch.get(apiUrl, config)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **Note:** O método GET  não permite `body` dentro do objeto de configuração.
@@ -15,7 +15,7 @@ fitch.get(apiUrl, config)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.post(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **put(url, config)**
@@ -24,7 +24,7 @@ fitch.post(apiUrl, req)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.put(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **patch(url, config)**
@@ -33,14 +33,14 @@ fitch.put(apiUrl, req)
 const req = { body: { name: 'Happy cat' } }
 
 fitch.patch(apiUrl, req)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 **del(url, config)**
 
 ```js
 fitch.del(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
 ```
 
 ## Concurrency
@@ -68,7 +68,7 @@ Se houver um erro na chamada do Fetch, você pode pegá-lo usando `catch()`:
 
 ```js
 fitch.get(apiUrl)
-  .then(data => console.log(data))
+  .then(response => console.log(response))
   .catch(err => console.error(err))
 ```
 

examples/index.js

@@ -30,12 +30,12 @@ fitch.all([fitch.get(baseUrl), fitch.get(baseUrl, { raw: true })])
 
 // GET
 fitch.get(baseUrl).then(resp =>
-  console.log('GET\t>>>', resp)
+  console.log('GET\t>>>', resp.data)
 ).catch(logError);
 
 // GET with params
 fitch.get(baseUrl, reqGet).then(resp =>
-  console.log('GET\t>>>', resp)
+  console.log('GET\t>>>', resp.data)
 ).catch(logError);
 
 // GET raw output
@@ -45,20 +45,20 @@ fitch.get(baseUrl, { raw: true }).then(resp =>
 
 // POST
 fitch.post(`${baseUrl}/new/`, reqPost).then(resp =>
-  console.log('POST\t>>>', resp)
+  console.log('POST\t>>>', resp.data)
 ).catch(logError);
 
 // PUT
 fitch.put(`${baseUrl}/1`, reqUpdate).then(resp =>
-  console.log('PUT\t>>>', resp)
+  console.log('PUT\t>>>', resp.data)
 ).catch(logError);
 
 // PATCH
 fitch.patch(`${baseUrl}/2`, reqUpdate).then(resp =>
-  console.log('PATCH\t>>>', resp)
+  console.log('PATCH\t>>>', resp.data)
 ).catch(logError);
 
 // DELETE
 fitch.del(`${baseUrl}/2`).then(resp =>
-  console.log('DELETE\t>>>', resp)
+  console.log('DELETE\t>>>', resp.data)
 ).catch(logError);

package.json

@@ -47,15 +47,21 @@
     "build:umd.min": "webpack --output-filename index.umd.min.js -p --colors",
     "check": "npm run lint && npm run test",
     "clean": "rimraf dist coverage",
-    "coverage": "nyc ava ./tests/*",
+    "coverage": "nyc report npm test",
     "examples": "node ./examples/index.js",
     "prebuild": "npm run check && npm run clean",
     "lint": "eslint src",
     "start": "node ./examples/api/index.js",
-    "test": "ava ./tests/*",
+    "test": "ava",
     "watch:test": "npm test -- -w"
   },
   "ava": {
+    "files": [
+      "tests/*.js"
+    ],
+    "source": [
+      "src/**/*.js"
+    ],
     "require": [
       "babel-register"
     ],

src/utils/check.js

@@ -1,12 +1,20 @@
 function check(resp, dataType = 'json') {
   const typeList = ['arrayBuffer', 'blob', 'formData', 'json', 'text'];
-  const included = typeList.indexOf(dataType);
+  const included = typeList.indexOf(dataType) !== -1;
 
-  if (resp.ok && included !== -1) {
-    return resp[dataType]();
+  if (resp.ok && included) {
+    return resp[dataType]()
+      .then(data => ({
+        data,
+        status: resp.status,
+        statusText: resp.statusText,
+        headers: resp.headers,
+      }));
   }
 
-  throw new Error(`${resp.status} - ${resp.statusText}.`);
+  const errorMerssage = !included ? 'Invalid data type' : `${resp.status} - ${resp.statusText}.`;
+
+  throw new Error(errorMerssage);
 }
 
 export default check;