@emartech/program-executor 3.10.0 → 3.11.1

package/eslint.config.js

@@ -0,0 +1,56 @@
+'use strict';
+
+const mocha = require('eslint-plugin-mocha');
+const globals = require('globals');
+const js = require('@eslint/js');
+const { FlatCompat } = require('@eslint/eslintrc');
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all
+});
+
+module.exports = [
+  ...compat.extends('emarsys'),
+  {
+    plugins: {
+      mocha
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.mocha,
+        inject: true,
+        onmessage: true,
+        expect: true
+      },
+
+      ecmaVersion: 9,
+      sourceType: 'commonjs'
+    },
+
+    rules: {
+      'no-unused-expressions': 0,
+      'operator-linebreak': 'off',
+
+      'no-unused-vars': [
+        2,
+        {
+          vars: 'all',
+          args: 'after-used'
+        }
+      ],
+
+      curly: [2, 'multi-line'],
+      'require-yield': 0,
+      'new-cap': 0,
+      'security/detect-object-injection': 0,
+      'security/detect-non-literal-require': 0,
+      'security/detect-non-literal-fs-filename': 0,
+      'security/detect-non-literal-regexp': 0,
+      'space-before-function-paren': 0
+    }
+  }
+];

package/package.json

@@ -17,30 +17,31 @@
   "author": "team-shopify@emarsys.com",
   "license": "ISC",
   "dependencies": {
-    "@emartech/rabbitmq-client": "^3.5.2",
+    "@emartech/rabbitmq-client": "5.9.0",
+    "@emartech/json-logger": "3.4.0",
     "camelcase-keys": "^6.2.2",
-    "graphql": "^15.5.0"
+    "graphql": "^16.10.0"
   },
   "engines": {
     "node": "20.18.0"
   },
   "devDependencies": {
-    "chai": "^4.3.10",
+    "chai": "^4.5.0",
     "chai-as-promised": "7.1.1",
     "chai-string": "1.5.0",
     "chai-subset": "1.6.0",
-    "dotenv": "^16.4.1",
-    "eslint": "^8.52.0",
+    "dotenv": "^16.4.7",
+    "eslint": "^9.21.0",
     "eslint-config-emarsys": "5.1.0",
-    "eslint-plugin-mocha": "^10.2.0",
-    "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-security": "^1.7.1",
-    "knex": "^2.4.0",
-    "mocha": "^10.2.0",
-    "pg": "^8.11.3",
-    "semantic-release": "^22.0.6",
-    "sinon": "9.2.4",
+    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-no-only-tests": "^3.3.0",
+    "eslint-plugin-security": "^3.0.1",
+    "knex": "^3.1.0",
+    "mocha": "^11.1.0",
+    "pg": "^8.13.3",
+    "semantic-release": "^24.2.0",
+    "sinon": "19.0.2",
     "sinon-chai": "^3.7.0"
   },
-  "version": "3.10.0"
+  "version": "3.11.1"
 }

package/src/graphql/schema.spec.js

@@ -14,7 +14,7 @@ describe('schema', function () {
         }
       }`;
 
-      const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+      const { data } = await graphql({ schema, source: query, contextValue: { knex: this.db, tableName: 'programs' } });
       expect(data).to.eql({ programs: [] });
     });
   });
@@ -73,7 +73,7 @@ describe('schema', function () {
         }
       }`;
 
