@restorecommerce/gql-bot 1.0.7 → 1.0.9

package/package.json

@@ -2,7 +2,7 @@
   "name": "@restorecommerce/gql-bot",
   "description": "GraphQL Client Automated Task Processor",
   "main": "lib/index",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/restorecommerce/libs.git"
@@ -15,50 +15,44 @@
     "tasks",
     "processor"
   ],
+  "type": "module",
   "dependencies": {
-    "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
-    "apollo-link-http": "^1.5.17",
-    "chalk": "^4.1.2",
+    "@apollo/client": "^3.11.8",
+    "chalk": "^5.3.0",
     "color-hash": "^2.0.2",
-    "graphql": "^15.5.0",
-    "graphql-tag": "^2.12.6",
+    "graphql": "^16.9.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^3.3.2",
     "promise-streams": "^2.1.1",
-    "readdirp": "^3.6.0",
+    "readdirp": "^4.0.2",
     "through2": "^4.0.2",
     "yaml-document-stream": "^1.1.0"
   },
   "devDependencies": {
-    "@types/color-hash": "^1.0.2",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.4.1",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "coveralls": "^3.1.1",
-    "eslint": "^8.44.0",
+    "@restorecommerce/dev": "^0.0.13",
+    "@types/color-hash": "^2.0.0",
+    "@types/node": "^22.7.9",
+    "@types/through2": "^2.0.41",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
+    "@vitest/coverage-v8": "^2.1.4",
+    "eslint": "^9.13.0",
     "eslint-plugin-prefer-arrow-functions": "^3.1.4",
-    "mocha": "^10.2.0",
-    "nock": "^13.3.1",
+    "msw": "^2.5.2",
+    "nock": "^13.5.5",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
-    "should": "^13.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vitest": "^2.1.4"
   },
   "scripts": {
     "pretest": "npm run lint",
-    "test": "nyc npm run mocha",
-    "mocha": "mocha --full-trace --exit --timeout 20000",
-    "lint": "eslint './src/**/*.ts'",
+    "test": "vitest run --dangerouslyIgnoreUnhandledErrors",
+    "lint": "eslint src",
     "build:tsc": "tsc -d",
     "build:clean": "rimraf lib",
-    "build": "npm-run-all lint build:clean build:tsc",
-    "mocha-debug": "mocha -R spec test/*.js --full-trace --inspect-brk",
-    "lcov-report": "nyc report --reporter=lcov",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls"
+    "build": "npm-run-all lint build:clean build:tsc"
   },
   "engines": {
     "node": ">= 12.0.0"
@@ -72,5 +66,5 @@
       }
     }
   },
-  "gitHead": "48456b8ea43fd3bfad46deaea7010ccd899ea074"
+  "gitHead": "2cdfe2ff31f5c695c8789831fd7b797e5256e25d"
 }

package/src/client.ts

@@ -1,15 +1,14 @@
 import * as _ from 'lodash';
 import * as url from 'url';
 import * as fs from 'fs';
-import gql from 'graphql-tag';
-import { ApolloClient } from 'apollo-client';
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import fetch from 'node-fetch'; // required for apollo-link-http
-import { createHttpLink, HttpLink } from 'apollo-link-http';
+import { ApolloClient } from '@apollo/client/core';
+import { InMemoryCache } from '@apollo/client/cache';
+import { HttpOptions, createHttpLink } from '@apollo/client/link/http';
 import * as https from 'https';
-import { processResponse } from './utils';
+import { processResponse } from './utils.js';
+import {parse} from 'graphql';
 
