feat: Adds errors response as promise rejection

GraphtonLib · Jan 23, 2022 · 8c1296d · 8c1296d
1 parent 92804d1
commit 8c1296d
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 10 deletions.
diff --git a/example/graphtonGeneratedJavascript.js b/example/graphtonGeneratedJavascript.js
@@ -55,10 +55,14 @@ class GraphtonBaseQuery {
                 ...requestOptions?.headers
             },
         });
-        return {
+        const returnData = {
             ...response.data,
             response
         };
+        if (returnData.errors) {
+            return Promise.reject(returnData);
+        }
+        return returnData;
     }
 }
 class GraphtonBaseReturnTypeBuilder {

diff --git a/example/graphtonGeneratedTypescript.ts b/example/graphtonGeneratedTypescript.ts
@@ -33,6 +33,7 @@ export interface QueryResponse {
     [key: string]: unknown,
     data: Record<string, unknown>,
     extensions?: Record<string, unknown>,
+    errors?: Record<string, unknown>[],
     response: AxiosResponse
 }
 export interface ReturnTypeInfo {
@@ -102,10 +103,16 @@ abstract class GraphtonBaseQuery<T> {
             },
         });
 
-        return {
+        const returnData = {
             ...response.data,
             response
+        };
+
+        if(returnData.errors) {
+            return Promise.reject(returnData);
         }
+
+        return returnData;
     }
 }
 

diff --git a/src/stubs/GraphtonBaseQuery.stub.d.ts b/src/stubs/GraphtonBaseQuery.stub.d.ts
@@ -2,8 +2,8 @@ import { GraphtonBaseReturnTypeBuilder } from './GraphtonBaseReturnTypeBuilder.s
 import { QueryResponse, RequestOptions } from './GraphtonTypes.stub';
 export declare type RootType = 'query' | 'mutation' | 'subscription' | '/*ROOTTYPE*/';
 export declare abstract class GraphtonBaseQuery<T> {
-    protected abstract queryName: string;
-    protected abstract rootType: RootType;
+    abstract readonly queryName: string;
+    abstract readonly rootType: RootType;
     protected abstract returnType: GraphtonBaseReturnTypeBuilder<any, any> | null;
     abstract setArgs(queryArgs: Partial<T>): void;
     protected abstract toArgString(): string;

diff --git a/src/stubs/GraphtonBaseQuery.stub.js b/src/stubs/GraphtonBaseQuery.stub.js
@@ -43,9 +43,13 @@ import axios from 'axios';
                 ...requestOptions?.headers
             },
         });
-        return {
+        const returnData = {
             ...response.data,
             response
         };
+        if (returnData.errors) {
+            return Promise.reject(returnData);
+        }
+        return returnData;
     }
 }
diff --git a/src/stubs/GraphtonBaseQuery.stub.ts b/src/stubs/GraphtonBaseQuery.stub.ts
@@ -62,9 +62,15 @@ import axios from 'axios';
             },
         });
 
-        return {
+        const returnData = {
             ...response.data,
             response
+        };
+
+        if(returnData.errors) {
+            return Promise.reject(returnData);
         }
+
+        return returnData;
     }
 }
diff --git a/src/stubs/GraphtonQueryTypeInterfaces.stub.d.ts b/src/stubs/GraphtonQueryTypeInterfaces.stub.d.ts
@@ -1,10 +1,15 @@
 import { RequestOptions } from './GraphtonTypes.stub';
-export interface GraphtonQuery<T> {
+import { RootType } from './GraphtonBaseQuery.stub';
+export interface GraphtonQueryBuilder {
+    queryName: string;
+    rootType: RootType;
+}
+export interface GraphtonQuery<T> extends GraphtonQueryBuilder {
     execute(requestOptions?: RequestOptions): Promise<T>;
 }
-export interface GraphtonMutation<T> {
+export interface GraphtonMutation<T> extends GraphtonQueryBuilder {
     execute(requestOptions?: RequestOptions): Promise<T>;
 }
-export interface GraphtonSubscription<T> {
+export interface GraphtonSubscription<T> extends GraphtonQueryBuilder {
     execute(requestOptions?: RequestOptions): Promise<T>;
 }
diff --git a/src/stubs/GraphtonTypes.stub.d.ts b/src/stubs/GraphtonTypes.stub.d.ts
@@ -9,6 +9,7 @@ export interface QueryResponse {
     [key: string]: unknown;
     data: Record<string, unknown>;
     extensions?: Record<string, unknown>;
+    errors?: Record<string, unknown>[];
     response: AxiosResponse;
 }
 export interface ReturnTypeInfo {

diff --git a/src/stubs/GraphtonTypes.stub.ts b/src/stubs/GraphtonTypes.stub.ts
@@ -11,6 +11,7 @@ export interface QueryResponse {
     [key: string]: unknown,
     data: Record<string, unknown>,
     extensions?: Record<string, unknown>,
+    errors?: Record<string, unknown>[],
     response: AxiosResponse
 }
 export interface ReturnTypeInfo {

diff --git a/src/stubs/Query.stub.js b/src/stubs/Query.stub.js
@@ -5,8 +5,8 @@ import { _t_TYPENAME_t_ReturnTypeBuilder as _t_RETURNTYPEBUILDER_t_ } from './Re
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class _t_QUERYCLASSNAME_t_ extends GraphtonBaseQuery /*IF:ADDEXECUTOR*/ /*!implements!*/ /*IMPLEMENTS*/ /*ENDIF:ADDEXECUTOR*/ {
     queryName = '/*QUERYNAME*/';
-    queryArgs = {};
     rootType = '/*ROOTTYPE*/';
+    queryArgs = {};
     returnType = /*IF:RETURNTYPEOBJECT*/ new /*ENDIF:RETURNTYPEOBJECT*/ _t_RETURNTYPEBUILDER_t_ /*IF:RETURNTYPEOBJECT*/() /*ENDIF:RETURNTYPEOBJECT*/;
     /*IF:ARGUMENTS*/
     constructor(queryArgs) {