removed memoize directive since not sure when this would be optional anyway

Author: tlivings

Diff for: .gitignore

@@ -85,6 +85,3 @@ Thumbs.db
 .Spotlight-V100
 .Trashes
 package-lock.json
-
-examples2
-examples3

Diff for: .npmrc

@@ -0,0 +1 @@
+package-lock=false

Diff for: README.md

@@ -2,11 +2,13 @@
 
 Reference implementation around the concept of a partial schema / component similar to that discussed [here](https://medium.com/homeaway-tech-blog/distributed-graphql-schema-development-npm-modules-d734a3cb6f12).
 
-This is very similar to the excellent `graphql-modules` project — but closer to our own internal paradigm already in use for over a year and a half and adds some missing features such as `exclude` from `imports`.
+This is very similar to the excellent `graphql-modules` project — but a little closer to our own internal paradigm already in use for over a year and a half and adds some features such as `exclude` root types from `imports` and memoize resolvers.
+
+In fact, this module utilizes the `graphql-toolkit` developed by the `graphql-modules` team to merge types and resolvers.
 
 ### The future
 
-For now it is alpha and experimental.
+Experimental / alpha for now.
 
 ### Repository structure
 
@@ -31,11 +33,11 @@ To intercept resolvers with mocks execute this app with `GRAPHQL_DEBUG=1` enable
 # Usage
 
 ```javascript
-new GraphQLComponent({ 
+new GraphQLComponent({
   // A string or array of strings representing typeDefs and rootTypes
   types,
   // An object containing resolver functions
-  resolvers, 
+  resolvers,
   // An optional object containing resolver dev/test fixtures
   mocks,
   // An optional array of imported components for the schema to be merged with
@@ -58,7 +60,7 @@ This will create an instance object of a component containing the following func
 
 ### Encapsulating state
 
-Typically the best way to make a re-useable component will be to extend `GraphQLComponent`. 
+Typically the best way to make a re-useable component will be to extend `GraphQLComponent`.
 
 ```javascript
 const GraphQLComponent = require('graphql-component');
@@ -77,7 +79,7 @@ module.exports = PropertyComponent;
 
 This will allow for configuration (in this example, `useMocks` and `preserveTypeResolvers`) as well as instance data per component (such as data base clients, etc).
 
-### Aggregation 
+### Aggregation
 
 Example to merge multiple components:
 
@@ -116,20 +118,6 @@ const { schema, context } = new GraphQLComponent({
 
 This will keep from leaking unintended surface area.
 
-### Resolver memoization
-
-Schemas in graphql components will support the `@memoize` directive. This will allow resolvers to be memoized within the 
-scope of a particular request context to reduce the number of times a resolver must run for the same data.
-
-Example:
-
-```graphql
-type Query {
-  # Seach for an author by id.
-  author(id: ID!, version: String) : Author @memoize
-}
-```
-
 ### Adding to context
 
 Example context argument:
@@ -161,6 +149,6 @@ Using `context` now in `apollo-server-hapi` for example, will transform the cont
 
 ### Mocks
 
-graphql-component accepts mocks in much the same way that Apollo does but with one difference. 
+graphql-component accepts mocks in much the same way that Apollo does but with one difference.
 
-Instead of accepting a mocks object, it accepts `(importedMocks) => mocksObject` argument. This allows components to utilize the mocks from other imported components easily.
+Instead of accepting a mocks object, it accepts `(importedMocks) => mocksObject` argument. This allows components to utilize the mocks from other imported components easily.

Diff for: lib/index.js

@@ -3,32 +3,32 @@
 const GraphQLTools = require('graphql-tools');
 const GraphQLToolkit = require('graphql-toolkit');
 const Resolvers = require('./resolvers');
-//const { MemoizeDirective } = require('./memoize');
 const Context = require('./context');
 const Types = require('./types');
 const Merge = require('./merge');
+
 const debug = require('debug')('graphql-component:schema');
 
 class GraphQLComponent {
-  constructor({ 
-    types = [], 
-    resolvers = {}, 
-    imports = [], 
-    mocks = () => ({}), 
-    directives = {}, 
-    context = {}, 
+  constructor({
+    types = [],
+    resolvers = {},
+    imports = [],
+    mocks = () => ({}),
+    directives = {},
+    context = {},
     useMocks = false,
     preserveTypeResolvers = false
   } = {}) {
     debug(`creating component`);
 
     this._types = Array.isArray(types) ? types : [types];
-    
+
     this._resolvers = Resolvers.wrapResolvers(this, resolvers);
-  
+
     this._imports = [];
-    
-    this._directives = Object.assign({}, directives/*not doing this as a directive right now, { memoize: MemoizeDirective }*/);
+
+    this._directives = directives;
 
     this._context = Context.builder(this, context);
 
@@ -39,7 +39,7 @@ class GraphQLComponent {
       if (GraphQLComponent.isComponent(imp)) {
         importedTypes.push(...Types.getImportedTypes(imp));
         importedResolvers.push(Resolvers.getImportedResolvers(imp));
-        this._imports.push(imp); 
+        this._imports.push(imp);
         continue;
       }
 
@@ -55,10 +55,10 @@ class GraphQLComponent {
         importedTypes.push(...Types.getImportedTypes(imp.component, excludes));
         importedResolvers.push(Resolvers.transformResolvers(Resolvers.getImportedResolvers(imp.component), excludes));
       }
-      
+
       this._imports.push(imp.component);
     }
-    
+
     this._importedTypes = importedTypes;
     this._importedResolvers = GraphQLToolkit.mergeResolvers(importedResolvers);
 
@@ -87,7 +87,7 @@ class GraphQLComponent {
 
     if (this._useMocks) {
       debug(`adding mocks, preserveTypeResolvers=${this._preserveTypeResolvers}`);
-      
+
       const mocks = Object.assign({}, this._importedMocks, this._mocks);
 
       GraphQLTools.addMockFunctionsToSchema({ schema, mocks, preserveTypeResolvers: this._preserveTypeResolvers });
@@ -109,4 +109,4 @@ class GraphQLComponent {
   }
 }
 
-module.exports = GraphQLComponent;
+module.exports = GraphQLComponent;

Diff for: lib/memoize.js

@@ -15,4 +15,4 @@ const mergeResolvers = function (resolvers = {}, merge = {}) {
   return merged;
 };
 
-module.exports = { mergeResolvers };
+module.exports = { mergeResolvers };

Diff for: lib/merge.js

@@ -1,9 +1,40 @@
 'use strict';
 
 const Merge = require('./merge');
-const { memoize } = require('./memoize');
+
 const debug = require('debug')('graphql-component:resolver');
 
+const memoize = function (parentType, fieldName, resolve) {
+  const _cache = new WeakMap();
+
+  return function (_, args, context, info ) {
+    const key = JSON.stringify(args);
+
+    debug(`executing ${parentType}.${fieldName}`);
+
+    let cached = _cache.get(context);
+
+    if (cached && cached[key]) {
+      debug(`return cached result of memoized ${parentType}.${fieldName}`);
+      return cached[key];
+    }
+
+    if (!cached) {
+      cached = {};
+    }
+
+    const result = resolve(_, args, context, info);
+
+    cached[key] = result;
+
+    _cache.set(context, cached);
+
+    debug(`cached ${parentType}.${fieldName}`);
+
+    return result;
+  };
+};
+
 const transformResolvers = function (resolvers, excludes) {
   const filteredResolvers = Object.assign({}, resolvers);
 
@@ -36,7 +67,7 @@ const wrapResolvers = function (bind, resolvers = {}) {
       }
       if (['Query', 'Mutation', 'Subscription'].indexOf(name) > -1) {
         debug(`memoized ${name}.${resolverName}`);
-        wrapped[name][resolverName] = memoize(resolverName, func.bind(bind));
+        wrapped[name][resolverName] = memoize(name, resolverName, func.bind(bind));
         continue;
       }
       wrapped[name][resolverName] = func.bind(bind);
@@ -64,4 +95,4 @@ const getImportedResolvers = function (imp) {
   return importedResolvers;
 };
 
-module.exports = { transformResolvers, wrapResolvers, getImportedResolvers };
+module.exports = { memoize, transformResolvers, wrapResolvers, getImportedResolvers };

Diff for: lib/resolvers.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const Gql = require('graphql-tag');
+
 const debug = require('debug')('graphql-component:types');
 
 const check = function (operation, fieldName, excludes) {
@@ -43,4 +44,4 @@ const getImportedTypes = function (component, excludes) {
   return exclude([...types, ...importedTypes], excludes);
 };
 
-module.exports = { exclude, check, getImportedTypes };
+module.exports = { exclude, check, getImportedTypes };

Diff for: lib/types.js

@@ -1,6 +1,6 @@
 {
   "name": "graphql-component",
-  "version": "0.0.1-alpha.15",
+  "version": "0.0.1-alpha.16",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

Diff for: package.json

@@ -12,9 +12,9 @@ class ListingComponent extends GraphQLComponent {
     const propertyComponent = new Property();
     const reviewsComponent = new Reviews();
 
-    super ({ 
-      types: Types, 
-      resolvers: Resolvers, 
+    super ({
+      types: Types,
+      resolvers: Resolvers,
       mocks: Mocks,
       imports: [
         {
@@ -36,4 +36,4 @@ class ListingComponent extends GraphQLComponent {
   }
 }
 
-module.exports = ListingComponent;
+module.exports = ListingComponent;

Diff for: test/examples/example-listing/listing-component/index.js

@@ -11,7 +11,7 @@ const mocks = (importedMocks) => {
         importedMocks.Review()
       ]
     })
-  }
+  };
 };
 
 module.exports = mocks;