fix(Flowtype): Resolve Flow errors in tests and fix some definitions

Author: nodkz

.flowconfig

@@ -1,6 +1,4 @@
 [ignore]
-.*/__tests__/.*
-.*/__mocks__/.*
 .*/coverage/.*
 .*/resources/.*
 <PROJECT_ROOT>/lib/.*
@@ -44,5 +42,3 @@
 esproposal.class_instance_fields=enable
 suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
 unsafe.enable_getters_and_setters=true
-
-[version]

package.json

@@ -27,9 +27,8 @@
     "object-path": "^0.11.4"
   },
   "peerDependencies": {
-    "graphql": ">=0.7.1 || >=0.8.0 || >=0.9.0",
-    "graphql-compose": ">=1.20.1",
-    "graphql-compose-connection": ">=2.2.0",
+    "graphql-compose": ">=1.20.3",
+    "graphql-compose-connection": ">=2.2.1",
     "mongoose": ">=4.0.0"
   },
   "devDependencies": {
@@ -49,8 +48,8 @@
     "eslint-plugin-prettier": "^2.1.1",
     "flow-bin": "^0.47.0",
     "graphql": "^0.10.1",
-    "graphql-compose": "^1.20.1",
-    "graphql-compose-connection": "^2.2.0",
+    "graphql-compose": "^1.20.3",
+    "graphql-compose-connection": "^2.2.1",
     "jest": "^20.0.4",
     "mongodb-memory-server": "^1.1.2",
     "mongoose": "^4.10.4",
@@ -76,9 +75,10 @@
     "lint": "eslint src test *.js",
     "test": "jest",
     "watch": "jest --watch",
-    "all": "npm run test && npm run lint && ./node_modules/.bin/flow",
-    "link": "yarn build && yarn link graphql && yarn link graphql-compose && yarn link graphql-compose-connection && yarn link mongoose && yarn link",
-    "unlink": "yarn unlink graphql && yarn unlink graphql-compose && yarn unlink graphql-compose-connection && yarn unlink mongoose && yarn add graphql graphql-compose graphql-compose-connection mongoose",
+    "flow": "./node_modules/.bin/flow stop && ./node_modules/.bin/flow",
+    "all": "npm run test && npm run lint && npm run flow",
+    "link": "yarn build && yarn link graphql-compose && yarn link graphql-compose-connection && yarn link mongoose && yarn link",
+    "unlink": "yarn unlink graphql-compose && yarn unlink graphql-compose-connection && yarn unlink mongoose && yarn add graphql-compose graphql-compose-connection mongoose --dev",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   }
 }

src/__tests__/composeWithMongoose-test.js

@@ -170,6 +170,7 @@ describe('composeWithMongoose ->', () => {
         },
       });
       const filterArgInFindOne = typeComposer.getResolver('findOne').getArg('filter');
+      // $FlowFixMe
       const inputConposer = new InputTypeComposer(filterArgInFindOne.type);
       expect(inputConposer.isRequired('age')).toBe(true);
     });

src/__tests__/fieldConverter-test.js

