T-444 use adgo-errors for errors

Author: lukas-reineke

index.node.js

@@ -25,6 +25,7 @@
   "author": "Adgorithmics, Inc.",
   "license": "MIT",
   "dependencies": {
+    "@adgorithmics/adgo-errors": "1.2.0",
     "@adgorithmics/graphql-errors": "1.5.2",
     "cross-fetch": "3.0.4",
     "lodash.get": "4.4.2"

index.web.js

@@ -1,4 +1,5 @@
 import { codes } from '@adgorithmics/graphql-errors';
+import { AdgoError } from '@adgorithmics/adgo-errors';
 import { Query } from './generated/graphql';
 export declare function bind<T extends Function>(_target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
 export declare function pageQueryGenerator(name: keyof Query, fields?: Array<string>, hasShowDeleted?: boolean): string;
@@ -8,12 +9,12 @@ export interface APIError {
         code?: codes;
     };
 }
-export declare class CinnamonError extends Error {
+export declare class CinnamonError extends AdgoError {
     raw?: {
         data?: unknown;
         errors?: Array<APIError>;
     };
-    constructor(message: string, raw?: {
+    constructor(error: AdgoError | Error | string, raw?: {
         data?: unknown;
         errors?: Array<APIError>;
     });

package-lock.json

@@ -1,4 +1,5 @@
 import { codes } from '@adgorithmics/graphql-errors';
+import { AdgoError } from '@adgorithmics/adgo-errors';
 import { Query } from './generated/graphql';
 
 // stripped down version of https://github.com/NoHomey/bind-decorator
@@ -66,15 +67,15 @@ export interface APIError {
     extentions?: { code?: codes };
 }
 
-export class CinnamonError extends Error {
+export class CinnamonError extends AdgoError {
     raw?: { data?: unknown; errors?: Array<APIError> };
 
     constructor(
-        message: string,
+        error: AdgoError | Error | string,
         raw?: { data?: unknown; errors?: Array<APIError> },
     ) {
-        super(message);
-
+        super(error, { raw }, 'cinnamon_error');
         this.raw = raw;
+        this.name = 'CinnamonError';
     }
 }

package.json

@@ -1,6 +1,7 @@
 import fetch from 'cross-fetch';
 import get from 'lodash.get';
 import { codes } from '@adgorithmics/graphql-errors';
+import { AdgoError } from '@adgorithmics/adgo-errors';
 
 import {
     PageInfo,
@@ -147,19 +148,28 @@ export class Cinnamon {
     }): Promise<APIResult<T, U>> {
         await this.refreshTokenRequest;
 
-        const response = await fetch(this.config.url, {
-            method: 'POST',
-            headers: {
-                authorization:
-                    token || this.token ? `Bearer ${token || this.token}` : '',
-                accept: 'application/json',
-                'content-type': 'application/json',
-                ...headers,
-            },
-            body: JSON.stringify({ query, variables }),
-        });
-
-        const json = await response.json();
+        let json;
+
+        try {
+            const response = await fetch(this.config.url, {
+                method: 'POST',
+                headers: {
+                    authorization:
+                        token || this.token
+                            ? `Bearer ${token || this.token}`
+                            : '',
+                    accept: 'application/json',
+                    'content-type': 'application/json',
+                    ...headers,
+                },
+                body: JSON.stringify({ query, variables }),
+            });
+
+            json = await response.json();
+        } catch (error) {
+            throw new AdgoError(error);
+        }
+
         if (json.errors) {
             if (
                 json.errors.some(

src/helpers.d.ts

@@ -384,6 +384,7 @@ describe('API', () => {
 
         await cinnamon.api({ query: '' }).catch(error => {
             expect(error.raw).toEqual(raw);
+            expect(error.data.raw).toEqual(raw);
         });
     });
 

src/helpers.ts

@@ -0,0 +1,29 @@
+import { CinnamonError } from '../src';
+
+describe('helpers', () => {
+    describe('CinnamonError', () => {
+        it('should throw a simple error', () => {
+            expect(() => {
+                throw new CinnamonError('foo');
+            }).toThrow('foo');
+        });
+
+        it('should save the raw data', () => {
+            const error = new CinnamonError('foo', {
+                errors: [{ message: 'foo' }],
+            });
+
+            expect(error.data).toEqual({
+                raw: {
+                    errors: [{ message: 'foo' }],
+                },
+            });
+        });
+
+        it('should be stackable', () => {
+            expect(() => {
+                throw new CinnamonError(new CinnamonError('foo'));
+            }).toThrow('foo');
+        });
+    });
+});