remove datalodaer (#567)

* remove datalodaer

* Fix typo

Author: mickhansen

README.md

@@ -5,6 +5,8 @@
 [![Slack](http://sequelize-slack.herokuapp.com/badge.svg)](http://sequelize-slack.herokuapp.com)
 [![Coverage](https://codecov.io/gh/mickhansen/graphql-sequelize/branch/master/graph/badge.svg)](https://codecov.io/gh/mickhansen/graphql-sequelize)
 
+Should be used with [dataloader-sequelize](https://github.com/mickhansen/dataloader-sequelize) to avoid N+1 queries
+
 - [Installation](#installation)
 - [Resolve helpers](#resolve-helpers)
 - [field helpers](#field-helpers)
@@ -32,8 +34,6 @@ Please take a look at [the tests](https://github.com/mickhansen/graphql-sequeliz
 - Automatically converts args to where if arg keys matches model attributes
 - Automatically converts an arg named 'limit' to a sequelize limit
 - Automatically converts an arg named 'order' to a sequelize order
-- Only loads the attributes defined in the query (automatically adds primary key and foreign keys)
-- Batching of nested associations (see [dataloader-sequelize](https://github.com/mickhansen/dataloader-sequelize))
 
 ### Relay & Connections
 
@@ -78,7 +78,18 @@ resolver(SequelizeModel, {
     result.sort(/* Custom sort function */);
     return result;
   },
+
+  /*
+   * Transfer fields from the graphql context to the options passed to model calls
+   * Inherits from global resolver.contextToOptions
+   */
+  contextToOptions: {
+    a: 'a',
+    b: 'c'
+  }
 });
+
+resolver.contextToOptions = {}; /* Set contextToOptions globally */
 ```
 
 _The `args` and `context` parameters are provided by GraphQL. More information

package.json

@@ -41,9 +41,8 @@
   },
   "homepage": "https://github.com/mickhansen/graphql-sequelize",
   "dependencies": {
-    "dataloader-sequelize": "^1.5.4",
-    "invariant": "2.2.1",
     "bluebird": "^3.4.0",
+    "invariant": "2.2.1",
     "lodash": "^4.0.0"
   },
   "peerDependencies": {

src/resolver.js

@@ -4,7 +4,6 @@ import argsToFindOptions from './argsToFindOptions';
 import { isConnection, handleConnection, nodeType } from './relay';
 import invariant from 'assert';
 import Promise from 'bluebird';
-import dataLoaderSequelize from 'dataloader-sequelize';
 
 function whereQueryVarsToValues(o, vals) {
   _.forEach(o, (v, k) => {
@@ -17,16 +16,13 @@ function whereQueryVarsToValues(o, vals) {
 }
 
 function resolverFactory(target, options = {}) {
-  if (options.dataLoader !== false) {
-    dataLoaderSequelize(target);
-  }
-
   var resolver
     , targetAttributes
     , isModel = !!target.getTableName
     , isAssociation = !!target.associationType
     , association = isAssociation && target
-    , model = isAssociation && target.target || isModel && target;
+    , model = isAssociation && target.target || isModel && target
+    , contextToOptions = _.assign({}, resolverFactory.contextToOptions, options.contextToOptions);
 
   targetAttributes = Object.keys(model.rawAttributes);
 
@@ -58,6 +54,10 @@ function resolverFactory(target, options = {}) {
     findOptions.logging = findOptions.logging || context.logging;
     findOptions.graphqlContext = context;
 
+    _.each(contextToOptions, (as, key) => {
+      findOptions[as] = context[key];
+    });
+
     return Promise.resolve(options.before(findOptions, args, context, info)).then(function (findOptions) {
       if (args.where && !_.isEmpty(info.variableValues)) {
         whereQueryVarsToValues(args.where, info.variableValues);
@@ -96,4 +96,6 @@ function resolverFactory(target, options = {}) {
   return resolver;
 }
 
+resolverFactory.contextToOptions = {};
+
 module.exports = resolverFactory;

test/integration/relay.test.js

@@ -567,9 +567,7 @@ describe('relay', function () {
           }
         }
       }
-    `, null, {
-      logging: sqlSpy
-    }).then(result => {
+    `, null).then(result => {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.project.users.edges).to.have.length(2);
@@ -584,8 +582,6 @@ describe('relay', function () {
       expect(userB).to.have.property('tasks');
       expect(userB.tasks.edges).to.have.length.above(0);
       expect(userB.tasks.edges[0].node.name).to.be.ok;
-
-      expect(sqlSpy).to.have.been.calledThrice;
     });
   });
 

test/integration/relay/connection.test.js

@@ -1034,14 +1034,10 @@ describe('relay', function () {
             }
           }
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null);
 
       if (result.errors) throw new Error(result.errors[0].stack);
 
-      expect(sqlSpy.callCount).to.equal(3);
-
       const nodeNames = result.data.user.projects.edges.map(edge => {
         return edge.node.tasks.edges.map(edge => {
           return edge.node.name;
@@ -1093,9 +1089,7 @@ describe('relay', function () {
             }
           }
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null);
 
       if (result.errors) throw new Error(result.errors[0].stack);
 
@@ -1108,13 +1102,9 @@ describe('relay', function () {
 
       expect(projects[0].tasks.edges[0].node.id).to.equal(toGlobalId(this.Task.name, this.userA.tasks[4].get('id')));
       expect(projects[1].tasks.edges[0].node.id).to.equal(toGlobalId(this.Task.name, this.userA.tasks[8].get('id')));
-
-      expect(sqlSpy.callCount).to.equal(3);
     });
 
     it('should support connection fields', async function () {
-      let sqlSpy = sinon.spy();
-
       let result = await graphql(this.schema, `
         {
           user(id: ${this.userA.id}) {
@@ -1123,9 +1113,7 @@ describe('relay', function () {
             }
           }
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null, {});
 
       if (result.errors) throw new Error(result.errors[0].stack);
 
@@ -1134,8 +1122,6 @@ describe('relay', function () {
     });
 
     it('should support connection fields on nested connections', async function () {
-      let sqlSpy = sinon.spy();
-
       let result = await graphql(this.schema, `
         {
           user(id: ${this.userA.id}) {
@@ -1150,9 +1136,7 @@ describe('relay', function () {
             }
           }
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null, {});
 
       if (result.errors) throw new Error(result.errors[0].stack);
 
@@ -1181,9 +1165,7 @@ describe('relay', function () {
         fragment projectOwner on userProjectEdge {
           isOwner
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null);
 
       if (result.errors) throw new Error(result.errors[0].stack);
 
@@ -1202,9 +1184,7 @@ describe('relay', function () {
             }
           }
         }
-      `, null, {
-        logging: sqlSpy
-      });
+      `, null, {});
 
       if (result.errors) throw new Error(result.errors[0].stack);
 

test/integration/resolver.test.js

@@ -210,7 +210,12 @@ describe('resolver', function () {
                 type: new GraphQLNonNull(GraphQLInt)
               }
             },
-            resolve: resolver(User)
+            resolve: resolver(User, {
+              contextToOptions: {
+                a: 'a',
+                b: 'c'
+              }
+            })
           },
           users: {
             type: new GraphQLList(userType),
@@ -325,6 +330,9 @@ describe('resolver', function () {
     });
   });
 
+  beforeEach(function () {
+    this.sandbox.spy(User, 'findOne');
+  });
   afterEach(function () {
     this.sandbox.restore();
   })
@@ -351,6 +359,31 @@ describe('resolver', function () {
     });
   });
 
+  it('should map context to find options', function () {
+    var user = this.userB;
+
+    return graphql(schema, `
+      {
+        user(id: ${user.id}) {
+          name
+          myVirtual
+        }
+      }
+    `, null, {a: 1, b: 2}).then(function (result) {
+      if (result.errors) throw new Error(result.errors[0].stack);
+
+      expect(result.data).to.deep.equal({
+        user: {
+          name: user.name,
+          myVirtual: 'lol'
+        }
+      });
+
+      expect(User.findOne.firstCall.args[0].a).to.equal(1);
+      expect(User.findOne.firstCall.args[0].c).to.equal(2);
+    });
+  });
+
   it('should resolve a plain result with an aliased field', function () {
     var user = this.userB;
 
@@ -641,17 +674,13 @@ describe('resolver', function () {
           }
         }
       }
-    `, null, {
-      logging: spy
-    }).then(function (result) {
+    `, null).then(function (result) {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.users).to.have.length(users.length);
       result.data.users.forEach(function (user) {
         expect(user.tasks).to.have.length.above(0);
       });
-
-      expect(spy).to.have.been.calledTwice;
     });
   });
 
@@ -744,9 +773,7 @@ describe('resolver', function () {
           }
         }
       }
-    `, null, {
-      logging: spy
-    }).then(function (result) {
+    `, null).then(function (result) {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.users).to.have.length(users.length);
@@ -757,8 +784,6 @@ describe('resolver', function () {
           expect(task.id).to.be.ok;
         });
       });
-
-      expect(spy).to.have.been.calledTwice;
     });
   });
 
@@ -892,9 +917,7 @@ describe('resolver', function () {
           }
         }
       }
-    `, null, {
-      logging: sqlSpy
-    }).then(function (result) {
+    `, null).then(function (result) {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.users.length).to.equal(users.length);
@@ -904,8 +927,6 @@ describe('resolver', function () {
           expect(task.project.name).to.be.ok;
         });
       });
-
-      expect(sqlSpy.callCount).to.equal(3);
     });
   });
 
@@ -924,9 +945,7 @@ describe('resolver', function () {
           }
         }
       }
-    `, null, {
-      logging: sqlSpy
-    }).then(function (result) {
+    `, null).then(function (result) {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.users.length).to.equal(users.length);
@@ -936,8 +955,6 @@ describe('resolver', function () {
           expect(task.project.name).to.be.ok;
         });
       });
-
-      expect(sqlSpy.callCount).to.equal(3);
     });
   });
 
@@ -960,9 +977,7 @@ describe('resolver', function () {
           }
         }
       }
-    `, null, {
-      logging: sqlSpy
-    }).then(function (result) {
+    `, null).then(function (result) {
       if (result.errors) throw new Error(result.errors[0].stack);
 
       expect(result.data.users.length).to.equal(users.length);
@@ -977,8 +992,6 @@ describe('resolver', function () {
           });
         });
       });
-
-      expect(sqlSpy.callCount).to.equal(4);
     });
   });
 

test/support/helper.js

@@ -1,13 +1,8 @@
-import { resetCache } from 'dataloader-sequelize';
 import Sequelize from 'sequelize';
 
 export const Promise = Sequelize.Promise;
 export const sequelize = createSequelize();
 
-if (typeof afterEach !== 'undefined') {
-  afterEach(resetCache);
-}
-
 export function createSequelize(options = {}) {
   const env = process.env;
   const dialect = env.DIALECT || 'sqlite';

test/unit/relay/connection.test.js

@@ -78,7 +78,9 @@ describe('relay', function () {
         id: Math.ceil(Math.random() * 999)
       });
 
-      this.sinon.stub(this.Task, 'findAll').resolves([this.Task.build()]);
+      const task = this.Task.build();
+      task.dataValues.full_count = Math.random() * 999;
+      this.sinon.stub(this.Task, 'findAll').resolves([task]);
       this.sinon.stub(this.User, 'findById').resolves(this.User.build());
     });
 
@@ -131,7 +133,7 @@ describe('relay', function () {
           }
         }),
         sinon.match({
-          ast: sinon.match.any
+          path: sinon.match.any
         })
       );