@restorecommerce/gql-bot 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.3](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.2...@restorecommerce/gql-bot@0.2.3) (2022-06-20)
+
+
+### Bug Fixes
+
+* **gql-bot:** correctly handle null objects ([e7e44ef](https://github.com/restorecommerce/libs/commit/e7e44ef95585d423ddee7d41b6cc196ad1668284))
+
+
+
+
+
 ## [0.2.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.1...@restorecommerce/gql-bot@0.2.2) (2022-06-20)
 
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@restorecommerce/gql-bot",
   "description": "GraphQL Client Automated Task Processor",
   "main": "lib/index",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/restorecommerce/libs.git"
@@ -71,5 +71,5 @@
       }
     }
   },
-  "gitHead": "a40423a5fca103646c2adbc2530cf096a190139f"
+  "gitHead": "6a7808de256668f2681bf1ef62c2090a2a0d1d22"
 }

package/src/client.ts

@@ -7,6 +7,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import fetch from 'node-fetch'; // required for apollo-link-http
 import { createHttpLink, HttpLink } from 'apollo-link-http';
 import * as https from 'https';
+import { processResponse } from './utils';
 
 const _checkVariableMutation = (mutation: string): Boolean => {
   const mutationName = mutation.slice(mutation.indexOf(' '),
@@ -38,7 +39,7 @@ const _createQueryVariables = (inputVarName: string, queryVarKey: string, varVal
 };
 
 const checkError = (data: any): any => {
-  if (typeof data === 'object') {
+  if (typeof data === 'object' && data !== null) {
     if (Array.isArray(data)) {
       const result = data.map(value => {
         const inner = checkError(value);
@@ -139,7 +140,7 @@ export class Client {
     return url.resolve(this.entryBaseUrl, extendURL);
   }
 
-  async post(source: any, job?: any, verbose = false, ignoreSelfSigned = false): Promise<any> {
+  async post(source: any, job?: any, verbose = false, ignoreErrors = false, ignoreSelfSigned = false): Promise<any> {
     const normalUrl = this._normalizeUrl();
 
     let mutation;
@@ -209,6 +210,9 @@ export class Client {
           variables,
           response
         }));
+      } else if (ignoreErrors) {
+        const processed = processResponse(response);
+        console.error(JSON.stringify(processed));
       }
       throw new Error(JSON.stringify(error));
     }

package/src/job_processor.ts

@@ -5,36 +5,7 @@ import * as through2 from 'through2';
 import * as readdirp from 'readdirp';
 import * as path from 'path';
 import { EventEmitter } from 'events';
-import { stringToChalk } from './utils';
-
-const unwrap = (data: any): any => {
-  let result = data;
-  while (typeof result === 'object' && Object.keys(result).length == 1) {
-    result = result[Object.keys(result)[0]];
-  }
-  return result;
-};
-
-const removeType = (data: any): any => {
-  if (typeof data === 'object') {
-    if (Array.isArray(data)) {
-      data = data.map(removeType);
-    } else {
-      delete data['__typename'];
-      Object.keys(data).forEach(k => data[k] = removeType(data[k]));
-    }
-  }
-  return data;
-};
-
-const processResponse = (body: any | any[]): any => {
-  const result = [];
-  for (const response of Array.isArray(body) ? body : [body]) {
-    const clean = unwrap(removeType(response));
-    result.push(clean);
-  }
-  return result;
-};
+import { stringToChalk, processResponse } from './utils';
 
 export class ReadArrayStream extends Readable {
   array: any[];
@@ -112,9 +83,9 @@ export class JobProcessor {
 
         if (verbose) {
           const processed = processResponse(body);
-          console.log(`[${logColor(task.name)}] Completed successfully`, JSON.stringify(processed));
+          console.log(`[${logColor(task.name)}] Completed`, JSON.stringify(processed));
         } else {
-          console.log(`[${logColor(task.name)}] Completed successfully`);
+          console.log(`[${logColor(task.name)}] Completed`);
         }
 
         task.inputTask.processing--;

package/src/job_processor_gql.ts

@@ -85,7 +85,7 @@ export class GraphQLProcessor {
             // 'yamlStream' readable stream.
             yamlStream.on('pause', async () => {
               try {
-                resultArr.push(await this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                resultArr.push(await this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                 yamlStream.resume();
               } catch (e) {
                 !ignoreErrors && reject(e);
@@ -119,7 +119,7 @@ export class GraphQLProcessor {
                 batchCounter++;
                 console.log(`[${logColor(task.name)}] Processing batch: ${batchCounter}${batchText}`);
                 try {
-                  resultArr.push(await this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                  resultArr.push(await this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                 } catch (e) {
                   !ignoreErrors && reject(e);
                 }

package/src/utils.ts

@@ -8,3 +8,32 @@ const colorHash = new ColorHash({
 export const stringToChalk = (str) => {
   return chalk.hex(colorHash.hex(str));
 };
+
+const unwrap = (data: any): any => {
+  let result = data;
+  while (typeof result === 'object' && Object.keys(result).length == 1) {
+    result = result[Object.keys(result)[0]];
+  }
+  return result;
+};
+
+const removeType = (data: any): any => {
+  if (typeof data === 'object' && data !== null) {
+    if (Array.isArray(data)) {
+      data = data.map(removeType);
+    } else {
+      delete data['__typename'];
+      Object.keys(data).forEach(k => data[k] = removeType(data[k]));
+    }
+  }
+  return data;
+};
+
+export const processResponse = (body: any | any[]): any => {
+  const result = [];
+  for (const response of Array.isArray(body) ? body : [body]) {
+    const clean = unwrap(removeType(response));
+    result.push(clean);
+  }
+  return result;
+};