structure set up

Author: epicallan

.DS_Store

@@ -0,0 +1,5 @@
+{
+   schema: {
+     files: '**/*.gql'
+   }
+ }

.dockerignore

@@ -30,18 +30,13 @@ Files explained:
 ----
     1. src                         - directory is used for typescript code that is part of the project
         1a. main.ts                - Main server file. (Starting Apollo server)
-        1b. main.spec.ts           - Tests file for main
-        1c. schema                 - Module used to build schema
+        1c. dw/schema              - Contains modules used to build dataware house schemas
             - index.ts             - simple logic to merge all modules into a schema using graphql-tools
-            - modules/             - directory for modules to be used with graphql-tools
-        1c. schema.spec.ts         - Basic test for schema.
-        1c. main.test.ts           - Main for tests runner.
+            - modules/             - directory for modules
     3. package.json                - file is used to describe the library
     4. tsconfig.json               - configuration file for the library compilation
     6. tslint.json                 - configuration file for the linter
-    7. typings.json                - typings needed for the server
     8. webpack.config.js           - configuration file of the compilation automation process for the library
-    9. webpack.config.test.js      - configuration file of the compilation when testing
     10. Dockerfile                 - Dockerfile used to describe how to make a container out of apollo server
 
 

.editorconfig

@@ -8,6 +8,7 @@
     "build:watch": "webpack --watch",
     "pretest": "npm run build",
     "test": "jest",
+    "lint": "tslint . --ext js,gql,graphql",
     "test:watch": "npm test -- --watch",
     "test:notify": "npm run test:watch -- --notify",
     "coverage": "npm test -- --coverage",
@@ -37,24 +38,30 @@
   },
   "homepage": "https://github.com/datahub/datahub-api#readme",
   "dependencies": {
-    "@types/body-parser": "1.16.3",
-    "@types/cors": "2.8.1",
-    "@types/express": "^4.0.35",
-    "@types/helmet": "0.0.35",
-    "@types/morgan": "^1.7.32",
     "body-parser": "^1.17.1",
+    "compression": "^1.6.2",
     "cors": "^2.8.3",
+    "dataloader": "^1.3.0",
     "express": "^4.15.2",
     "graphql": "0.10.0",
     "graphql-server-express": "^0.7.2",
     "graphql-tools": "0.11.0",
     "helmet": "^3.6.0",
-    "morgan": "^1.8.1"
+    "merge-graphql-schemas": "^0.0.17",
+    "morgan": "^1.8.1",
+    "ramda": "^0.24.0"
   },
   "devDependencies": {
+    "@playlyfe/gql": "^2.3.1",
+    "@types/body-parser": "1.16.3",
+    "@types/cors": "2.8.1",
+    "@types/express": "^4.0.35",
     "@types/graphql": "^0.9.1",
+    "@types/helmet": "0.0.35",
     "@types/jest": "^19.2.3",
-    "@types/node": "^7.0.18",
+    "@types/morgan": "^1.7.32",
+    "@types/node": "^7.0.22",
+    "@types/ramda": "^0.0.10",
     "awesome-typescript-loader": "^3.1.3",
     "concurrently": "^3.4.0",
     "jest": "^20.0.1",

.gqlconfig

@@ -1,15 +1,18 @@
-import * as express from 'express';
 import * as bodyParser from 'body-parser';
-import {graphqlExpress, graphiqlExpress} from 'graphql-server-express';
-import {Schema} from './schema';
+import compression from 'compression';
 import * as cors from 'cors';
+import * as express from 'express';
+import {graphiqlExpress, graphqlExpress} from 'graphql-server-express';
 import * as helmet from 'helmet';
 import * as morgan from 'morgan';
-import {persons, findPerson, addPerson} from './data-base/person-database';
+import * as path from 'path';
+import { mergeGraphqlSchemas } from 'merge-graphql-schemas';
+
+const Schema = mergeGraphqlSchemas(path.join(__dirname, './schema'));
 
 // Default port or given one.
-export const GRAPHQL_ROUTE = "/graphql";
-export const GRAPHIQL_ROUTE = "/graphiql";
+export const GRAPHQL_ROUTE = '/graphql';
+export const GRAPHIQL_ROUTE = '/graphiql';
 
 interface IMainOptions {
   enableCors: boolean;
@@ -27,63 +30,66 @@ function verbosePrint(port, enableGraphiql) {
   }
 }
 
-export class TestConnector {
-  public get testString() {
-    return "it works from connector as well!";
-  }
-}
+const graphqlMiddleware = [
+    bodyParser.json(),
+    bodyParser.text({ type: 'application/graphql' }),
+    (req, res, next) => {
+        if (req.is('application/graphql')) {
+            req.body = { query: req.body };
+        }
+        next();
+    }
+];
 
 export function main(options: IMainOptions) {
-  let app = express();
+  const app = express();
 
   app.use(helmet());
 
   app.use(morgan(options.env));
 
-  if (true === options.enableCors) {
-    app.use(GRAPHQL_ROUTE, cors());
-  }
+  if (true === options.enableCors) app.use(GRAPHQL_ROUTE, cors());
+
+  if (options.env === 'production') app.use(compression);
 
-  let testConnector = new TestConnector();
-  app.use(GRAPHQL_ROUTE, bodyParser.json(), graphqlExpress({
+  app.use(GRAPHQL_ROUTE, ...graphqlMiddleware, graphqlExpress(request => ({
     context: {
-      testConnector,
-      persons,
-      findPerson,
-      addPerson
+      request,
+      // add dbConnection here
     },
-    schema: Schema,
-  }));
+    schema: Schema
+  })));
 
   if (true === options.enableGraphiql) {
     app.use(GRAPHIQL_ROUTE, graphiqlExpress({endpointURL: GRAPHQL_ROUTE}));
   }
 
   return new Promise((resolve, reject) => {
-    let server = app.listen(options.port, () => {
+    const server = app.listen(options.port, () => {
       /* istanbul ignore if: no need to test verbose print */
       if (options.verbose) {
         verbosePrint(options.port, options.enableGraphiql);
       }
 
       resolve(server);
-    }).on("error", (err: Error) => {
+    }).on('error', (err: Error) => {
       reject(err);
     });
   });
 }
 
 /* istanbul ignore if: main scope */
+// for testing purposes. during testing its required as a module and hence the code below wont run
 if (require.main === module) {
   const PORT = process.env.PORT || 3000;
 
   // Either to export GraphiQL (Debug Interface) or not.
-  const NODE_ENV = process.env.NODE_ENV !== "production" ? "dev" : "production";
+  const NODE_ENV = process.env.NODE_ENV !== 'production' ? 'dev' : 'production';
 
-  const EXPORT_GRAPHIQL = NODE_ENV !== "production";
+  const EXPORT_GRAPHIQL = NODE_ENV !== 'production';
 
   // Enable cors (cross-origin HTTP request) or not.
-  const ENABLE_CORS = NODE_ENV !== "production";
+  const ENABLE_CORS = NODE_ENV !== 'production';
 
   main({
     enableCors: ENABLE_CORS,