fix(Flowtype): Resolve Flowtype warnings

nodkz · nodkz · commit 5fb1859448c9 · 2017-06-06T12:10:43.000+06:00
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "elasticsearch": ">=12.0.0 || >=13.0.0",
-    "graphql-compose": ">=1.20.1"
+    "graphql-compose": ">=1.20.2"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
@@ -48,7 +48,7 @@
     "express-graphql": "^0.6.6",
     "flow-bin": "^0.47.0",
     "graphql": "^0.10.1",
-    "graphql-compose": "^1.20.1",
+    "graphql-compose": "^1.20.2",
     "jest": "^20.0.4",
     "jest-babel": "^1.0.1",
     "npm-run-all": "^4.0.1",
diff --git a/src/__mocks__/cv.js b/src/__mocks__/cv.js
@@ -1,7 +1,6 @@
-import {
-  inputPropertiesToGraphQLTypes,
-  convertToSourceTC,
-} from '../mappingConverter';
+/* @flow */
+
+import { inputPropertiesToGraphQLTypes, convertToSourceTC } from '../mappingConverter';
 import cvMapping from './cvMapping';
 
 export const CvFieldMap = inputPropertiesToGraphQLTypes(cvMapping);
diff --git a/src/__mocks__/cvMapping.js b/src/__mocks__/cvMapping.js
@@ -1,3 +1,5 @@
+/* @flow */
+
 export default {
   properties: {
     avatarUrl: {
diff --git a/src/__mocks__/elasticClient.js b/src/__mocks__/elasticClient.js
@@ -1,3 +1,5 @@
+/* @flow */
+
 import elasticsearch from 'elasticsearch';
 
 const elasticClient = new elasticsearch.Client({
diff --git a/src/__tests__/ElasticApiParser-test.js b/src/__tests__/ElasticApiParser-test.js
@@ -167,7 +167,8 @@ describe('ElasticApiParser', () => {
         );
         const doxAST = dox.parseComments(source, { raw: true });
         expect(ElasticApiParser.parseParamsDescription(doxAST[0])).toMatchObject({
-          analyzeWildcard: 'Specify whether wildcard and prefix queries should be analyzed (default: false)',
+          analyzeWildcard:
+            'Specify whether wildcard and prefix queries should be analyzed (default: false)',
           analyzer: 'The analyzer to use for the query string',
           from: 'Starting offset (default: 0)',
         });
diff --git a/src/__tests__/mappingConverter-test.js b/src/__tests__/mappingConverter-test.js
@@ -141,10 +141,12 @@ describe('PropertiesConverter', () => {
         'ComplexType'
       );
       expect(type).toBeInstanceOf(GraphQLObjectType);
-      const tc = TypeComposer.create(type);
-      expect(tc.getTypeName()).toEqual('ComplexType');
-      expect(tc.getFieldNames()).toEqual(expect.arrayContaining(['big', 'thumb']));
-      expect(tc.getFieldType('big')).toEqual(GraphQLString);
+      if (type instanceof GraphQLObjectType) {
+        const tc = TypeComposer.create(type);
+        expect(tc.getTypeName()).toEqual('ComplexType');
+        expect(tc.getFieldNames()).toEqual(expect.arrayContaining(['big', 'thumb']));
+        expect(tc.getFieldType('big')).toEqual(GraphQLString);
+      }
     });
   });
 
diff --git a/src/elasticDSL/Aggs/Aggs.js b/src/elasticDSL/Aggs/Aggs.js
@@ -1,3 +1,5 @@
+/* @flow */
+
 import { getAggBlockITC } from './AggBlock';
 
 export function getAggsITC(opts: mixed) {
@@ -10,7 +12,7 @@ export type ElasticAggsT = {
 
 export type ElasticAggsRulesT = {
   [aggOperationName: string]: mixed,
-  aggs: ElasticAggsT,
+  aggs?: ElasticAggsT,
 };
 
 export type GqlAggBlock = {
@@ -20,7 +22,7 @@ export type GqlAggBlock = {
 
 export type GqlAggRules = {
   [aggOperationName: string]: mixed,
-  aggs: GqlAggBlock[],
+  aggs?: GqlAggBlock[],
 };
 
 export function prepareAggsInResolve(
diff --git a/src/elasticDSL/Query/Compound/Bool.js b/src/elasticDSL/Query/Compound/Bool.js
@@ -86,10 +86,7 @@ function prepareQueryMayBeArray(vals, fieldMap) {
   return prepareQueryInResolve(vals, fieldMap);
 }
 
-export function prepareBoolInResolve(
-  bool: any,
-  fieldMap: mixed
-): { [argName: string]: any } {
+export function prepareBoolInResolve(bool: any, fieldMap: mixed): { [argName: string]: any } {
   /* eslint-disable no-param-reassign */
   if (bool.must) {
     bool.must = prepareQueryMayBeArray(bool.must, fieldMap);
diff --git a/src/elasticDSL/Query/Compound/ConstantScore.js b/src/elasticDSL/Query/Compound/ConstantScore.js
@@ -32,10 +32,7 @@ export function prepareConstantScoreInResolve(
   fieldMap: mixed
 ): { [argName: string]: any } {
   if (constant_score.filter) {
-    constant_score.filter = prepareQueryInResolve(
-      constant_score.filter,
-      fieldMap
-    );
+    constant_score.filter = prepareQueryInResolve(constant_score.filter, fieldMap);
   }
 
   return constant_score;
diff --git a/src/elasticDSL/Query/Compound/DisMax.js b/src/elasticDSL/Query/Compound/DisMax.js
@@ -30,14 +30,9 @@ export function getDisMaxITC(opts: mixed = {}): InputTypeComposer {
 }
 
 /* eslint-disable no-param-reassign, camelcase */
-export function prepareDisMaxResolve(
-  dis_max: any,
-  fieldMap: mixed
-): { [argName: string]: any } {
+export function prepareDisMaxResolve(dis_max: any, fieldMap: mixed): { [argName: string]: any } {
   if (Array.isArray(dis_max.queries)) {
-    dis_max.queries = dis_max.queries.map(query =>
-      prepareQueryInResolve(query, fieldMap)
-    );
+    dis_max.queries = dis_max.queries.map(query => prepareQueryInResolve(query, fieldMap));
   }
 
   return dis_max;
diff --git a/src/elasticDSL/Query/Compound/FunctionScore.js b/src/elasticDSL/Query/Compound/FunctionScore.js
@@ -67,10 +67,7 @@ export function prepareFunctionScoreInResolve(
   fieldMap: mixed
 ): { [argName: string]: any } {
   if (function_score.query) {
-    function_score.query = prepareQueryInResolve(
-      function_score.query,
-      fieldMap
-    );
+    function_score.query = prepareQueryInResolve(function_score.query, fieldMap);
   }
 
   if (Array.isArray(function_score.functions)) {
diff --git a/src/elasticDSL/SearchBody.js b/src/elasticDSL/SearchBody.js
@@ -52,10 +52,7 @@ export function getSearchBodyITC(opts: SearchOptsT = {}): InputTypeComposer {
   );
 }
 
-export function prepareBodyInResolve(
-  body: any,
-  fieldMap: mixed
-): { [argName: string]: any } {
+export function prepareBodyInResolve(body: any, fieldMap: mixed): { [argName: string]: any } {
   /* eslint-disable no-param-reassign */
   if (body.query) {
     body.query = prepareQueryInResolve(body.query, fieldMap);
diff --git a/src/mappingConverter.js b/src/mappingConverter.js
@@ -10,6 +10,7 @@ import {
   isObject,
   graphql,
 } from 'graphql-compose';
+import type { GraphQLScalarType, GraphQLInputType } from 'graphql-compose/lib/definition';
 
 import { ElasticGeoPointType } from './elasticDSL/Commons/Geo';
 
@@ -20,7 +21,6 @@ const {
   GraphQLBoolean,
   GraphQLList,
   GraphQLObjectType,
-  GraphQLInputObjectType,
 } = graphql;
 
 export type ElasticMappingT = {
@@ -38,7 +38,7 @@ export type ElasticPropertyT = {
 };
 
 export type InputFieldsMap = {
-  [field: string]: GraphQLInputObjectType,
+  [field: string]: GraphQLInputType,
 };
 
 export type FieldsMapByElasticType = {
@@ -146,7 +146,7 @@ export function propertyToSourceGraphQLType(
   prop: ElasticPropertyT,
   typeName?: string,
   opts?: ConvertOptsT
-): GraphQLObjectType {
+): GraphQLObjectType | GraphQLScalarType {
   if (!prop || (typeof prop.type !== 'string' && !prop.properties)) {
     throw new Error('You provide incorrect Elastic property config.');
   }
diff --git a/src/resolvers/__tests__/search-test.js b/src/resolvers/__tests__/search-test.js
@@ -1,3 +1,5 @@
+/* @flow */
+
 import { Resolver } from 'graphql-compose';
 import createSearchResolver, * as Search from '../search';
 import elasticClient from '../../__mocks__/elasticClient';
@@ -12,7 +14,7 @@ describe('search resolver', () => {
     const SearchResolver = createSearchResolver(CvFieldMap, CvTC, elasticClient);
 
     it.skip('should return result', () => {
-      return SearchResolver.resolve({}, {}, {}).then(res => {
+      return SearchResolver.resolve({}).then(res => {
         console.log(res); // eslint-disable-line
       });
     });
diff --git a/src/resolvers/search.js b/src/resolvers/search.js
@@ -133,7 +133,6 @@ export default function createSearchResolver(
         if (!hits._source) {
           args.body._source = false;
         } else {
-          // $FlowFixMe
           args.body._source = toDottedList(hits._source);
         }
 
diff --git a/src/resolvers/searchConnection.js b/src/resolvers/searchConnection.js
@@ -1,4 +1,4 @@
-/* @Flow */
+/* @flow */
 
 import { Resolver, TypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType } from '../utils';
@@ -21,18 +21,22 @@ export default function createSearchConnectionResolver(
     .removeArg(['limit', 'skip'])
     .reorderArgs(['q', 'query', 'sort', 'aggs', 'first', 'after', 'last', 'before']);
 
-  const searchType = searchResolver.getTypeComposer();
-  const typeName = searchType.getTypeName();
+  const searchTC = searchResolver.getTypeComposer();
+  if (!searchTC) {
+    throw new Error('Cannot get TypeComposer from resolver. Maybe resolver return Scalar?!');
+  }
+
+  const typeName = searchTC.getTypeName();
   resolver.setType(
-    searchType
+    searchTC
       .clone(`${typeName}Connection`)
       .addFields({
         pageInfo: getPageInfoTC(opts),
         edges: [
           TypeComposer.create({
             name: `${typeName}Edge`,
             fields: {
-              node: searchType.get('hits'),
+              node: searchTC.get('hits'),
               cursor: 'String!',
             },
           }),
diff --git a/src/types/SearchHitItem.js b/src/types/SearchHitItem.js
@@ -8,7 +8,6 @@ export function getSearchHitItemTC(opts: SearchOptsT = {}): TypeComposer {
   const name = getTypeName('SearchHitItem', opts);
 
   return getOrSetType(name, () =>
-    // $FlowFixMe
     TypeComposer.create({
       name,
       fields: {
diff --git a/src/types/SearchOutput.js b/src/types/SearchOutput.js
@@ -18,15 +18,13 @@ export function getSearchOutputTC(opts: SearchOptsT = {}): TypeComposer {
   const nameHits = getTypeName('SearchHits', opts);
 
   return getOrSetType(name, () =>
-    // $FlowFixMe
     TypeComposer.create({
       name,
       fields: {
         took: 'Int',
         timed_out: 'Boolean',
         _shards: getShardsTC(opts),
         hits: getOrSetType(nameHits, () =>
-          // $FlowFixMe
           TypeComposer.create({
             name: nameHits,
             fields: {
diff --git a/src/types/Shards.js b/src/types/Shards.js
@@ -1,11 +1,12 @@
+/* @flow */
+
 import { TypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType } from '../utils';
 
 export default function getShardsTC(opts: mixed = {}): TypeComposer {
   const name = getTypeName('MetaShards', opts);
 
   return getOrSetType(name, () =>
-    // $FlowFixMe
     TypeComposer.create({
       name,
       fields: {
diff --git a/yarn.lock b/yarn.lock
@@ -2023,9 +2023,9 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-graphql-compose@^1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.20.1.tgz#41a1f35f2c2aded2934bb6568ac762c9e6b9b5ce"
+graphql-compose@^1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.20.2.tgz#4198b9bbe62fead32df5556ac1d054c5f25995ee"
   dependencies:
     babel-runtime "^6.23.0"
     object-path "^0.11.4"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* @flow */`
	`2`	`+`
`1`	`3`	`export default {`
`2`	`4`	`properties: {`
`3`	`5`	`avatarUrl: {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* @flow */`
	`2`	`+`
`1`	`3`	`import elasticsearch from 'elasticsearch';`
`2`	`4`
`3`	`5`	`const elasticClient = new elasticsearch.Client({`