Restore prettier + integrate with ESLint

Author: firstred

.eslintrc

@@ -1,15 +1,16 @@
 {
   "extends": [
-    "@mollie/eslint-config-typescript"
+    "@mollie/eslint-config-typescript",
+    "plugin:prettier/recommended"
   ],
   "rules": {
-    "max-len": ["warn", { "code": 140, "comments": 400 }],
     "no-underscore-dangle": "off",
     "import/prefer-default-export": "off",
     "no-plusplus": "off",
     "no-shadow": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "no-console": "off"
+    "no-console": "off",
+    "@typescript-eslint/indent": "off"
   },
   "settings": {
     "import/resolver": {

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 200,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "arrowParens": "avoid"
+}

examples/with-express/01-new-payment.js

@@ -19,11 +19,11 @@ app.get('/', (req, res) => {
       webhookUrl: `http://example.org/webhook?orderId=${orderId}`,
       metadata: { orderId },
     })
-    .then((payment) => {
+    .then(payment => {
       // Redirect the consumer to complete the payment using `payment.getPaymentUrl()`.
       res.redirect(payment.getPaymentUrl());
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling.
       res.send(error);
     });

examples/with-express/02-webhook-verification.js

@@ -18,15 +18,15 @@ const mollieClient = mollie({ apiKey: 'test_buC3bBQfSQhd4dDUeMctJjDCn3GhP4' });
 app.post('/webhook', (req, res) => {
   mollieClient.payments
     .get(req.body.id)
-    .then((payment) => {
+    .then(payment => {
       if (payment.isPaid()) {
         // Hooray, you've received a payment! You can start shipping to the consumer.
       } else if (!payment.isOpen()) {
         // The payment isn't paid and has expired. We can assume it was aborted.
       }
       res.send(payment.status);
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling.
       res.send(error);
     });

examples/with-express/03-return-page.js

@@ -20,11 +20,11 @@ app.get('/return-page', (req, res) => {
 
   mollieClient.payments
     .get(order.paymentId)
-    .then((payment) => {
+    .then(payment => {
       // Show the consumer the status of the payment using `payment.status`.
       res.send(payment.status);
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling.
       res.send(error);
     });

examples/with-express/04-ideal-payment.js

@@ -16,18 +16,13 @@ app.get('/', (req, res) => {
     mollieClient.methods
       .all({ include: 'issuers' })
       .then(methods => methods.filter(({ id }) => id === 'ideal'))
-      .then((methods) => {
+      .then(methods => {
         res.send(`<form>
-        ${methods.map(
-    method => `
-<h2>Select ${method.description} issuer</h2>
-<select name="issuer">${method.issuers.map(issuer => `<option value="${issuer.id}">${issuer.name}</option>`)}</select>
-        `,
-  )}
+        ${methods.map(method => `<h2>Select ${method.description} issuer</h2><select name="issuer">${method.issuers.map(issuer => `<option value="${issuer.id}">${issuer.name}</option>`)}</select>`)}
         <button>Select issuer</button>
         </form>`);
       })
-      .catch((error) => {
+      .catch(error => {
         // Do some proper error handling.
         res.send(error);
       });
@@ -48,11 +43,11 @@ app.get('/', (req, res) => {
       method: 'ideal',
       issuer: selectedIssuer,
     })
-    .then((payment) => {
+    .then(payment => {
       // Redirect the consumer to complete the payment using `payment.getPaymentUrl()`.
       res.redirect(payment.getPaymentUrl());
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling.
       res.send(error);
     });

examples/with-express/05-payments-history.js

@@ -22,25 +22,25 @@ app.get('/', (req, res) => {
 
   mollieClient.payments
     .all(paymentParameters)
-    .then((payments) => {
+    .then(payments => {
       res.send(`
         <ul>
 ${payments
-    .map(
-      payment => `<li>
+  .map(
+    payment => `<li>
   Payment ID: ${payment.id}<br />
   Method: ${payment.method}<br />
   Amount: ${payment.amount.value} ${payment.amount.currency}<br />
   Created at: ${new Date(payment.createdAt)}
 </li>`,
-    )
-    .join('')}
+  )
+  .join('')}
         </ul>
         ${payments.previousPageCursor ? `<a href="?from=${payments.previousPageCursor}">Previous</a> | ` : ''}
         ${payments.nextPageCursor ? `<a href="?from=${payments.nextPageCursor}">Next</a>` : ''}
       `);
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling.
       res.send(error);
     });

examples/with-express/06-refund-payment.js

@@ -16,9 +16,9 @@ mollieClient.payments_refunds
       currency: 'EUR',
     },
   })
-  .then((refund) => {
+  .then(refund => {
     // New refund (#`refund.id`) created with amount: `refund.amount`.
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/07-new-customer.js

@@ -14,9 +14,9 @@ mollieClient.customers
       isJedi: true,
     },
   })
-  .then((customer) => {
+  .then(customer => {
     // New customer created with ID `customer.id` and name `customer.name`.
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/08-new-customer-payment.js

@@ -10,7 +10,7 @@ const mollieClient = mollie({ apiKey: 'test_buC3bBQfSQhd4dDUeMctJjDCn3GhP4' });
 
 mollieClient.customers
   .all()
-  .then((customers) => {
+  .then(customers => {
     const customerId = customers[0].id; // Select one of your customers.
     const orderId = new Date().getTime();
 
@@ -23,13 +23,13 @@ mollieClient.customers
         metadata: { orderId },
         customerId,
       })
-      .then((payment) => {
+      .then(payment => {
         // Redirect customer to payment screen with `payment.getPaymentUrl()`.
       })
-      .catch((error) => {
+      .catch(error => {
         // Do some proper error handling.
       });
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/09-customer-payments-history.js

@@ -11,9 +11,9 @@ mollieClient.customers_payments
     count: 50,
     customerId: 'cst_cu5t0m3r',
   })
-  .then((payments) => {
+  .then(payments => {
     // List the customer's payments.
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/10-recurring-first-payment.js

@@ -17,9 +17,9 @@ mollieClient.customers_payments
     sequenceType: 'first',
     customerId: 'cst_2mVdVmuVq2',
   })
-  .then((payment) => {
+  .then(payment => {
     // Redirect the customer to complete the payment using `payment.getPaymentUrl()`.
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/11-recurring-payment.js

@@ -8,7 +8,7 @@ const mollieClient = mollie({ apiKey: 'test_buC3bBQfSQhd4dDUeMctJjDCn3GhP4' });
 
 mollieClient.customers
   .all()
-  .then((customers) => {
+  .then(customers => {
     const customerId = customers[0].id; // Select one of your customers.
     const orderId = new Date().getTime();
 
@@ -22,13 +22,13 @@ mollieClient.customers
         customerId,
         sequenceType: 'recurring',
       })
-      .then((payment) => {
+      .then(payment => {
         // Redirect customer to payment screen with `payment.getPaymentUrl()`.
       })
-      .catch((error) => {
+      .catch(error => {
         // Do some proper error handling.
       });
   })
-  .catch((error) => {
+  .catch(error => {
     // Do some proper error handling.
   });

examples/with-express/16-recurring-subscription.js

@@ -6,7 +6,7 @@ const mollie = require('@mollie/api-client');
 
 const mollieClient = mollie({ apiKey: 'test_buC3bBQfSQhd4dDUeMctJjDCn3GhP4' });
 
-mollieClient.customers.all().then((customers) => {
+mollieClient.customers.all().then(customers => {
   mollieClient.customers_subscriptions
     .create({
       customerId: customers[0].id,
@@ -19,7 +19,7 @@ mollieClient.customers.all().then((customers) => {
     .then(({ id }) => {
       // i.e. send confirmation email
     })
-    .catch((error) => {
+    .catch(error => {
       // Do some proper error handling
     });
 });

package.json

@@ -33,9 +33,10 @@
     "test:cov": "jest --coverage",
     "test:unit:cov": "jest ./tests/unit --coverage",
     "build": "rollup -c",
+    "lint:prettier": "prettier --write \"{src,tests,examples}/**/*.{js,ts}\"",
     "lint:eslint": "eslint --ext .ts,.js src/ tests/ examples/",
     "lint:eslint:fix": "eslint --ext .ts,.js --fix src/ tests/ examples/",
-    "lint": "yarn lint:eslint:fix"
+    "lint": "yarn lint:eslint:fix && yarn lint:prettier"
   },
   "dependencies": {
     "axios": "^0.18.0",
@@ -58,9 +59,12 @@
     "cz-conventional-changelog": "^2.1.0",
     "dotenv": "^6.2.0",
     "eslint": "^5.13.0",
+    "eslint-config-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^3.0.1",
     "husky": "^1.3.1",
     "jest": "^24.1.0",
     "lint-staged": "^8.1.0",
+    "prettier": "^1.16.4",
     "rollup": "^1.1.2",
     "rollup-plugin-copy-glob": "^0.3.0",
     "rollup-plugin-includepaths": "^0.2.3",
@@ -79,14 +83,17 @@
   },
   "lint-staged": {
     "src/**/*.ts": [
+      "prettier --write \"src/**/*.{js,ts}\"",
       "eslint --ext .js,.ts --fix src/",
       "git add src/"
     ],
     "tests/**/*.ts": [
+      "prettier --write \"tests/**/*.(js|ts)\"",
       "eslint --ext .js,.ts --fix tests/",
       "git add tests/"
     ],
     "examples/**/*.js": [
+      "prettier --write \"examples/**/*.(js|ts)\"",
       "eslint --ext .js,.ts --fix examples/",
       "git add examples/"
     ]

src/models/List.ts

@@ -3,7 +3,9 @@ import { IListLinks } from '../types/global';
 import Model from '../model';
 import { ResourceCallback } from '../resource';
 
-interface IInstantiable<T = any> { new (...args: Array<any>): T }
+interface IInstantiable<T = any> {
+  new (...args: Array<any>): T;
+}
 
 interface IResourceListParams {
   response: {
@@ -47,14 +49,7 @@ export default class List<T> extends Array {
     return {};
   }
 
-  public static buildResourceList({
-    response,
-    resourceName,
-    params,
-    callback,
-    getResources,
-    Model,
-  }: IResourceListParams): List<Model> {
+  public static buildResourceList({ response, resourceName, params, callback, getResources, Model }: IResourceListParams): List<Model> {
     const { _embedded, count, _links } = response;
     const resources = _embedded[resourceName];
     const list = new List();

src/resource.ts

@@ -108,10 +108,7 @@ export default class Resource {
     }
 
     try {
-      const response: AxiosResponse = await this.getClient().post(
-        `${this.getResourceUrl()}${qs.stringify(query, { addQueryPrefix: true })}`,
-        params,
-      );
+      const response: AxiosResponse = await this.getClient().post(`${this.getResourceUrl()}${qs.stringify(query, { addQueryPrefix: true })}`, params);
 
       // noinspection JSPotentiallyInvalidConstructorUsage
       const model = new (this.constructor as any).model(response.data);
@@ -152,9 +149,7 @@ export default class Resource {
     }
 
     try {
-      const response: AxiosResponse = await this.getClient().get(
-        `${this.getResourceUrl()}/${id}${qs.stringify(query, { addQueryPrefix: true })}`,
-      );
+      const response: AxiosResponse = await this.getClient().get(`${this.getResourceUrl()}/${id}${qs.stringify(query, { addQueryPrefix: true })}`);
 
       // noinspection JSPotentiallyInvalidConstructorUsage
       const model = new (this.constructor as any).model(response.data);
@@ -202,9 +197,7 @@ export default class Resource {
         }
       }
 
-      const response: AxiosResponse = await this.getClient().get(
-        `${this.getResourceUrl()}${qs.stringify(query, { addQueryPrefix: true })}`,
-      );
+      const response: AxiosResponse = await this.getClient().get(`${this.getResourceUrl()}${qs.stringify(query, { addQueryPrefix: true })}`);
       const resourceName = this.getResourceName();
       const list = List.buildResourceList({
         response: response.data,

src/resources/chargebacks.ts

@@ -55,10 +55,7 @@ export default class ChargebacksResource extends Resource {
   public async list(params?: IListParams | ListCallback, cb?: ListCallback): Promise<List<Chargeback>> {
     // Using callbacks (DEPRECATED SINCE 2.2.0)
     if (typeof params === 'function' || typeof cb === 'function') {
-      return super.list(
-        typeof params === 'function' ? null : params,
-        typeof params === 'function' ? params : cb,
-      ) as Promise<List<Chargeback>>;
+      return super.list(typeof params === 'function' ? null : params, typeof params === 'function' ? params : cb) as Promise<List<Chargeback>>;
     }
 
     return super.list(params, cb) as Promise<List<Chargeback>>;