-const _checkVariableMutation = (mutation: string): Boolean => {
+const _checkVariableMutation = (mutation: string): boolean => {
   const mutationName = mutation.slice(mutation.indexOf(' '),
     mutation.indexOf('($'));
   if (mutationName.indexOf('$') > 0) {
@@ -24,7 +23,7 @@ const _replaceInlineVars = (mutation: string, args: any): string => {
     return mutation.replace(/\${(\w+)}/g, (_, v) => args[v]);
 };
 
-const _createQueryVariables = (inputVarName: string, queryVarKey: string, varValue: any): Object => {
+const _createQueryVariables = (inputVarName: string, queryVarKey: string, varValue: any): object => {
   if (queryVarKey) {
     return {
       [inputVarName]: {
@@ -158,9 +157,9 @@ export class Client {
       // (i.e. if the quote is preceded by a backslash)
       // make sure to also match line/expression start
       // and keep the symbol preceding the quote
-      mutation = mutation.replace(/(^|[^\\])\"/g, '$1');
+      mutation = mutation.replace(/(^|[^\\])"/g, '$1');
       // afterwards, replace escaped quotes with regular ones
-      mutation = mutation.replace(/\\\"/g, '\"');
+      mutation = mutation.replace(/\\"/g, '"');
     }
 
     let variables;
@@ -170,11 +169,11 @@ export class Client {
       variables = _createQueryVariables(inputVarName, queryVarKey, resource_list);
     } else {
       // To remove double quotes from the keys in JSON data
-      resource_list = resource_list.replace(/\"([^(\")"]+)\":/g, '$1:');
+      resource_list = resource_list.replace(/"([^(")"]+)":/g, '$1:');
       mutation = _replaceInlineVars(mutation, { resource_list, apiKey });
     }
 
-    const apolloLinkOpts: HttpLink.Options = {
+    const apolloLinkOpts: HttpOptions = {
       uri: normalUrl,
       fetch: fetch as any
     };
@@ -189,7 +188,7 @@ export class Client {
       };
     }
 
-    let apolloLink = createHttpLink(apolloLinkOpts);
+    const apolloLink = createHttpLink(apolloLinkOpts);
 
     const apolloCache = new InMemoryCache();
     const apolloClient = new ApolloClient({
@@ -198,7 +197,7 @@ export class Client {
     });
 
     const response = await apolloClient.mutate({
-      mutation: gql`${mutation}` as any,
+      mutation: parse(`${mutation}`),
       variables
     });
 

package/src/index.ts

@@ -1,8 +1,3 @@
-import { Client } from './client';
-export { Client };
-
-import { GraphQLProcessor } from './job_processor_gql';
-export { GraphQLProcessor };
-
-import { JobProcessor, Job } from './job_processor';
-export { JobProcessor, Job };
+export { Client } from './client.js';
+export { GraphQLProcessor } from './job_processor_gql.js';
+export { JobProcessor, Job } from './job_processor.js';

package/src/job_processor.ts

@@ -5,7 +5,7 @@ import * as through2 from 'through2';
 import readdirp from 'readdirp';
 import * as path from 'path';
 import { EventEmitter } from 'events';
-import { stringToChalk, processResponse } from './utils';
+import { stringToChalk, processResponse } from './utils.js';
 
 export class ReadArrayStream extends Readable {
   array: any[];
@@ -32,7 +32,7 @@ export class ReadArrayStream extends Readable {
 export class Job extends EventEmitter {
   opts: any;
   done = false;
-  error = undefined;
+  error: any = undefined;
 
   constructor(opts?: any) {
     super();
@@ -78,7 +78,7 @@ export class JobProcessor {
 
     const concurrency = this.jobInfo.options.concurrency;
     this.taskStream = ps.map({concurrent: concurrency}, (task: any) => {
-      return this.jobInfo.options.processor.process(task, verbose, ignoreErrors, ignoreSelfSigned).then((body) => {
+      return this.jobInfo.options.processor.process(task, verbose, ignoreErrors, ignoreSelfSigned).then((body: any) => {
         const logColor = stringToChalk(task.name);
 
         if (verbose) {
@@ -99,9 +99,9 @@ export class JobProcessor {
       objectMode: true
     }, tasks);
 
-    inputTaskStream.pipe(through2.obj(async (task, enc, cb) => {
+    inputTaskStream.pipe(through2.obj(async (task: any, enc: any, cb: any) => {
       const operation = task.operation;
-      await this[operation].apply(this, [task, job]);
+      await this[operation as keyof JobProcessor].apply(this, [task, job]);
       cb();
     }));
 
@@ -123,7 +123,7 @@ export class JobProcessor {
 
   async sync(task: any, job: Job): Promise<any> {
     const pathOptions = {
-      fileFilter: (entry) => {
+      fileFilter: (entry: any) => {
         return true;
       },
       depth: 1,

package/src/job_processor_gql.ts

@@ -1,8 +1,9 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import * as _ from 'lodash';
 import * as fs from 'fs';
-import { Client } from './index';
+import { Client } from './client.js';
 import { YamlStreamReadTransformer } from 'yaml-document-stream';
-import { stringToChalk } from './utils';
+import { stringToChalk } from './utils.js';
 
 /**
  * GraphQL-specific job processor.
@@ -24,21 +25,19 @@ export class GraphQLProcessor {
   }
 
   async process(task: any, verbose = false, ignoreErrors = false, ignoreSelfSigned = false): Promise<any> {
-    let yamlStream = new YamlStreamReadTransformer();
-    let jobPath = task.path;
+    const yamlStream = new YamlStreamReadTransformer();
+    const jobPath = task.path;
     let data = false;
     const logColor = stringToChalk(task.name);
     switch (task.operation) {
       case 'sync': {  //  synchronous operation
         return new Promise<any>((resolve, reject) => {
           try {
-            yamlStream.on('error', (err) => {
-              !ignoreErrors && reject(err);
-            });
+            yamlStream.on('error', (err) => !ignoreErrors && reject(err));
 
             const fileStream = fs.createReadStream(task.fullPath);
             fileStream.pipe(yamlStream);
-            let batchsize;
+            let batchsize: number;
             if (task.batchSize) {
               batchsize = task.batchSize;
               console.log(`[${logColor(task.name)}] Batch size:`, batchsize);
@@ -47,7 +46,7 @@ export class GraphQLProcessor {
             let counter = 0;
             let batchCounter = 0;
             let docArr: any[] = [];
-            let resultArr: any[] = [];
+            const resultArr: any[] = [];
 
             // Here we read from the readable stream each yaml document parsed
             // as an object, and if we have batching enabled we first batch this

package/src/utils.ts

@@ -1,11 +1,11 @@
 import ColorHash from 'color-hash';
-const chalk = require('chalk');
+import chalk from 'chalk';
 
 const colorHash = new ColorHash({
   lightness: [0.45, 0.6, 0.75]
 });
 
-export const stringToChalk = (str) => {
+export const stringToChalk = (str: string) => {
   return chalk.hex(colorHash.hex(str));
 };
 

package/tsconfig-base.json

@@ -0,0 +1,14 @@
+{
+    "extends": "../../node_modules/@restorecommerce/dev/tsconfig.json",
+    "compilerOptions": {
+      "outDir": "./lib",
+      "types": ["node"],
+      "resolveJsonModule": true,
+      "esModuleInterop": true
+    },
+    "exclude": [
+      "node_modules",
+      "lib",
+      "doc"
+    ]
+  }

package/tsconfig.json

@@ -1,29 +1,6 @@
 {
-  "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "declaration": true,
-    // "strict": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "noUnusedLocals": false,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "outDir": "lib",
-    "lib": [
-      "es2020.promise",
-      "dom"
-    ]
-  },
+  "extends": "./tsconfig-base.json",
   "include": [
     "./src/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules",
-    "lib",
-    "doc"
   ]
 }

package/tsconfig.test.json

@@ -1,9 +1,7 @@
 {
-  "compilerOptions": {
-    "outDir": "test"
-  },
   "extends": "./tsconfig.json",
   "include": [
-    "./test/**/*.ts"
+    "./src/**/*.ts",
+    "./tests/**/*.ts"
   ]
 }

package/vitest.config.ts

@@ -0,0 +1,2 @@
+import config from '../../node_modules/@restorecommerce/dev/vitest.config.js';
+export default config;