(change) make the code bonito with eslint --fix

sckv · Apr 28, 2020 · c1318d6 · c1318d6
1 parent 3bdd544
commit c1318d6
Show file tree

Hide file tree

Showing 47 changed files with 118 additions and 76 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,63 +1,58 @@
 module.exports = {
   env: {
     node: true,
+    es6: true,
   },
   root: true,
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "@typescript-eslint/tslint", "import"],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint', 'import'],
   extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:import/errors",
-    "plugin:import/warnings",
-    "plugin:import/typescript",
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier/@typescript-eslint',
+    'plugin:import/errors',
+    'plugin:import/warnings',
+    // 'plugin:import/typescript',
   ],
   rules: {
-    "max-classes-per-file": ["error", 1],
-    "no-console": 0,
-    "no-new": 0,
-    "no-nested-ternary": 0,
-    "no-unused-vars": ["error", { varsIgnorePattern: "^_" }],
-    "no-underscore-dangle": 0,
-    "array-callback-return": 1,
-    "no-return-assign": 0,
-    "no-param-reassign": 0,
-    "global-require": 0,
+    'max-classes-per-file': ['error', 1],
+    'no-console': 0,
+    'no-new': 0,
+    'no-nested-ternary': 0,
+    'no-unused-vars': ['error', { varsIgnorePattern: '^_' }],
+    'no-underscore-dangle': 0,
+    'array-callback-return': 1,
+    'no-return-assign': 0,
+    'no-param-reassign': 0,
+    'global-require': 0,
     // TS
-    "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-empty-function": 0,
-    "@typescript-eslint/generic-type-naming": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/prefer-namespace-keyword": 0,
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-use-before-define": 0,
+    '@typescript-eslint/no-var-requires': 0,
+    '@typescript-eslint/no-explicit-any': 0,
+    '@typescript-eslint/no-empty-function': 0,
+    '@typescript-eslint/generic-type-naming': 0,
+    '@typescript-eslint/explicit-function-return-type': 0,
+    '@typescript-eslint/prefer-namespace-keyword': 0,
+    '@typescript-eslint/no-non-null-assertion': 0,
+    '@typescript-eslint/no-use-before-define': 0,
+    '@typescript-eslint/camelcase': 0,
     // IMPORT
-    "import/prefer-default-export": 0,
-    "import/no-dynamic-require": 0,
-    "import/named": 2,
-    "import/namespace": 2,
-    "import/default": 2,
-    "import/export": 2,
-    "import/no-unresolved": 0,
-    "import/order": [
-      "error",
+    'import/prefer-default-export': 0,
+    'import/no-dynamic-require': 0,
+    'import/named': 2,
+    'import/namespace': 2,
+    'import/default': 2,
+    'import/export': 2,
+    'import/no-unresolved': 0,
+    'import/order': [
+      'error',
       {
-        "newlines-between": "always",
-        groups: [
-          "external",
-          "internal",
-          "index",
-          "sibling",
-          "parent",
-          "builtin",
-        ],
+        'newlines-between': 'always',
+        groups: ['external', 'internal', 'index', 'sibling', 'parent', 'builtin'],
       },
     ],
-    "import/no-extraneous-dependencies": [
-      "error",
+    'import/no-extraneous-dependencies': [
+      'error',
       {
         devDependencies: true,
         optionalDependencies: false,

diff --git a/package.json b/package.json
@@ -6,6 +6,9 @@
   "author": "Konstantin Knyazev <konstantinknyazev@outlook.com>",
   "license": "MIT",
   "private": true,
+  "scripts": {
+    "format": "eslint . --fix --ext ts --ignore-pattern **/node_modules/**"
+  },
   "workspaces": [
     "./packages/accounting",
     "./packages/graphql",

diff --git a/packages/accounting/app/application/controllers/CreateAccount.controller.ts b/packages/accounting/app/application/controllers/CreateAccount.controller.ts
@@ -1,8 +1,9 @@
 import e from 'express';
 
+import { CreateAccountCommand } from '../commands/CreateAccount.command';
+
 import { isDomainError } from '~app/tools';
 import { Email } from '~app/domain/value-objects/Email.vo';
-import { CreateAccountCommand } from '../commands/CreateAccount.command';
 import { Account } from '~app/domain/entities/Account.ent';
 
 interface Deps {

diff --git a/packages/accounting/app/application/controllers/RetrieveAccountBalance.controller.ts b/packages/accounting/app/application/controllers/RetrieveAccountBalance.controller.ts
@@ -1,6 +1,7 @@
 import e from 'express';
 
 import { RetrieveAccountBalanceQuery } from '../queries/RetrieveAccountBalance.query';
+
 import { isDomainError } from '~app/tools';
 import { Email } from '~app/domain/value-objects/Email.vo';
 

diff --git a/packages/accounting/app/application/handlers/ChargePayment.handler.ts b/packages/accounting/app/application/handlers/ChargePayment.handler.ts
@@ -1,5 +1,7 @@
-import { ChargePaymentCommand } from '../commands/ChargePayment.command';
 import { Msg } from 'ts-nats';
+
+import { ChargePaymentCommand } from '../commands/ChargePayment.command';
+
 import { Email } from '~app/domain/value-objects/Email.vo';
 
 interface Deps {

diff --git a/packages/accounting/app/domain/services/AccountManagement.service.ts b/packages/accounting/app/domain/services/AccountManagement.service.ts
@@ -1,6 +1,7 @@
+import Knex from 'knex';
+
 import { Email } from '../value-objects/Email.vo';
 import { Account } from '../entities/Account.ent';
-import Knex from 'knex';
 
 export abstract class AccountManagementService {
   constructor(protected database: Knex) {}

diff --git a/packages/accounting/app/infrastructure/AccountManagement.repository.ts b/packages/accounting/app/infrastructure/AccountManagement.repository.ts
@@ -1,6 +1,7 @@
+import Knex from 'knex';
+
 import { Account } from '~app/domain/entities/Account.ent';
 import { AccountManagementService } from '~app/domain/services/AccountManagement.service';
-import Knex from 'knex';
 import { Email } from '~app/domain/value-objects/Email.vo';
 
 export class AccountManagementServiceRepository extends AccountManagementService {

diff --git a/packages/accounting/app/infrastructure/Invoicing.repository.ts b/packages/accounting/app/infrastructure/Invoicing.repository.ts
@@ -1,6 +1,7 @@
-import { InvoicingService } from '~app/domain/services/Invoicing.service';
 import { Client } from 'ts-nats';
 
+import { InvoicingService } from '~app/domain/services/Invoicing.service';
+
 export class InvoicingServiceRepository extends InvoicingService {
   constructor(nats: Promise<Client>) {
     super(nats);

diff --git a/packages/accounting/bootstrap/express.ts b/packages/accounting/bootstrap/express.ts
@@ -1,6 +1,7 @@
-import { ex } from '~external/express';
 import { retrieveAccountBalanceController, createAccountController } from './bootstrap';
 
+import { ex } from '~external/express';
+
 // ASSOC ROUTES
 ex.route('/balance/:email').get(retrieveAccountBalanceController.handle.bind(retrieveAccountBalanceController));
 ex.route('/accounts').post(createAccountController.handle.bind(createAccountController));

diff --git a/packages/accounting/bootstrap/queue.ts b/packages/accounting/bootstrap/queue.ts
@@ -1,7 +1,9 @@
-import { nats } from '~external/nats';
 import { Client } from 'ts-nats';
+
 import { chargePaymentHandler } from './bootstrap';
 
+import { nats } from '~external/nats';
+
 const bootstrapNats = async () => {
   const client = (await nats) as Client;
 

diff --git a/packages/accounting/external/db/index.ts b/packages/accounting/external/db/index.ts
@@ -1,4 +1,5 @@
 import knex from 'knex';
+
 import { options } from './knexfile';
 
 export const database = knex(options);
diff --git a/packages/billing/app/application/controllers/RetrieveInvoices.controller.ts b/packages/billing/app/application/controllers/RetrieveInvoices.controller.ts
@@ -1,6 +1,7 @@
 import e from 'express';
 
 import { RetrieveInvoicesQuery } from '../queries/RetrieveInvoices.query';
+
 import { isDomainError } from '~app/tools';
 import { Email } from '~app/domain/value-objects/Email.vo';
 

diff --git a/packages/billing/app/application/handlers/CreateInvoice.handler.ts b/packages/billing/app/application/handlers/CreateInvoice.handler.ts
@@ -1,6 +1,8 @@
+import { Msg } from 'ts-nats';
+
 import { CreateInvoiceCommand } from '../commands/CreateInvoice.command';
+
 import { Invoice } from '~app/domain/entities/Invoice.ent';
-import { Msg } from 'ts-nats';
 import { Email } from '~app/domain/value-objects/Email.vo';
 
 interface Deps {

diff --git a/packages/billing/app/application/handlers/PayInvoice.handler.ts b/packages/billing/app/application/handlers/PayInvoice.handler.ts
@@ -1,6 +1,7 @@
-import { PayInvoiceCommand } from '../commands/PayInvoice.command';
 import { Msg } from 'ts-nats';
 
+import { PayInvoiceCommand } from '../commands/PayInvoice.command';
+
 interface Deps {
   payInvoice: PayInvoiceCommand;
 }

diff --git a/packages/billing/app/domain/entities/Invoice.ent.ts b/packages/billing/app/domain/entities/Invoice.ent.ts
@@ -1,4 +1,5 @@
 import * as uuid from 'uuid';
+
 import { Email } from '../value-objects/Email.vo';
 
 type WannabeInvoice = {

diff --git a/packages/billing/app/domain/services/BalanceRealated.service.ts b/packages/billing/app/domain/services/BalanceRealated.service.ts
@@ -1,6 +1,7 @@
-import { Invoice } from '~app/domain/entities/Invoice.ent';
 import { Client } from 'ts-nats';
 
+import { Invoice } from '~app/domain/entities/Invoice.ent';
+
 export abstract class BalanceRelatedService {
   constructor(protected nats: Promise<Client>) {}
   abstract async paymentCharge(invoice: Invoice): Promise<{ isEmitted: boolean } | Error>;

diff --git a/packages/billing/app/domain/services/Invoicing.service.ts b/packages/billing/app/domain/services/Invoicing.service.ts
@@ -1,7 +1,8 @@
+import Knex from 'knex';
+
 import { Invoice } from '~app/domain/entities/Invoice.ent';
 import { Email } from '~app/domain/value-objects/Email.vo';
 
-import Knex from 'knex';
 
 export abstract class InvoicingService {
   constructor(protected db: Knex) {}

diff --git a/packages/billing/app/infrastructure/BalanceRelated.repository.ts b/packages/billing/app/infrastructure/BalanceRelated.repository.ts
@@ -1,6 +1,7 @@
+import { Client } from 'ts-nats';
+
 import { Invoice } from '~app/domain/entities/Invoice.ent';
 import { BalanceRelatedService } from '~app/domain/services/BalanceRealated.service';
-import { Client } from 'ts-nats';
 
 export class BalanceRelatedServiceRepository extends BalanceRelatedService {
   constructor(nats: Promise<Client>) {

diff --git a/packages/billing/app/infrastructure/Invoicing.repository.ts b/packages/billing/app/infrastructure/Invoicing.repository.ts
@@ -1,6 +1,7 @@
+import Knex from 'knex';
+
 import { InvoicingService } from '~app/domain/services/Invoicing.service';
 import { Invoice } from '~app/domain/entities/Invoice.ent';
-import Knex from 'knex';
 import { Email } from '~app/domain/value-objects/Email.vo';
 
 export class InvoicingServiceRepository extends InvoicingService {

diff --git a/packages/billing/bootstrap/bootstrap.ts b/packages/billing/bootstrap/bootstrap.ts
@@ -1,17 +1,14 @@
 // REPOSITORIES
 import { InvoicingServiceRepository } from '~app/infrastructure/Invoicing.repository';
 import { BalanceRelatedServiceRepository } from '~app/infrastructure/BalanceRelated.repository';
-
 // HANDLERS & CONTROLLERS
 import { CreateInvoiceHandler } from '~app/application/handlers/CreateInvoice.handler';
 import { PayInvoiceHandler } from '~app/application/handlers/PayInvoice.handler';
 import { RetrieveInvoicesController } from '~app/application/controllers/RetrieveInvoices.controller';
-
 // COMMANDS & QUERIES
 import { PayInvoiceCommand } from '~app/application/commands/PayInvoice.command';
 import { CreateInvoiceCommand } from '~app/application/commands/CreateInvoice.command';
 import { RetrieveInvoicesQuery } from '~app/application/queries/RetrieveInvoices.query';
-
 // EXTERNALS
 import { database } from '~external/db';
 import { nats } from '~external/nats';

diff --git a/packages/billing/bootstrap/express.ts b/packages/billing/bootstrap/express.ts
@@ -1,6 +1,7 @@
-import { ex } from '~external/express';
 import { retrieveInvoiceController } from './bootstrap';
 
+import { ex } from '~external/express';
+
 // ASSOC ROUTES
 ex.route('/invoices/:email').get(retrieveInvoiceController.handle.bind(retrieveInvoiceController));
 

diff --git a/packages/billing/bootstrap/queue.ts b/packages/billing/bootstrap/queue.ts
@@ -1,7 +1,9 @@
-import { nats } from '~external/nats';
 import { Client } from 'ts-nats';
+
 import { createInvoiceHandler, payInvoiceHandler } from './bootstrap';
 
+import { nats } from '~external/nats';
+
 const bootstrapNats = async () => {
   const client = (await nats) as Client;
 

diff --git a/packages/billing/external/db/index.ts b/packages/billing/external/db/index.ts
@@ -1,4 +1,5 @@
 import knex from 'knex';
+
 import { options } from './knexfile';
 
 export const database = knex(options);
diff --git a/packages/graphql/src/schema/Mutation.ts b/packages/graphql/src/schema/Mutation.ts
@@ -1,4 +1,5 @@
 import { schemaComposer } from 'graphql-compose';
+
 import { Account } from './Account';
 import { Order } from './Order';
 

diff --git a/packages/graphql/src/schema/Order.ts b/packages/graphql/src/schema/Order.ts
@@ -1,4 +1,5 @@
 import { schemaComposer } from 'graphql-compose';
+
 import { Product } from './Product';
 
 export const Order = schemaComposer.createObjectTC({

diff --git a/packages/graphql/src/schema/Query.ts b/packages/graphql/src/schema/Query.ts
@@ -1,4 +1,5 @@
 import { schemaComposer } from 'graphql-compose';
+
 import { Order } from './Order';
 import { Product } from './Product';
 import { Account } from './Account';

diff --git a/packages/graphql/src/server.ts b/packages/graphql/src/server.ts
@@ -1,4 +1,5 @@
 import { ApolloServer } from 'apollo-server';
+
 import { schema } from './schema';
 import { dataSources } from './http';
 

diff --git a/packages/ordering/app/application/controllers/GetSingleOrder.controller.ts b/packages/ordering/app/application/controllers/GetSingleOrder.controller.ts
@@ -1,8 +1,9 @@
 import e from 'express';
 
-import { isDomainError } from '~app/tools';
 import { GetSingleOrderQuery } from '../queries/GetSingleOrder.query';
 
+import { isDomainError } from '~app/tools';
+
 interface Deps {
   getSingleOrderQuery: GetSingleOrderQuery;
 }

diff --git a/packages/ordering/app/application/controllers/PalceOrder.controller.ts b/packages/ordering/app/application/controllers/PalceOrder.controller.ts
@@ -1,6 +1,7 @@
 import e from 'express';
 
 import { PlaceOrderCommand } from '../commands/PlaceOrder.command';
+
 import { Order } from '~app/domain/entities/Order.ent';
 import { OrderItem } from '~app/domain/value-objects/OrderItem.vo';
 import { DataForInvoice } from '~app/domain/value-objects/InvoiceData.ent';

diff --git a/packages/ordering/app/application/controllers/RetrieveOrders.controller.ts b/packages/ordering/app/application/controllers/RetrieveOrders.controller.ts
@@ -1,7 +1,8 @@
 import e from 'express';
 
-import { isDomainError } from '~app/tools';
 import { RetrieveOrdersQuery } from '../queries/RetrieveOrders.query';
+
+import { isDomainError } from '~app/tools';
 import { Email } from '~app/domain/value-objects/Email.vo';
 
 interface Deps {

diff --git a/packages/ordering/app/domain/entities/Order.ent.ts b/packages/ordering/app/domain/entities/Order.ent.ts
@@ -1,4 +1,5 @@
 import * as uuid from 'uuid';
+
 import { OrderItem } from '../value-objects/OrderItem.vo';
 import { Email } from '../value-objects/Email.vo';
 

diff --git a/packages/ordering/app/domain/services/Invoicing.service.ts b/packages/ordering/app/domain/services/Invoicing.service.ts
@@ -1,4 +1,5 @@
 import { Client } from 'ts-nats';
+
 import { DataForInvoice } from '../value-objects/InvoiceData.ent';
 
 export abstract class InvoicingService {

diff --git a/packages/ordering/app/domain/services/OrderManagement.service.ts b/packages/ordering/app/domain/services/OrderManagement.service.ts
@@ -1,4 +1,5 @@
 import Knex from 'knex';
+
 import { Order } from '../entities/Order.ent';
 import { Email } from '../value-objects/Email.vo';
 

diff --git a/packages/ordering/app/domain/services/OrderProductsOperations.service.ts b/packages/ordering/app/domain/services/OrderProductsOperations.service.ts
@@ -1,8 +1,10 @@
 import { Client } from 'ts-nats';
-import { Fetcher } from '~external/http';
 
 import { OrderItem } from '../value-objects/OrderItem.vo';
 
+import { Fetcher } from '~external/http';
+
+
 export abstract class OrderProductsOperationsService {
   constructor(protected nats: Promise<Client>, protected http: Fetcher) {}
   abstract async updateProductsStock(orderItems: OrderItem[]): Promise<{ stocksUpdated: boolean } | Error>;

diff --git a/packages/ordering/app/infrastructure/Invoicing.repository.ts b/packages/ordering/app/infrastructure/Invoicing.repository.ts
@@ -1,4 +1,5 @@
 import { Client } from 'ts-nats';
+
 import { InvoicingService } from '~app/domain/services/Invoicing.service';
 import { DataForInvoice } from '~app/domain/value-objects/InvoiceData.ent';