fix: resolved conflicts

Author: Alexander Vakhitov

README.md

@@ -67,11 +67,20 @@ Query-like object.
 
 Method to be called on `fetch`'s response.
 
+##### headers {Object|Headers}
+
+Additional headers to be sent to the server
+
+##### body {string|FormData}
+
+Requests's body
+
+
 Alternatively you can use provided shortcuts for [every HTTP method](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods)
 
 **Example:**
 ```js
-import { GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH } from '../src/shortcuts';
+import { GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH } from 'unity-api';
 
 const userResource = {
   namespace: 'user',
@@ -88,13 +97,11 @@ const userResource = {
         formData.append('firstname', firstname);
         formData.append('lastname', lastname);
 
-        return {
+        return POST({
             path: [id, 'edit'],
-            options: {
-                method: 'POST',
-                body: formData
-            }
-        };
+            headers: { 'x-csrf-token': 'blah' }
+            body: formData
+        });
     },
 
     // DELETE: /api/user/1

src/callAPIMethod.js

@@ -20,25 +20,33 @@ export default function callAPI(
     methodOptions = {}
 ) {
 
-    const { path=[], query={}, options={}, method='json' } = methodOptions;
+    const { path=[], query={}, options={}, method='json', headers, body } = methodOptions;
 
     const url = formatURL(APINamespace, namespace, path, query);
 
-    return fetch(url, {...defaults.fetchOptions, ...fetchOptions, ...options})
-        .then( result => result[method]()
+    const accumulatedFetchOptions = {
+        ...defaults.fetchOptions,
+        ...fetchOptions,
+        ...options
+    };
+    if (headers) accumulatedFetchOptions.headers = headers;
+    if (body) accumulatedFetchOptions.body = body;
+
+    return fetch(url, accumulatedFetchOptions)
+        .then( response => response[method]()
                 .catch( () => {
-                    if (!result.ok) {
-                        throw new APIError(result.status, result.statusText);
+                    if (!response.ok) {
+                        throw new APIError(response.status, response.statusText);
                     }
 
-                    return result.body || null;
+                    return response.body || null;
                 })
-                .then( body => {
-                    if (!result.ok) {
-                        throw new APIError(result.status, result.statusText, body);
+                .then( result => {
+                    if (!response.ok) {
+                        throw new APIError(response.status, response.statusText, result);
                     }
 
-                    return body;
+                    return result;
                 }))
         .catch( error => error);
 }

test/callAPIMethod.spec.js

@@ -94,12 +94,13 @@ test.serial('fetch options', async t => {
 
     const APINamespace = 'rest-api';
     const namespace = 'user';
-    const fetchOptions = { method: 'POST'};
+    const fetchOptions = { method: 'GET'};
     const methodOptions = {
         path: 'path',
         query: { edit: true },
         options: {
-            credentials: 'omit'
+            credentials: 'omit',
+            method: 'POST'
         },
         method: 'text'
     };
@@ -118,6 +119,22 @@ test.serial('fetch options', async t => {
     }, 'correct options');
     t.true(spyResponse200.calledOnce);
 
+    const newMethodOptions = {
+        ...methodOptions,
+        headers: new Headers(),
+        body: 'body'
+    };
+    await callAPIMethod(APINamespace, fetchOptions, namespace, newMethodOptions);
+
+    t.deepEqual(fetchMock.lastOptions(matcher), {
+        cache: 'default',
+        credentials: 'omit',
+        method: 'POST',
+        mode: 'cors',
+        headers: newMethodOptions.headers,
+        body: newMethodOptions.body
+    }, 'correct options');
+
     spyResponse200.restore();
     fetchMock.restore();
 });

yarn.lock

@@ -800,15 +800,7 @@ babel-plugin-transform-strict-mode@^6.22.0:
     babel-runtime "^6.22.0"
     babel-types "^6.22.0"
 
-babel-polyfill@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.22.0.tgz#1ac99ebdcc6ba4db1e2618c387b2084a82154a3b"
-  dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-polyfill@^6.23.0:
+babel-polyfill@^6.22.0, babel-polyfill@^6.23.0:
   version "6.23.0"
   resolved "http://storage.mds.yandex.net/get-npm/45674/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
   dependencies:
@@ -1579,7 +1571,7 @@ detect-indent@4.0.0, detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-diff@^3.0.0, diff@^3.0.1:
+diff@^3.0.0, diff@^3.0.1, diff@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
@@ -2012,11 +2004,11 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-formatio@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
+formatio@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
   dependencies:
-    samsam "~1.1"
+    samsam "1.x"
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
@@ -2953,9 +2945,9 @@ log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
 
-lolex@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
+lolex@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -3125,6 +3117,10 @@ nan@^2.3.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
 
+native-promise-only@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -3874,9 +3870,9 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-samsam@1.1.2, samsam@~1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+samsam@1.x, samsam@^1.1.3:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
 
 semver-diff@^2.0.0:
   version "2.1.0"
@@ -3916,14 +3912,18 @@ signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon@^1.17.6:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+sinon@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.0.0.tgz#48337fa489069e530ad7e2f44f07b0ae93d37b24"
   dependencies:
-    formatio "1.1.1"
-    lolex "1.3.2"
-    samsam "1.1.2"
-    util ">=0.10.3 <1"
+    diff "^3.1.0"
+    formatio "1.2.0"
+    lolex "^1.6.0"
+    native-promise-only "^0.8.1"
+    path-to-regexp "^1.7.0"
+    samsam "^1.1.3"
+    text-encoding "0.6.4"
+    type-detect "^4.0.0"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -4166,6 +4166,10 @@ test-exclude@^3.3.0:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
+text-encoding@0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
+
 text-extensions@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.4.0.tgz#c385d2e80879fe6ef97893e1709d88d9453726e9"
@@ -4240,6 +4244,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.0.tgz#62053883542a321f2f7b25746dc696478b18ff6b"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -4323,7 +4331,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-"util@>=0.10.3 <1", util@^0.10.3:
+util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies: