Added typeStorage. If you create resolver in second time, it should reuse existed internal types.

Author: nodkz

src/__tests__/typeStorage-test.js

@@ -0,0 +1,39 @@
+import { expect } from 'chai';
+import typeStorage from '../typeStorage';
+
+describe('typeStorage', () => {
+  it('should be instance of Map', () => {
+    expect(typeStorage).instanceof(Map);
+  });
+
+  it('should work `get`, `set`, `has`, `clear` methods and `size` property', () => {
+    typeStorage.clear();
+    expect(typeStorage.size).to.equal(0);
+    typeStorage.set(123, 567);
+    expect(typeStorage.get(123)).to.equal(567);
+    expect(typeStorage.has(123)).to.be.true;
+    expect(typeStorage.size).to.equal(1);
+    typeStorage.clear();
+    expect(typeStorage.size).to.equal(0);
+  });
+
+  describe('getOrSet() method', () => {
+    it('should return existed value', () => {
+      typeStorage.clear();
+      typeStorage.set(123, 456);
+      expect(typeStorage.getOrSet(123, 'any')).to.equal(456);
+    });
+
+    it('should set new value and return it, if key not exists', () => {
+      typeStorage.clear();
+      expect(typeStorage.getOrSet(123, 456)).to.equal(456);
+      expect(typeStorage.get(123)).to.equal(456);
+    });
+
+    it('should not set new value if it is empty', () => {
+      typeStorage.clear();
+      expect(typeStorage.getOrSet(123, null)).to.equal(null);
+      expect(typeStorage.has(123)).to.be.false;
+    });
+  });
+});

src/composeWithMongoose.js

@@ -32,7 +32,6 @@ export function composeWithMongoose(
     prepareFields(typeComposer, opts.fields);
   }
 
-  // $FlowFixMe
   typeComposer.setRecordIdFn(source => (source ? `${source._id}` : ''));
 
   createInputType(typeComposer, opts.inputType);

src/index.js

@@ -1,7 +1,11 @@
 /* @flow */
 
 import { composeWithMongoose } from './composeWithMongoose';
+import typeStorage from './typeStorage';
 
 export default composeWithMongoose;
 
 export * from './fieldsConverter';
+export {
+  typeStorage as mongooseTypeStorage,
+};

src/resolvers/__tests__/createOne-test.js

@@ -7,6 +7,7 @@ import { Resolver, TypeComposer } from 'graphql-compose';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import GraphQLMongoID from '../../types/mongoid';
 import { GraphQLNonNull } from 'graphql';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -17,6 +18,10 @@ describe('createOne() ->', () => {
     });
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   it('should return Resolver object', () => {
     const resolver = createOne(UserModel, UserTypeComposer);
     expect(resolver).to.be.instanceof(Resolver);
@@ -103,5 +108,12 @@ describe('createOne() ->', () => {
       const recordField = new TypeComposer(outputType).getField('record');
       expect(recordField).property('type').to.equal(UserTypeComposer.getType());
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `CreateOne${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = createOne(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/removeById-test.js

@@ -7,6 +7,7 @@ import { Resolver, TypeComposer } from 'graphql-compose';
 import { GraphQLNonNull } from 'graphql';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -19,6 +20,10 @@ describe('removeById() ->', () => {
     });
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   beforeEach('add test user document to mongoDB', () => {
     user = new UserModel({
       name: 'userName1',
@@ -122,5 +127,12 @@ describe('removeById() ->', () => {
       expect(typeComposer.hasField('record')).to.be.true;
       expect(typeComposer.getField('record').type).to.equal(UserTypeComposer.getType());
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `RemoveById${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = removeById(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/removeMany-test.js

@@ -7,6 +7,7 @@ import Resolver from 'graphql-compose/lib/resolver/resolver';
 import TypeComposer from 'graphql-compose/lib/typeComposer';
 import { GraphQLInt, GraphQLNonNull } from 'graphql';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -15,6 +16,10 @@ describe('removeMany() ->', () => {
   let user2;
   let user3;
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   beforeEach('clear UserModel collection', (done) => {
     UserModel.collection.drop(() => {
       done();
@@ -126,5 +131,12 @@ describe('removeMany() ->', () => {
       const numAffectedField = new TypeComposer(outputType).getField('numAffected');
       expect(numAffectedField).property('type').to.equal(GraphQLInt);
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `RemoveMany${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = removeMany(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/removeOne-test.js

@@ -7,6 +7,7 @@ import { Resolver, TypeComposer } from 'graphql-compose';
 import GraphQLMongoID from '../../types/mongoid';
 import { mongoose } from '../../__mocks__/mongooseCommon';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -21,6 +22,10 @@ describe('removeOne() ->', () => {
     });
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   beforeEach('add test user document to mongoDB', () => {
     user1 = new UserModel({
       name: 'userName1',
@@ -151,5 +156,12 @@ describe('removeOne() ->', () => {
       const recordField = new TypeComposer(outputType).getField('record');
       expect(recordField).property('type').to.equal(UserTypeComposer.getType());
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `RemoveOne${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = removeOne(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/updateById-test.js

@@ -11,6 +11,7 @@ import {
 } from 'graphql';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -45,6 +46,10 @@ describe('updateById() ->', () => {
     ]);
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   it('should return Resolver object', () => {
     const resolver = updateById(UserModel, UserTypeComposer);
     expect(resolver).to.be.instanceof(Resolver);
@@ -146,5 +151,12 @@ describe('updateById() ->', () => {
       expect(typeComposer.hasField('record')).to.be.true;
       expect(typeComposer.getField('record').type).to.equal(UserTypeComposer.getType());
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `UpdateById${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = updateById(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/updateMany-test.js

@@ -6,6 +6,7 @@ import updateMany from '../updateMany';
 import { Resolver, TypeComposer } from 'graphql-compose';
 import { GraphQLInt, GraphQLNonNull } from 'graphql';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -41,6 +42,10 @@ describe('updateMany() ->', () => {
     ]);
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   it('should return Resolver object', () => {
     const resolver = updateMany(UserModel, UserTypeComposer);
     expect(resolver).to.be.instanceof(Resolver);
@@ -124,5 +129,12 @@ describe('updateMany() ->', () => {
       const numAffectedField = new TypeComposer(outputType).getField('numAffected');
       expect(numAffectedField).property('type').to.equal(GraphQLInt);
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `UpdateMany${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = updateMany(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });

src/resolvers/__tests__/updateOne-test.js

@@ -7,6 +7,7 @@ import { Resolver, TypeComposer } from 'graphql-compose';
 import GraphQLMongoID from '../../types/mongoid';
 import { GraphQLNonNull } from 'graphql';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
 const UserTypeComposer = composeWithMongoose(UserModel);
 
@@ -41,6 +42,10 @@ describe('updateOne() ->', () => {
     ]);
   });
 
+  beforeEach(() => {
+    typeStorage.clear();
+  });
+
   it('should return Resolver object', () => {
     const resolver = updateOne(UserModel, UserTypeComposer);
     expect(resolver).to.be.instanceof(Resolver);
@@ -172,5 +177,12 @@ describe('updateOne() ->', () => {
       const recordField = new TypeComposer(outputType).getField('record');
       expect(recordField).property('type').to.equal(UserTypeComposer.getType());
     });
+
+    it('should reuse existed outputType', () => {
+      const outputTypeName = `UpdateOne${UserTypeComposer.getTypeName()}Payload`;
+      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const outputType = updateOne(UserModel, UserTypeComposer).getOutputType();
+      expect(outputType).to.equal('EXISTED_TYPE');
+    });
   });
 });