wip: more typescript gardening and simplification

.eslintrc.yml

@@ -4,3 +4,5 @@ env:
   mocha: true
 extends:
   - plugin:prettier/recommended"
+rules:
+  comma-dangle: "always-multiline"

.prettierrc.yml

@@ -1,2 +1,2 @@
-trailingComma: "all"
+trailingComma: "es5"
 semi: false

examples/e2e/consumer.js

@@ -32,7 +32,7 @@ const suggestion = mate => {
 
   return availableAnimals().then(available => {
     const eligible = available.filter(
-      a => !predicates.map(p => p(a, mate)).includes(false),
+      a => !predicates.map(p => p(a, mate)).includes(false)
     )
 
     return {

examples/e2e/provider.js

@@ -9,7 +9,7 @@ server.use(bodyParser.json())
 server.use(
   bodyParser.urlencoded({
     extended: true,
-  }),
+  })
 )
 server.use((req, res, next) => {
   res.header("Content-Type", "application/json; charset=utf-8")

examples/e2e/test/consumer.spec.js

@@ -124,15 +124,15 @@ describe("Pact", () => {
             },
             body: animalListExpectation,
           },
-        }),
+        })
       )
 
       it("returns a list of animals", done => {
         const suggestedMates = suggestion(suitor)
 
         expect(suggestedMates).to.eventually.have.deep.property(
           "suggestions[0].score",
-          94,
+          94
         )
         expect(suggestedMates)
           .to.eventually.have.property("suggestions")
@@ -159,7 +159,7 @@ describe("Pact", () => {
             },
             body: animalBodyExpectation,
           },
-        }),
+        })
       )
 
       it("returns the animal", done => {
@@ -183,7 +183,7 @@ describe("Pact", () => {
           willRespondWith: {
             status: 404,
           },
-        }),
+        })
       )
 
       it("returns a 404", done => {
@@ -217,7 +217,7 @@ describe("Pact", () => {
           },
           body: like(suitor),
         },
-      }),
+      })
     )
 
     it("should create a new mate", done => {

examples/e2e/test/publish.js

@@ -4,7 +4,7 @@ const opts = {
   pactFilesOrDirs: [
     path.resolve(
       __dirname,
-      "../pacts/matching_service-animal_profile_service.json",
+      "../pacts/matching_service-animal_profile_service.json"
     ),
   ],
   pactBroker: "https://test.pact.dius.com.au",

examples/graphql/package.json

@@ -7,9 +7,9 @@
     "build": "tsc",
     "clean": "rimraf pacts",
     "test": "npm run clean && npm run test:consumer && npm run test:publish && npm run test:provider",
-    "test:consumer": "nyc --check-coverage --reporter=html --reporter=text-summary mocha consumer.spec.ts",
+    "test:consumer": "nyc --reporter=text-summary mocha consumer.spec.ts",
     "test:publish": "node publish.js",
-    "test:provider": "nyc --check-coverage --reporter=html --reporter=text-summary mocha -t 10000 provider.spec.ts"
+    "test:provider": "nyc --reporter=text-summary mocha -t 10000 provider.spec.ts"
   },
   "keywords": [
     "graphql",
@@ -31,6 +31,10 @@
     "graphql-tag": "^2.9.1",
     "graphql-tools": "^2.24.0",
     "node-fetch": "^2.2.0",
+    "nyc": "^11.6.0",
     "rimraf": "^2.6.2"
+  },
+  "dependencies": {
+    "mocha": "^5.1.1"
   }
 }

examples/graphql/provider.ts

@@ -21,7 +21,7 @@ app.use(
     graphiql: true,
     rootValue: root,
     schema,
-  }),
+  })
 )
 
 export function start(): any {

examples/messages/publish.js

@@ -4,7 +4,7 @@ const opts = {
   pactFilesOrDirs: [
     path.resolve(
       __dirname,
-      "pacts/myjsmessageconsumer-myjsmessageprovider.json",
+      "pacts/myjsmessageconsumer-myjsmessageprovider.json"
     ),
   ],
   pactBroker: "https://test.pact.dius.com.au",

package.json

@@ -90,6 +90,7 @@
     "cli-color": "^1.1.0",
     "es6-object-assign": "^1.1.0",
     "es6-promise": "^4.1.1",
+    "eslint": "^5.6.1",
     "eslint-plugin-prettier": "^3.0.0",
     "express": "^4.16.3",
     "graphql": "^0.13.2",

src/common/logger.ts

@@ -14,7 +14,7 @@ export class Logger extends bunyan {
         duration: time,
         type: "TIMER",
       },
-      `TIMER: ${action} completed in ${time} milliseconds`,
+      `TIMER: ${action} completed in ${time} milliseconds`
     )
   }
 