@@ -45,9 +45,11 @@ describe('fieldConverter', () => {
 
     it('should throw Exception, if model does `schema.path` property', () => {
       expect(() => {
+        // $FlowFixMe
         getFieldsFromModel({ a: 1 });
       }).toThrowError(/incorrect mongoose model/);
       expect(() => {
+        // $FlowFixMe
         getFieldsFromModel({ schema: {} });
       }).toThrowError(/incorrect mongoose model/);
     });
@@ -57,15 +59,19 @@ describe('fieldConverter', () => {
     it('should throw error on incorrect mongoose field', () => {
       const err = /incorrect mongoose field/;
       expect(() => {
+        // $FlowFixMe
         deriveComplexType();
       }).toThrowError(err);
       expect(() => {
+        // $FlowFixMe
         deriveComplexType(123);
       }).toThrowError(err);
       expect(() => {
+        // $FlowFixMe
         deriveComplexType({ a: 1 });
       }).toThrowError(err);
       expect(() => {
+        // $FlowFixMe
         deriveComplexType({ path: 'name' });
       }).toThrowError(err);
       expect(() => {
@@ -90,7 +96,9 @@ describe('fieldConverter', () => {
 
     it('schould derive ENUM', () => {
       expect(deriveComplexType(fields.gender)).toBe(ComplexTypes.ENUM);
+      // $FlowFixMe
       expect(deriveComplexType(fields.languages.schema.paths.ln)).toBe(ComplexTypes.ENUM);
+      // $FlowFixMe
       expect(deriveComplexType(fields.languages.schema.paths.sk)).toBe(ComplexTypes.ENUM);
     });
 
@@ -146,6 +154,7 @@ describe('fieldConverter', () => {
 
     it('should has string in ofType', () => {
       const skillsType = arrayToGraphQL(fields.skills);
+      // $FlowFixMe
       expect(skillsType.ofType.name).toBe('String');
     });
   });
@@ -163,7 +172,9 @@ describe('fieldConverter', () => {
 
     it('should pass all enum values to GQ type', () => {
       const genderEnum = enumToGraphQL(fields.gender);
+      // $FlowFixMe
       expect(genderEnum._values.length).toBe(fields.gender.enumValues.length);
+      // $FlowFixMe
       expect(genderEnum._values[0].value).toBe(fields.gender.enumValues[0]);
     });
   });
@@ -176,6 +187,7 @@ describe('fieldConverter', () => {
 
     it('should have embedded fields', () => {
       const embeddedType = embeddedToGraphQL(fields.contacts);
+      // $FlowFixMe
       const embeddedFields = embeddedType._typeConfig.fields();
       expect(embeddedFields.email).toBeTruthy();
       expect(embeddedFields.locationId).toBeTruthy();
@@ -211,6 +223,7 @@ describe('fieldConverter', () => {
         }
       }`
       );
+      // $FlowFixMe
       expect(result.data.user).toEqual({
         name: 'Test empty subDoc',
         subDoc: null,
@@ -253,6 +266,7 @@ describe('fieldConverter', () => {
         }
       }`
       );
+      // $FlowFixMe
       expect(result2.data.user).toEqual({
         name: 'Test non empty subDoc',
         subDoc: {
@@ -265,6 +279,7 @@ describe('fieldConverter', () => {
 
   describe('documentArrayToGraphQL()', () => {
     const languagesType = documentArrayToGraphQL(fields.languages);
+    // $FlowFixMe
     const languagesFields = languagesType.ofType._typeConfig.fields();
 
     it('should produce GraphQLList', () => {
@@ -273,6 +288,7 @@ describe('fieldConverter', () => {
 
     it('should has Language type in ofType', () => {
       // see src/__mocks__/languageSchema.js where type name `Language` is defined
+      // $FlowFixMe
       expect(languagesType.ofType.name).toBe('Language');
     });
 
@@ -323,7 +339,9 @@ describe('fieldConverter', () => {
         }
       }`;
       const result = await graphql.graphql(schema, query);
+      // $FlowFixMe
       expect(result.data.user.name).toBe(user.name);
+      // $FlowFixMe
       expect(result.data.user.someDynamic).toEqual(user.someDynamic);
     });
   });

src/__tests__/typeStorage-test.js

@@ -21,20 +21,20 @@ describe('typeStorage', () => {
   describe('getOrSet() method', () => {
     it('should return existed value', () => {
       typeStorage.clear();
-      typeStorage.set(123, 456);
-      expect(typeStorage.getOrSet(123, 'any')).toBe(456);
+      typeStorage.set('Type1', 456);
+      expect(typeStorage.getOrSet('Type1', 'any')).toBe(456);
     });
 
     it('should set new value and return it, if key not exists', () => {
       typeStorage.clear();
-      expect(typeStorage.getOrSet(123, 456)).toBe(456);
-      expect(typeStorage.get(123)).toBe(456);
+      expect(typeStorage.getOrSet('Type2', 456)).toBe(456);
+      expect(typeStorage.get('Type2')).toBe(456);
     });
 
     it('should not set new value if it is empty', () => {
       typeStorage.clear();
-      expect(typeStorage.getOrSet(123, null)).toBe(null);
-      expect(typeStorage.has(123)).toBe(false);
+      expect(typeStorage.getOrSet('Type3', null)).toBe(null);
+      expect(typeStorage.has('Type3')).toBe(false);
     });
   });
 });

src/composeWithMongoose.js

@@ -9,15 +9,15 @@ import { getUniqueIndexes, extendByReversedIndexes } from './utils/getIndexesFro
 
 import type {
   MongooseModelT,
-  typeConverterOpts,
-  typeConverterResolversOpts,
-  typeConverterInputTypeOpts,
-  connectionSortMapOpts,
+  TypeConverterOpts,
+  TypeConverterResolversOpts,
+  TypeConverterInputTypeOpts,
+  ConnectionSortMapOpts,
 } from './definition';
 
 export function composeWithMongoose(
   model: MongooseModelT,
-  opts: typeConverterOpts = {}
+  opts: TypeConverterOpts = {}
 ): TypeComposer {
   const name: string = (opts && opts.name) || model.modelName;
 
@@ -86,7 +86,7 @@ export function prepareInputFields(
 
 export function createInputType(
   typeComposer: TypeComposer,
-  inputTypeOpts?: typeConverterInputTypeOpts = {}
+  inputTypeOpts?: TypeConverterInputTypeOpts = {}
 ): void {
   const inputTypeComposer = typeComposer.getInputTypeComposer();
 
@@ -106,7 +106,7 @@ export function createInputType(
 export function createResolvers(
   model: MongooseModelT,
   typeComposer: TypeComposer,
-  opts: typeConverterResolversOpts
+  opts: TypeConverterResolversOpts
 ): void {
   const names = resolvers.getAvailableNames();
   names.forEach(resolverName => {
@@ -127,7 +127,7 @@ export function createResolvers(
 export function prepareConnectionResolver(
   model: MongooseModelT,
   typeComposer: TypeComposer,
-  opts: connectionSortMapOpts
+  opts: ConnectionSortMapOpts
 ) {
   const uniqueIndexes = extendByReversedIndexes(getUniqueIndexes(model), { reversedFirst: true });
   const sortConfigs = {};