merge recent changes from master

Author: keski

graphql-server/drivers/arangodb/driver.js

@@ -1,20 +1,22 @@
 const graphql = require('graphql');
 const arangojs = require("arangojs");
 const aql = arangojs.aql;
+const { makeExecutableSchema } = require('graphql-tools');
 const { ApolloError } = require('apollo-server');
 const waitOn = require('wait-on');
 
 let db;
 let disableEdgeValidation;
-let diasableDiractivesChecking
+let disableDirectivesChecking;
 
 module.exports = {
-    init: async function(schema){
-        let db_name = process.env.db ? process.env.db : 'dev-db';
-        let url = process.env.URL ? process.env.URL : 'http://localhost:8529';
-        let drop = process.env.DROP === 'true';
-        diasableDiractivesChecking = process.env.DISABLE_DIRECTIVES_CHECKING === 'true';
-        disableEdgeValidation = process.env.DISABLE_EDGE_VALIDATION === 'true';
+    init: async function(args){
+        let typeDefs = args.typeDefs;
+        let db_name = args.db_name || 'dev-db';
+        let url = args.url || 'http://localhost:8529';
+        let drop = args.drop || false;
+        disableDirectivesChecking = args.disableDirectivesChecking || false;
+        disableEdgeValidation = args.disableEdgeValidation || false;
         db = new arangojs.Database({ url: url });
 
         // wait for ArangoDB
@@ -35,6 +37,11 @@ module.exports = {
                 () => console.log()
             );
         }
+        const schema = makeExecutableSchema({
+            'typeDefs': typeDefs,
+            'resolvers': {}
+        });
+
         await createAndUseDatabase(db, db_name);
         await createTypeCollections(db, schema);
         await createEdgeCollections(db, schema);
@@ -75,14 +82,9 @@ module.exports = {
     },
     getEdgeCollectionName: function (type, field) {
         return getEdgeCollectionName(type, field);
-    },
-    hello: () => hello() // TODO: Remove after testing
+    }
 };
 
-async function hello(){
-    return "This is the arangodb.tools saying hello!"
-}
-
 async function createAndUseDatabase(db, db_name){
     await db.createDatabase(db_name).then(
         () => { console.info(`Database '${db_name}' created`); },
@@ -101,7 +103,7 @@ async function createTypeCollections(db, schema) {
         await collection.create().then(
             () => { console.info(`Collection '${collection_name}' created`) },
             err => {
-                //console.warn(`Collection '${collection_name}' not created:` , err.response.body.errorMessage);
+                console.warn(`Collection '${collection_name}' not created:` , err.response.body.errorMessage);
             }
         );
     }
@@ -384,7 +386,7 @@ async function create(isRoot, ctxt, data, returnType, info){
     }
 
     // directives handling
-    addfinalDirectiveChecksForType(ctxt, returnType, aql`${asAQLVar(resVar)}._id`, info.schema);
+    addFinalDirectiveChecksForType(ctxt, returnType, aql`${asAQLVar(resVar)}._id`, info.schema);
 
     // overwrite the current action
     if(isRoot) {
@@ -434,7 +436,7 @@ async function createEdge(isRoot, ctxt, source, sourceType, sourceField, target,
     ctxt.trans.params[docVar] = doc;
     ctxt.trans.code.push(`let ${resVar} = db._query(aql\`INSERT ${aqlDocVar} IN ${collection} RETURN NEW\`).next();`);
 
-    addfinalDirectiveChecksForType(ctxt, sourceType, source, info.schema);
+    addFinalDirectiveChecksForType(ctxt, sourceType, source, info.schema);
 
     // overwrite the current action
     if(isRoot) {
@@ -673,7 +675,7 @@ async function update(isRoot, ctxt, id, data, returnType, info){
     }
 
     // directives handling
-    addfinalDirectiveChecksForType(ctxt, returnType, aql`${asAQLVar(resVar)}._id`, info.schema);
+    addFinalDirectiveChecksForType(ctxt, returnType, aql`${asAQLVar(resVar)}._id`, info.schema);
 
     // overwrite the current action
     if(isRoot) {
@@ -1159,8 +1161,8 @@ function addPossibleEdgeTypes(query, schema, type_name, field_name, use_aql = tr
  * @param resVar
  * @param schema
  */
-function addfinalDirectiveChecksForType(ctxt, type, id, schema) {
-    if (!diasableDiractivesChecking) {
+function addFinalDirectiveChecksForType(ctxt, type, id, schema) {
+    if (!disableDirectivesChecking) {
         for (let f in type.getFields()) {
             let field = type.getFields()[f];
             for (dir of field.astNode.directives) {

graphql-server/server.js

@@ -1,35 +1,54 @@
 const { ApolloServer, gql } = require('apollo-server');
-const fs = require('fs');
+const { readFileSync } = require('fs');
 const driver = require('./driver.js');
 const graphqlResolvers = require('./resolvers.js');
 const graphqlCustomResolvers = require('./custom-resolvers.js');
 
-const text = fs.readFileSync('api-schema/api-schema.graphql', 'utf8');
-const textExtend = fs.readFileSync('api-schema/custom-api-schema.graphql', 'utf8');
-const typeDefs = gql`${text + textExtend}`;
-
 async function run(){
-    // setup resolvers
-    const resolvers = await graphqlResolvers.get({ driver: driver });
-    const customResolvers = await graphqlCustomResolvers.get({ driver: driver });
-    resolvers.Query = {...resolvers.Query, ...customResolvers.Query};
-
-    const server = new ApolloServer({typeDefs, resolvers: resolvers});
-    await driver.init(server.schema);
+    // parse API schema and extended schema
+    const baseSchema = readFileSync('api-schema/api-schema.graphql', 'utf8');
+    const customSchema = readFileSync('api-schema/custom-api-schema.graphql', 'utf8');
+    const typeDefs = gql`${baseSchema} ${customSchema}`;
 
-    if(process.env.DISABLE_LOGGING){
-        console.info = function() {};
+    // Enable/disable debugging
+    if(process.env.DEBUG !== 'true'){
+        console.debug = function() {};
     }
 
-    server.listen().then(({ url }) => {
-        console.log(`GraphQL service ready at: ${url}`);
+    // Driver options
+    // Use environment variables to customize settings when starting the server
+    let args = {
+        'typeDefs': gql`${baseSchema}`,
+        'db_name': process.env.DB_NAME || 'spirit-db',
+        'url': process.env.URL || 'http://localhost:8529',
+        'drop': process.env.DROP === 'true',
+        'disableDirectivesChecking': process.env.DISABLE_DIRECTIVES_CHECKING === 'true',
+        'disableEdgeValidation': process.env.DISABLE_EDGE_VALIDATION === 'true'
+    };
+    await driver.init(args);
+
+    // Load base resolvers
+    const resolvers = await graphqlResolvers.get({
+        driver: driver
+    });
+    // Load custom resolvers
+    // Configure the get-request below if your custom resolvers require additional options
+    const customResolvers = await graphqlCustomResolvers.get({
+        driver: driver
     });
-}
 
-function main(){
-    run().then(() => {
-        err => console.error(err);
+    // Create instance of server and start listening
+    const server = new ApolloServer({
+        'typeDefs': typeDefs,
+        'resolvers': [
+            resolvers,
+            customResolvers
+        ]
+    });
+    server.listen().then(({ url }) => {
+        console.log(`GraphQL service ready at: ${url}`);
     });
 }
 
-main();
+// Run server
+run().then(() => { err => console.error(err); });