src/common/net.spec.ts

@@ -35,7 +35,7 @@ describe("Net", () => {
             },
             (e: any) => {
               done()
-            },
+            }
           )
         })
       })

src/common/net.ts

@@ -16,7 +16,7 @@ const isPortAvailable = (port: number, host: string): Promise<void> => {
         (e: any) =>
           e.code === "EADDRINUSE"
             ? reject(new Error(`Port ${port} is unavailable`))
-            : reject(e),
+            : reject(e)
       )
       .on("listening", () => server.once("close", () => resolve()).close())
   })

src/common/request.ts

@@ -31,7 +31,7 @@ export class Request {
   public send(
     method: HTTPMethod | methods,
     url: string,
-    body?: string,
+    body?: string
   ): Promise<string> {
     const opts = {
       body,

src/dsl/graphql.spec.ts

@@ -69,7 +69,7 @@ describe("GraphQLInteraction", () => {
     describe("when given an invalid query", () => {
       it("should fail with an error", () => {
         expect(() =>
-          interaction.withQuery("{ not properly terminated"),
+          interaction.withQuery("{ not properly terminated")
         ).to.throw(Error)
       })
     })

src/dsl/graphql.ts

@@ -37,8 +37,8 @@ export class GraphQLInteraction extends Interaction {
     ) {
       throw new Error(
         `You must provide a valid HTTP method: ${keys(GraphQLOperations).join(
-          ", ",
-        )}.`,
+          ", "
+        )}.`
       )
     }
 
@@ -114,7 +114,7 @@ export class GraphQLInteraction extends Interaction {
         headers: { "content-type": "application/json" },
         method: "POST",
       },
-      this.state.request,
+      this.state.request
     )
 
     return this.state

src/dsl/interaction.spec.ts

@@ -40,7 +40,7 @@ describe("Interaction", () => {
     it("throws error when no description provided", () => {
       expect(interaction.uponReceiving).to.throw(
         Error,
-        "You must provide a description for the interaction.",
+        "You must provide a description for the interaction."
       )
     })
 
@@ -58,29 +58,29 @@ describe("Interaction", () => {
     it("throws error when method is not provided", () => {
       expect(interaction.withRequest.bind(interaction, {})).to.throw(
         Error,
-        "You must provide an HTTP method.",
+        "You must provide an HTTP method."
       )
     })
 
     it("throws error when an invalid method is provided", () => {
       expect(
-        interaction.withRequest.bind(interaction, { method: "FOO" }),
+        interaction.withRequest.bind(interaction, { method: "FOO" })
       ).to.throw(
         Error,
-        "You must provide a valid HTTP method: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS.",
+        "You must provide a valid HTTP method: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS."
       )
     })
 
     it("throws error when method is not provided", () => {
       expect(interaction.withRequest.bind(interaction, { ath: "/" })).to.throw(
         Error,
-        "You must provide an HTTP method.",
+        "You must provide an HTTP method."
       )
     })
 
     it("throws error when path is not provided", () => {
       expect(
-        interaction.withRequest.bind(interaction, { method: HTTPMethod.GET }),
+        interaction.withRequest.bind(interaction, { method: HTTPMethod.GET })
       ).to.throw(Error, "You must provide a path.")
     })
 
@@ -119,7 +119,7 @@ describe("Interaction", () => {
           "path",
           "query",
           "headers",
-          "body",
+          "body"
         )
       })
     })
@@ -157,13 +157,13 @@ describe("Interaction", () => {
     it("throws error when status is not provided", () => {
       expect(interaction.willRespondWith.bind(interaction, {})).to.throw(
         Error,
-        "You must provide a status code.",
+        "You must provide a status code."
       )
     })
 
     it("throws error when status is blank", () => {
       expect(
-        interaction.willRespondWith.bind(interaction, { status: "" }),
+        interaction.willRespondWith.bind(interaction, { status: "" })
       ).to.throw(Error, "You must provide a status code.")
     })
 

src/dsl/interaction.ts

@@ -84,7 +84,7 @@ export class Interaction {
 
     if (keys(HTTPMethod).indexOf(requestOpts.method.toString()) < 0) {
       throw new Error(
-        `You must provide a valid HTTP method: ${keys(HTTPMethod).join(", ")}.`,
+        `You must provide a valid HTTP method: ${keys(HTTPMethod).join(", ")}.`
       )
     }
 
@@ -118,7 +118,7 @@ export class Interaction {
         headers: responseOpts.headers || undefined,
         status: responseOpts.status,
       },
-      isNil,
+      isNil
     ) as ResponseOptions
     return this
   }

src/dsl/matchers.spec.ts

@@ -28,14 +28,14 @@ describe("Matcher", () => {
       describe("and a matching example", () => {
         it("should return true", () => {
           expect(validateExample("2010-01-01", ISO8601_DATE_FORMAT)).to.eql(
-            true,
+            true
           )
         })
       })
       describe("and a failing example", () => {
         it("should return false", () => {
           expect(validateExample("not a date", ISO8601_DATE_FORMAT)).to.eql(
-            false,
+            false
           )
         })
       })
@@ -220,7 +220,7 @@ describe("Matcher", () => {
 
           const match = eachLike({ id: somethingLike(10) }, { min: 1 })
           expect(JSON.stringify(match)).to.deep.include(
-            JSON.stringify(expected),
+            JSON.stringify(expected)
           )
         })
       })
@@ -252,11 +252,11 @@ describe("Matcher", () => {
                 matcher: "red|green",
               }),
             },
-            { min: 1 },
+            { min: 1 }
           )
 
           expect(JSON.stringify(match)).to.deep.include(
-            JSON.stringify(expected),
+            JSON.stringify(expected)
           )
         })
       })
@@ -275,7 +275,7 @@ describe("Matcher", () => {
 
           const match = eachLike(eachLike("blue", { min: 1 }), { min: 1 })
           expect(JSON.stringify(match)).to.deep.include(
-            JSON.stringify(expected),
+            JSON.stringify(expected)
           )
         })
       })
@@ -329,16 +329,16 @@ describe("Matcher", () => {
                 size: somethingLike(10),
                 tag: eachLike(
                   [somethingLike("jumper"), somethingLike("shirt")],
-                  { min: 2 },
+                  { min: 2 }
                 ),
               },
-              { min: 1 },
+              { min: 1 }
             ),
-            { min: 1 },
+            { min: 1 }
           )
 
           expect(JSON.stringify(match)).to.deep.include(
-            JSON.stringify(expected),
+            JSON.stringify(expected)
           )
         })
       })
@@ -408,7 +408,7 @@ describe("Matcher", () => {
       it("should not fail", () => {
         expect(ipv6Address("::1")).to.be.an("object")
         expect(ipv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334")).to.be.an(
-          "object",
+          "object"
         )
         expect(ipv6Address()).to.be.an("object")
       })
@@ -469,7 +469,7 @@ describe("Matcher", () => {
       describe("when given a valid rfc3339Timestamp", () => {
         it("should not fail", () => {
           expect(rfc3339Timestamp("Mon, 31 Oct 2016 15:21:41 -0400")).to.be.an(
-            "object",
+            "object"
           )
           expect(rfc3339Timestamp()).to.be.an("object")
         })
@@ -519,7 +519,7 @@ describe("Matcher", () => {
       describe("when given a valid iso8601DateTime", () => {
         it("should not fail", () => {
           expect(iso8601DateTime("2015-08-06T16:53:10+01:00")).to.be.an(
-            "object",
+            "object"
           )
           expect(iso8601DateTime()).to.be.an("object")
         })
@@ -537,7 +537,7 @@ describe("Matcher", () => {
       describe("when given a valid iso8601DateTimeWithMillis", () => {
         it("should not fail", () => {
           expect(
-            iso8601DateTimeWithMillis("2015-08-06T16:53:10.123+01:00"),
+            iso8601DateTimeWithMillis("2015-08-06T16:53:10.123+01:00")
           ).to.be.an("object")
           expect(iso8601DateTimeWithMillis()).to.be.an("object")
         })
@@ -586,7 +586,7 @@ describe("Matcher", () => {
                   foo: "bar",
                   baz: somethingLike("bat"),
                 },
-                { min: 3 },
+                { min: 3 }
               ),
             },
           })