-      const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+      const { data } = await graphql({ schema, source: query, contextValue: { knex: this.db, tableName: 'programs' } });
 
       expect(data.programs[0]).to.containSubset({
         ...programs[0],
@@ -110,7 +110,11 @@ describe('schema', function () {
           }
         }`;
 
-        const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+        const { data } = await graphql({
+          schema,
+          source: query,
+          contextValue: { knex: this.db, tableName: 'programs' }
+        });
         const ids = data.programs.map((program) => program.id);
 
         expect(ids).to.eql(['1', '2', '3']);
@@ -123,7 +127,11 @@ describe('schema', function () {
           }
         }`;
 
-        const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+        const { data } = await graphql({
+          schema,
+          source: query,
+          contextValue: { knex: this.db, tableName: 'programs' }
+        });
         const ids = data.programs.map((program) => program.id);
 
         expect(ids).to.eql(['3', '2', '1']);
@@ -138,7 +146,11 @@ describe('schema', function () {
           }
         }`;
 
-        const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+        const { data } = await graphql({
+          schema,
+          source: query,
+          contextValue: { knex: this.db, tableName: 'programs' }
+        });
         const ids = data.programs.map((program) => program.id);
 
         expect(ids).to.eql(['1']);
@@ -151,7 +163,11 @@ describe('schema', function () {
           }
         }`;
 
-        const { data } = await graphql(schema, query, {}, { knex: this.db, tableName: 'programs' });
+        const { data } = await graphql({
+          schema,
+          source: query,
+          contextValue: { knex: this.db, tableName: 'programs' }
+        });
         const ids = data.programs.map((program) => program.id);
 
         expect(ids).to.eql(['3']);

package/src/program-executor-processor/index.spec.js

@@ -175,6 +175,7 @@ describe('ProgramExecutorProcessor', function () {
           programData: {},
           runId: '1'
         });
+      // eslint-disable-next-line no-unused-vars
       } catch (error) {
         expect(ProgramHandler.prototype.setProgramToError).to.be.calledWith('1', 'Something wrong happened!');
         expect(ProgramHandler.prototype.setJobRetriableErrorMessage).not.have.been.called;
@@ -188,7 +189,7 @@ describe('ProgramExecutorProcessor', function () {
           programData: {},
           runId: '1'
         });
-        // eslint-disable-next-line no-empty
+        // eslint-disable-next-line no-empty, no-unused-vars
       } catch (_error) {}
 
       expect(ProgramHandler.prototype.incrementStepRetryCount).to.have.been.calledWith('1');
@@ -201,6 +202,7 @@ describe('ProgramExecutorProcessor', function () {
           programData: {},
           runId: '1'
         });
+      // eslint-disable-next-line no-unused-vars
       } catch (error) {
         expect(ProgramHandler.prototype.setProgramToError).not.have.been.called;
         expect(ProgramHandler.prototype.setJobRetriableErrorMessage).to.be.calledWith(

package/src/program-handler/index.js

@@ -52,7 +52,13 @@ class ProgramHandler {
 
     jobData[jobName] = merge ? { ...jobData[jobName], ...payload } : payload;
 
-    devLogger.info('db update job data', { run_id: runId, jobName, payload: JSON.stringify(payload), merge, OSPID: process.pid });
+    devLogger.info('db update job data', {
+      run_id: runId,
+      jobName,
+      payload: JSON.stringify(payload),
+      merge,
+      OSPID: process.pid
+    });
     return this._programsRepository.setJobDataByRunId(runId, jobData);
   }
 

package/.eslintrc

@@ -1,31 +0,0 @@
-{
-  "root": true,
-  "extends": ["emarsys"],
-  "plugins": ["mocha"],
-  "env": {
-    "es6": true,
-    "node": true,
-    "mocha": true
-  },
-  "globals": {
-    "inject": true,
-    "onmessage": true,
-    "expect": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 9
-  },
-  "rules": {
-    "no-unused-expressions": 0,
-    "operator-linebreak": "off",
-    "no-unused-vars": [2, { "vars": "all", "args": "after-used" }],
-    "curly": [2, "multi-line"],
-    "require-yield": 0,
-    "new-cap": 0,
-    "security/detect-object-injection": 0,
-    "security/detect-non-literal-require": 0,
-    "security/detect-non-literal-fs-filename": 0,
-    "security/detect-non-literal-regexp": 0,
-    "space-before-function-paren": 0
-  }
-}