fix: stricter linting, and downgrading typescript for compatibility

Author: chanind

package.json

@@ -96,7 +96,7 @@
     "express": "^4.16.4",
     "express-graphql": "^0.8.0",
     "graphql": "^14.2.1",
-    "graphql-query-rewriter": "^1.0.1",
+    "graphql-query-rewriter": "^1.0.2",
     "husky": "^1.0.1",
     "jest": "^23.6.0",
     "jest-config": "^23.6.0",
@@ -106,26 +106,27 @@
     "prompt": "^1.0.0",
     "replace-in-file": "^3.4.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.67.0",
+    "rollup": "^1.10.1",
     "rollup-plugin-commonjs": "^9.1.8",
     "rollup-plugin-json": "^3.1.0",
     "rollup-plugin-node-resolve": "^3.4.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-typescript2": "^0.18.0",
+    "rollup-plugin-typescript2": "^0.20.1",
     "semantic-release": "^15.9.16",
     "shelljs": "^0.8.3",
     "supertest": "^4.0.2",
     "travis-deploy-once": "^5.0.9",
     "ts-jest": "^23.10.2",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
+    "tslint-config-airbnb": "^5.11.1",
     "tslint-config-prettier": "^1.15.0",
-    "tslint-config-standard": "^8.0.1",
-    "typedoc": "^0.12.0",
-    "typescript": "^3.0.3"
+    "typedoc": "^0.14.2",
+    "typescript": "~3.3.0"
   },
   "peerDependencies": {
     "express-graphql": "^0.8.0",
-    "graphql-query-rewriter": "^1.0.1"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0",
+    "graphql-query-rewriter": "^1.0.2"
   }
 }

src/index.ts

@@ -1,6 +1,6 @@
-import { Rewriter, RewriteHandler } from 'graphql-query-rewriter';
-import { Request, Response, NextFunction } from 'express';
+import { NextFunction, Request, Response } from 'express';
 import * as graphqlHTTP from 'express-graphql';
+import { RewriteHandler, Rewriter } from 'graphql-query-rewriter';
 
 interface RewriterMiddlewareOpts {
   rewriters: Rewriter[];
@@ -20,34 +20,32 @@ const rewriteResJson = (res: Response) => {
   };
 };
 
-const graphqlRewriterMiddleware = ({ rewriters }: RewriterMiddlewareOpts) => async (
-  req: Request,
-  res: Response,
-  next: NextFunction
-) => {
-  try {
-    const params = await (graphqlHTTP as any).getGraphQLParams(req);
-    const { query, variables, operationName } = params;
-    if (!query) {
-      return;
+const graphqlRewriterMiddleware = ({ rewriters }: RewriterMiddlewareOpts) =>
+  // tslint:disable-next-line: only-arrow-functions
+  async function(req: Request, res: Response, next: NextFunction) {
+    try {
+      const params = await (graphqlHTTP as any).getGraphQLParams(req);
+      const { query, variables, operationName } = params;
+      if (!query) {
+        return;
+      }
+      const rewriteHandler = new RewriteHandler(rewriters);
+      const newQueryAndVariables = rewriteHandler.rewriteRequest(query, variables || undefined);
+      const newBody = {
+        operationName,
+        query: newQueryAndVariables.query,
+        variables: newQueryAndVariables.variables
+      };
+      if (typeof req.body === 'object' && !(req.body instanceof Buffer)) {
+        req.body = { ...req.body, newBody };
+      } else {
+        req.body = newBody;
+      }
+      req._rewriteHandler = rewriteHandler;
+      rewriteResJson(res);
+    } finally {
+      next();
     }
-    const rewriteHandler = new RewriteHandler(rewriters);
-    const newQueryAndVariables = rewriteHandler.rewriteRequest(query, variables || undefined);
-    const newBody = {
-      query: newQueryAndVariables.query,
-      variables: newQueryAndVariables.variables,
-      operationName
-    };
-    if (typeof req.body === 'object' && !(req.body instanceof Buffer)) {
-      req.body = { ...req.body, newBody };
-    } else {
-      req.body = newBody;
-    }
-    req._rewriteHandler = rewriteHandler;
-    rewriteResJson(res);
-  } finally {
-    next();
-  }
-};
+  };
 
 export { graphqlRewriterMiddleware };

src/types.d.ts

@@ -1,16 +1,6 @@
+// tslint:disable-next-line:no-namespace
 declare namespace Express {
   interface Request {
     _rewriteHandler?: import('graphql-query-rewriter').RewriteHandler;
   }
 }
-
-// declare module 'express-graphql' {
-//   interface Params {
-//     query: string | null | undefined;
-//     variables: { [name: string]: any } | null | undefined;
-//     operationName: string | null | undefined;
-//     raw: boolean | null | undefined;
-//   }
-//   function getGraphQLParams(req: import('express').Request): Promise<Params>;
-//   function graphqlHTTP(options: any): any;
-// }

test/index.test.ts

@@ -1,13 +1,13 @@
-import { graphqlRewriterMiddleware } from '../src';
-import { buildSchema } from 'graphql';
-import * as graphqlHTTP from 'express-graphql';
 import * as express from 'express';
-import * as request from 'supertest';
+import * as graphqlHTTP from 'express-graphql';
+import { buildSchema } from 'graphql';
 import {
-  FieldArgTypeRewriter,
   FieldArgsToInputTypeRewriter,
+  FieldArgTypeRewriter,
   NestFieldOutputsRewriter
 } from 'graphql-query-rewriter';
+import * as request from 'supertest';
+import { graphqlRewriterMiddleware } from '../src';
 
 const schema = buildSchema(`
   type Query {

tslint.json

@@ -1,6 +1,8 @@
 {
-  "extends": [
-    "tslint-config-standard",
-    "tslint-config-prettier"
-  ]
-}
+  "extends": ["tslint:recommended", "tslint-config-airbnb", "tslint-config-prettier"],
+  "rules": {
+    "interface-name": false,
+    "object-literal-sort-keys": false,
+    "no-increment-decrement": false
+  }
+}