Merge pull request #92 from uniquelyparticular/develop

Merge develop > master

src/index.test.ts

@@ -1,52 +1,57 @@
-import { expect } from 'chai'
-import fetch from 'fetch-everywhere'
-import { createClient } from './index'
-
+import { expect } from 'chai';
+import fetch from 'fetch-everywhere';
+import { createClient } from './index';
 
 describe('Shopify index', () => {
-    it('fetch can be overridden', () => {
-        const shopify = new createClient({
-            store_name: 'XXX',
-            client_key: 'XXX',
-            client_pass: 'XXX',
-            fetch: fetch
-        })
-        expect(shopify.fetch).to.be.an.instanceof(Function)
-    })
+  it('fetch can be overridden', () => {
+    const shopify = new createClient({
+      store_name: 'XXX',
+      client_key: 'XXX',
+      client_pass: 'XXX',
+      fetch: fetch
+    });
+    expect(shopify.fetch).to.be.an.instanceof(Function);
+  });
 
-    it('get products', () => {
-        const shopify = new createClient({
-            store_name: 'XXX',
-            client_key: 'XXX',
-            client_pass: 'XXX',
-            fetch: fetch
-        })
+  it('get products', () => {
+    const shopify = new createClient({
+      store_name: 'XXX',
+      client_key: 'XXX',
+      client_pass: 'XXX',
+      fetch: fetch
+    });
 
-        return shopify
-            .get('admin/products.json')
-            .then(results => {
-                expect(results).to.not.be.null
-            })
-            .catch(error => {
-                expect(error).to.deep.equal({ statusCode: 404, body: { message: 'Not Found' } })
-            })
-    })
+    return shopify
+      .get('admin/products.json')
+      .then(results => {
+        expect(results).to.not.be.null;
+      })
+      .catch(error => {
+        expect(error).to.deep.equal({
+          statusCode: 404,
+          body: { message: 'Not Found', errors: 'Not Found' }
+        });
+      });
+  });
 
-    it('get products with custom fetch', () => {
-        const shopify = new createClient({
-            store_name: 'XXX',
-            client_key: 'XXX',
-            client_pass: 'XXX',
-            fetch: fetch
-        })
+  it('get products with custom fetch', () => {
+    const shopify = new createClient({
+      store_name: 'XXX',
+      client_key: 'XXX',
+      client_pass: 'XXX',
+      fetch: fetch
+    });
 
-        return shopify
-            .get('admin/products.json')
-            .then(results => {
-                expect(results).to.not.be.null
-            })
-            .catch(error => {
-                expect(error).to.deep.equal({ statusCode: 404, body: { message: 'Not Found' } })
-            })
-    })
-})
+    return shopify
+      .get('admin/products.json')
+      .then(results => {
+        expect(results).to.not.be.null;
+      })
+      .catch(error => {
+        expect(error).to.deep.equal({
+          statusCode: 404,
+          body: { message: 'Not Found', errors: 'Not Found' }
+        });
+      });
+  });
+});

src/index.ts

@@ -84,16 +84,17 @@ export class createClient {
 
     if (response.status === 204) return response.text();
 
+    const json = await response.json();
+
     if (response.status >= 400)
       throw {
         statusCode: response.status,
         body: {
-          message: response.statusText
+          message: response.statusText,
+          ...json
         }
       };
 
-    const json = await response.json();
-
     if (!response.ok) {
       throw {
         statusCode: response.status,