chore: add prettier and format all

ike18t · May 21, 2024 · 0d9e8fd · 0d9e8fd
1 parent fb5653d
commit 0d9e8fd
Show file tree

Hide file tree

Showing 18 changed files with 361 additions and 213 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "none"
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,9 +1,11 @@
 import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
+import eslintConfigPrettier from "eslint-config-prettier";
 
 export default [
   pluginJs.configs.recommended,
   ...tseslint.configs.recommendedTypeChecked,
+  eslintConfigPrettier,
   { ignores: ['jest.config.ts', 'eslint.config.mjs'] },
   {
     languageOptions: {

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,12 +1,7 @@
 module.exports = {
-  moduleFileExtensions: [
-    'ts',
-    'js',
-  ],
+  moduleFileExtensions: ['ts', 'js'],
   restoreMocks: true,
-  roots: [
-    '<rootDir>/lib'
-  ],
+  roots: ['<rootDir>/lib'],
   setupFiles: [],
   testRegex: '(.*\\.spec)\\.ts$',
   transform: {

diff --git a/lib/builders/match_builder.spec.ts b/lib/builders/match_builder.spec.ts
@@ -63,23 +63,33 @@ describe('MatchBuilder', () => {
       const builder = new MatchBuilder(new RequestBuilderImpl());
       builder.equalToJson('foo', true);
 
-      const expectedJSON = JSON.stringify({ equalToJson: 'foo', ignoreArrayOrder: true });
+      const expectedJSON = JSON.stringify({
+        equalToJson: 'foo',
+        ignoreArrayOrder: true
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
 
     it('json stringifies to { equalToJson: value, ignoreExtraElements: true }', () => {
       const builder = new MatchBuilder(new RequestBuilderImpl());
       builder.equalToJson('foo', false, true);
 
-      const expectedJSON = JSON.stringify({ equalToJson: 'foo', ignoreExtraElements: true });
+      const expectedJSON = JSON.stringify({
+        equalToJson: 'foo',
+        ignoreExtraElements: true
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
 
     it('json stringifies to { equalToJson: value, ignoreArrayOrder: true, ignoreExtraElements: true }', () => {
       const builder = new MatchBuilder(new RequestBuilderImpl());
       builder.equalToJson('foo', true, true);
 
-      const expectedJSON = JSON.stringify({ equalToJson: 'foo', ignoreArrayOrder: true, ignoreExtraElements: true });
+      const expectedJSON = JSON.stringify({
+        equalToJson: 'foo',
+        ignoreArrayOrder: true,
+        ignoreExtraElements: true
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
 
@@ -94,7 +104,9 @@ describe('MatchBuilder', () => {
       const builder = new MatchBuilder(requestBuilder);
       builder.equalToJson({ foo: 'bar' });
 
-      const expectedJSON = JSON.stringify({ equalToJson: JSON.stringify({ foo: 'bar' }) });
+      const expectedJSON = JSON.stringify({
+        equalToJson: JSON.stringify({ foo: 'bar' })
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
 
@@ -103,7 +115,9 @@ describe('MatchBuilder', () => {
       const builder = new MatchBuilder(requestBuilder);
       builder.equalToJson(JSON.stringify({ foo: 'bar' }));
 
-      const expectedJSON = JSON.stringify({ equalToJson: JSON.stringify({ foo: 'bar' }) });
+      const expectedJSON = JSON.stringify({
+        equalToJson: JSON.stringify({ foo: 'bar' })
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
   });

diff --git a/lib/builders/match_builder.ts b/lib/builders/match_builder.ts
@@ -30,7 +30,11 @@ export class MatchBuilder {
     return this.requestBuilder;
   }
 
-  public equalToJson(json: object | string, ignoreArrayOrder: boolean = false, ignoreExtraElements: boolean = false) {
+  public equalToJson(
+    json: object | string,
+    ignoreArrayOrder: boolean = false,
+    ignoreExtraElements: boolean = false
+  ) {
     this.matchType = 'equalToJson';
     if (typeof json === 'object') {
       json = JSON.stringify(json); // tslint:disable-line

diff --git a/lib/builders/request_builder.spec.ts b/lib/builders/request_builder.spec.ts
@@ -109,7 +109,9 @@ describe('RequestBuilderImpl', () => {
     it('should json stringify to { basicAuth: { username: value, password: value } }', () => {
       const builder = new RequestBuilderImpl();
       builder.withBasicAuth('ike', '1234');
-      const expectedJSON = JSON.stringify({ basicAuthCredentials: { username: 'ike', password: '1234' } });
+      const expectedJSON = JSON.stringify({
+        basicAuthCredentials: { username: 'ike', password: '1234' }
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
 
@@ -130,23 +132,29 @@ describe('RequestBuilderImpl', () => {
   describe('withCookie', () => {
     it('should json stringify to { cookies: { key: {{ JSON GENERATED BY MATCH BUILDER }} } }', () => {
       const builder = new RequestBuilderImpl().withCookie('ike').absent;
-      const expectedJSON = JSON.stringify({ cookies: { ike: { absent: true } } });
+      const expectedJSON = JSON.stringify({
+        cookies: { ike: { absent: true } }
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
   });
 
   describe('withHeader', () => {
     it('should json stringify to { headers: { key: {{ JSON GENERATED BY MATCH BUILDER }} } }', () => {
       const builder = new RequestBuilderImpl().withHeader('ike').absent;
-      const expectedJSON = JSON.stringify({ headers: { ike: { absent: true } } });
+      const expectedJSON = JSON.stringify({
+        headers: { ike: { absent: true } }
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
   });
 
   describe('withQueryParam', () => {
     it('should json stringify to { queryParameters: { key: {{ JSON GENERATED BY MATCH BUILDER }} } }', () => {
       const builder = new RequestBuilderImpl().withQueryParam('ike').absent;
-      const expectedJSON = JSON.stringify({ queryParameters: { ike: { absent: true } } });
+      const expectedJSON = JSON.stringify({
+        queryParameters: { ike: { absent: true } }
+      });
       expect(JSON.stringify(builder)).toEqual(expectedJSON);
     });
   });

diff --git a/lib/builders/request_builder.ts b/lib/builders/request_builder.ts
@@ -87,7 +87,10 @@ export class RequestBuilderImpl implements RequestBuilder {
     return this;
   }
 
-  public toJSON: () => RequestJSON = () => ({ ...this.request, ...this.urlMatchBuilder.toJSON() });
+  public toJSON: () => RequestJSON = () => ({
+    ...this.request,
+    ...this.urlMatchBuilder.toJSON()
+  });
 
   public withBasicAuth(username: string, password: string): RequestBuilder {
     this.request.basicAuthCredentials = { username, password };

diff --git a/lib/builders/url_match_builder.spec.ts b/lib/builders/url_match_builder.spec.ts
@@ -3,8 +3,8 @@ import { UrlMatchBuilder } from './url_match_builder';
 
 describe('UrlMatchBuilder', () => {
   describe('constructed with path = true', () => {
-    describe('equalTo', ()  => {
-      it('json stringifies to { urlPath: value }', ()  => {
+    describe('equalTo', () => {
+      it('json stringifies to { urlPath: value }', () => {
         const builder = new UrlMatchBuilder(new RequestBuilderImpl(), true);
         builder.equalTo('/some/path');
 
@@ -19,8 +19,8 @@ describe('UrlMatchBuilder', () => {
       });
     });
 
-    describe('matching', ()  => {
-      it('json stringifies to { urlPattern: value }', ()  => {
+    describe('matching', () => {
+      it('json stringifies to { urlPattern: value }', () => {
         const builder = new UrlMatchBuilder(new RequestBuilderImpl(), true);
         builder.matching('/some/path');
 
@@ -37,8 +37,8 @@ describe('UrlMatchBuilder', () => {
   });
 
   describe('constructed with path = false', () => {
-    describe('equalTo', ()  => {
-      it('json stringifies to { url: value }', ()  => {
+    describe('equalTo', () => {
+      it('json stringifies to { url: value }', () => {
         const builder = new UrlMatchBuilder(new RequestBuilderImpl(), false);
         builder.equalTo('/some/path');
 
@@ -47,8 +47,8 @@ describe('UrlMatchBuilder', () => {
       });
     });
 
-    describe('matching', ()  => {
-      it('json stringifies to { urlPattern: value }', ()  => {
+    describe('matching', () => {
+      it('json stringifies to { urlPattern: value }', () => {
         const builder = new UrlMatchBuilder(new RequestBuilderImpl(), false);
         builder.matching('/some/path');
 

diff --git a/lib/builders/url_match_builder.ts b/lib/builders/url_match_builder.ts
@@ -1,10 +1,12 @@
 import { RequestBuilder } from './request_builder';
 
 export class UrlMatchBuilder {
-
   private jsonObject = {};
 
-  constructor(private readonly requestBuilder: RequestBuilder, private readonly path: boolean = false) {}
+  constructor(
+    private readonly requestBuilder: RequestBuilder,
+    private readonly path: boolean = false
+  ) {}
 
   public equalTo(url: string): RequestBuilder {
     const urlType = this.path ? 'urlPath' : 'url';

diff --git a/lib/configuration.spec.ts b/lib/configuration.spec.ts
@@ -2,23 +2,33 @@ import { Configuration } from './configuration';
 
 describe('Configuration', () => {
   describe('createGlobalMapping', () => {
-    beforeEach(() => { Configuration.reset(); });
-    afterEach(() => { Configuration.reset(); });
+    beforeEach(() => {
+      Configuration.reset();
+    });
+    afterEach(() => {
+      Configuration.reset();
+    });
 
     it('should set the request builder on configuration', () => {
       Configuration.createGlobalMapping((requestBuilder) => {
         requestBuilder.withHeader('foo').equalTo('bar');
       });
-      const expectedJSON = JSON.stringify({ headers: { foo: { equalTo: 'bar' } } });
-      expect(JSON.stringify(Configuration.requestBuilder)).toEqual(expectedJSON);
+      const expectedJSON = JSON.stringify({
+        headers: { foo: { equalTo: 'bar' } }
+      });
+      expect(JSON.stringify(Configuration.requestBuilder)).toEqual(
+        expectedJSON
+      );
     });
 
     it('should set the response builder on configuration', () => {
       Configuration.createGlobalMapping((_, responseBuilder) => {
         responseBuilder.withDelay(500);
       });
       const expectedJSON = JSON.stringify({ fixedDelayMilliseconds: 500 });
-      expect(JSON.stringify(Configuration.responseBuilder)).toEqual(expectedJSON);
+      expect(JSON.stringify(Configuration.responseBuilder)).toEqual(
+        expectedJSON
+      );
     });
   });
 });
diff --git a/lib/configuration.ts b/lib/configuration.ts
@@ -23,6 +23,8 @@ export class Configuration {
     Configuration.responseBuilderImpl = new ResponseBuilderImpl();
   }
 
-  private static requestBuilderImpl: RequestBuilderImpl = new RequestBuilderImpl();
-  private static responseBuilderImpl: ResponseBuilderImpl = new ResponseBuilderImpl();
+  private static requestBuilderImpl: RequestBuilderImpl =
+    new RequestBuilderImpl();
+  private static responseBuilderImpl: ResponseBuilderImpl =
+    new ResponseBuilderImpl();
 }