Merge pull request #76 from cult-of-coders/feature/extend-arguments-m…

…orpher

[R] Added access to all arguments from GraphQL resolvers

__tests__/morpher/bootstrap.js

@@ -0,0 +1,15 @@
+import { expose, db } from "meteor/cultofcoders:apollo";
+import { Mongo } from "meteor/mongo";
+
+export const TestCollection = new Mongo.Collection("tests");
+
+expose({
+  users: {
+    type: "User",
+    collection: () => db.users,
+    update: () => true,
+    insert: () => true,
+    remove: () => true,
+    find: () => true
+  }
+});

__tests__/morpher/server.js

@@ -1,12 +1,84 @@
-import { expose, db } from 'meteor/cultofcoders:apollo';
-
-expose({
-  users: {
-    type: 'User',
-    collection: () => db.users,
-    update: () => true,
-    insert: () => true,
-    remove: () => true,
-    find: () => true,
-  },
+import "./bootstrap";
+import { db } from "meteor/cultofcoders:apollo";
+import setupMutations from "../../server/morpher/setupMutations";
+import setupDataFetching from "../../server/morpher/setupDataFetching";
+import { assert } from "chai";
+
+describe("Unit tests", () => {
+  it("Should send all the right args to the config functions", () => {
+    const testRest = [
+      {},
+      {
+        payload: JSON.stringify({
+          document: { a: 1 },
+          selector: {},
+          modifier: {}
+        })
+      },
+      {},
+      {}
+    ];
+
+    const checkArray = rest => {
+      assert.equal(4, rest.length);
+
+      for (let i = 0; i < testRest.length; i++) {
+        if (i === 1) {
+          continue;
+        }
+        assert.strictEqual(testRest[i], rest[i]);
+      }
+
+      // assert.equal(rest[1], {});
+    };
+
+    let count = 0;
+
+    const { Mutation } = setupMutations(
+      {
+        insert(ctx, special, ...rest) {
+          checkArray(rest);
+          count++;
+        },
+        update(ctx, special, ...rest) {
+          checkArray(rest);
+          count++;
+        },
+        remove(ctx, special, ...rest) {
+          checkArray(rest);
+          count++;
+        }
+      },
+      "test",
+      "TestEntity",
+      () => db.tests
+    );
+
+    const { Query } = setupDataFetching(
+      {
+        find(ctx, special, ...rest) {
+          count++;
+          checkArray(rest);
+        }
+      },
+      "test",
+      "TestEntity",
+      () => db.tests
+    );
+
+    const safeRun = fn => {
+      try {
+        fn();
+      } catch (e) {}
+    };
+    safeRun(() => Mutation.testInsert(...testRest));
+    safeRun(() => Mutation.testUpdate(...testRest));
+    safeRun(() => Mutation.testRemove(...testRest));
+
+    safeRun(() => Query.test(...testRest));
+    safeRun(() => Query.testSingle(...testRest));
+    safeRun(() => Query.testCount(...testRest));
+
+    assert.equal(count, 6);
+  });
 });

docs/morpher.md

@@ -20,10 +20,11 @@ expose({
     collection: () => collection,
     // In the mutation methods you can perform propper checks, you get access to the context
     // You have ability to extract user from ctx `ctx.userId` or `ctx.user`
-    update: (ctx, {selector, modifier, modifiedFields, modifiedTopLevelFields}) => true,
-    insert: (ctx, {document}) => true,
-    remove: (ctx, {selector}) => true,
-    find(ctx, params) {
+    // GRAPHQL_RESOLVER_ARGS = [ parent, args, ctx, ast ]
+    update: (ctx, {selector, modifier, modifiedFields, modifiedTopLevelFields}, ...GRAPHQL_RESOLVER_ARGS) => true,
+    insert: (ctx, {document}, ...GRAPHQL_RESOLVER_ARGS) => true,
+    remove: (ctx, {selector}, ...GRAPHQL_RESOLVER_ARGS) => true,
+    find(ctx, params, ...GRAPHQL_RESOLVER_ARGS) {
       // params is an object
       // by default filters, options are always empty objects, if they were not passed
       // if you pass other params filters and options will still be empty objects
@@ -52,7 +53,7 @@ expose({
 
 ```js
 // Then on the client
-import db, { setClient } from 'apollo-morpher';
+import db, { setClient } from "apollo-morpher";
 
 // Set your Apollo client
 setClient(apolloClient);
@@ -67,31 +68,31 @@ const fields = {
   firstName: 1,
   lastName: 1,
   lastInvoices: {
-    total: 1,
-  },
+    total: 1
+  }
 };
 
 // Or you could also define the fields in GraphQL style `firstName`
 
 db.users
   .find(fields, {
     filters: {},
-    options: {},
+    options: {}
   })
   .then(users => {});
 
 // find equivallent .findOne()
 db.users
   .findOne(fields, {
-    filters: { _id: 'XXX' },
+    filters: { _id: "XXX" }
   })
   .then(user => {});
 
 // and for pagination purposes to retrieve the count
 db.users
   .count({
     filters,
-    options,
+    options
   })
   .then(count => {});
 ```

package.js

@@ -1,49 +1,49 @@
 Package.describe({
-  name: 'cultofcoders:apollo',
-  version: '0.9.3',
+  name: "cultofcoders:apollo",
+  version: "0.9.3",
   // Brief, one-line summary of the package.
-  summary: 'Meteor & Apollo integration',
+  summary: "Meteor & Apollo integration",
   // URL to the Git repository containing the source code for this package.
-  git: 'https://github.com/cult-of-coders/apollo.git',
+  git: "https://github.com/cult-of-coders/apollo.git",
   // By default, Meteor will default to using README.md for documentation.
   // To avoid submitting documentation, set this field to null.
-  documentation: 'README.md',
+  documentation: "README.md"
 });
 
 Package.onUse(function(api) {
-  api.versionsFrom('1.3');
-  api.use('ecmascript');
-  api.use('check');
-  api.use('ejson');
-  api.use('mongo');
-
-  api.use('tmeasday:check-npm-versions@0.3.2');
-  api.use('cultofcoders:grapher@1.3.13');
-  api.use('cultofcoders:grapher-schema-directives@0.1.8');
-  api.use('accounts-base', { weak: true });
-
-  api.mainModule('client/index.js', 'client');
-  api.mainModule('server/index.js', 'server');
+  api.versionsFrom("1.3");
+  api.use("ecmascript");
+  api.use("check");
+  api.use("ejson");
+  api.use("mongo");
+
+  api.use("tmeasday:check-npm-versions@0.3.2");
+  api.use("cultofcoders:grapher@1.3.13");
+  api.use("cultofcoders:grapher-schema-directives@0.1.8");
+  api.use("accounts-base", { weak: true });
+
+  api.mainModule("client/index.js", "client");
+  api.mainModule("server/index.js", "server");
 });
 
 Npm.depends({
-  cookie: '0.4.0',
+  cookie: "0.4.0"
 });
 
 Package.onTest(function(api) {
-  api.use('cultofcoders:apollo');
+  api.use("cultofcoders:apollo");
 
   var packages = [
-    'ecmascript',
-    'accounts-password',
-    'cultofcoders:apollo-accounts@3.4.0',
-    'mongo',
+    "ecmascript",
+    "accounts-password",
+    "cultofcoders:apollo-accounts@3.4.0",
+    "mongo"
   ];
 
-  api.use(['meteortesting:mocha']);
+  api.use(["meteortesting:mocha"]);
 
   api.use(packages);
 
-  api.mainModule('__tests__/server.js', 'server');
-  api.mainModule('__tests__/client.js', 'client');
+  api.mainModule("__tests__/server.js", "server");
+  api.mainModule("__tests__/client.js", "client");
 });

server/morpher/setupDataFetching.js

@@ -1,5 +1,5 @@
-import { EJSON } from 'meteor/ejson';
-import { DOCUMENTATION_FETCH } from './docs';
+import { EJSON } from "meteor/ejson";
+import { DOCUMENTATION_FETCH } from "./docs";
 
 export default function setupDataFetching(config, name, type, collection) {
   let Query = {};
@@ -25,25 +25,33 @@ export default function setupDataFetching(config, name, type, collection) {
   const resolveSelectors = (_, { params }, ctx, ast) => {
     let astToQueryOptions;
 
-    if (typeof config.find === 'function') {
+    if (typeof config.find === "function") {
       params = Object.assign(
         {
           filters: {},
-          options: {},
+          options: {}
         },
         params
       );
 
-      let astToQueryOptions = config.find.call(null, ctx, params, ast);
+      let astToQueryOptions = config.find.call(
+        null,
+        ctx,
+        params,
+        _,
+        { params },
+        ctx,
+        ast
+      );
       if (astToQueryOptions === false) {
-        throw new Error('Unauthorized');
+        throw new Error("Unauthorized");
       }
     }
 
     if (astToQueryOptions === undefined || astToQueryOptions === true) {
       astToQueryOptions = {
         $filters: params.filters || {},
-        $options: params.options || {},
+        $options: params.options || {}
       };
     }
 
@@ -61,18 +69,18 @@ export default function setupDataFetching(config, name, type, collection) {
 
   Query = {
     [name]: fn,
-    [name + 'Count'](_, { payload }, ctx, ast) {
+    [name + "Count"](_, { payload }, ctx, ast) {
       const params = EJSON.parse(payload);
       const astToQueryOptions = resolveSelectors(_, { params }, ctx, ast);
 
       return collection()
         .find(astToQueryOptions.$filters || {})
         .count();
     },
-    [name + 'Single'](_, args, ctx, ast) {
+    [name + "Single"](_, args, ctx, ast) {
       const result = fn.call(null, _, args, ctx, ast);
       return result[0] || null;
-    },
+    }
   };
 
   /**