fix(Flowtype): more strict type checks

Author: nodkz

.eslintrc

@@ -34,5 +34,9 @@
   "plugins": [
     "flowtype",
     "prettier"
-  ]
+  ],
+  "globals": {
+    "$Shape": true,
+    "$FlowFixMe": true,
+  }
 }

flow-typed/npm/jest_v19.x.x.js

@@ -201,7 +201,7 @@ type JestExpectType = {
   /**
    * Use .toMatch to check that a string matches a regular expression.
    */
-  toMatch(regexp: RegExp): void,
+  toMatch(regexp: RegExp | string): void,
   /**
    * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
    */

src/ElasticApiParser.js

@@ -4,7 +4,7 @@
 import dox from 'dox';
 import fs from 'fs';
 import path from 'path';
-import { GraphQLJSON, upperFirst, TypeComposer } from 'graphql-compose';
+import { GraphQLJSON, upperFirst, TypeComposer, type ComposeFieldConfigMap } from 'graphql-compose';
 import {
   GraphQLString,
   GraphQLFloat,
@@ -15,7 +15,6 @@ import {
 } from 'graphql-compose/lib/graphql';
 import type {
   GraphQLArgumentConfig,
-  GraphQLFieldConfig,
   GraphQLFieldConfigMap,
   GraphQLFieldConfigArgumentMap,
   GraphQLInputType,
@@ -277,10 +276,7 @@ export default class ElasticApiParser {
     ]);
   }
 
-  generateFieldConfig(
-    methodName: string,
-    methodArgs?: { [paramName: string]: mixed }
-  ): GraphQLFieldConfig<*, *> {
+  generateFieldConfig(methodName: string, methodArgs?: { [paramName: string]: mixed }) {
     if (!methodName) {
       throw new Error(`You should provide Elastic search method.`);
     }
@@ -299,7 +295,8 @@ export default class ElasticApiParser {
       type: GraphQLJSON,
       description,
       args: argMap,
-      resolve: (src, args, context) => {
+      // eslint-disable-next-line no-unused-vars
+      resolve: (source: any, args: Object, context: any, info: any) => {
         const client = (context && context.elasticClient) || this.elasticClient;
 
         if (!client) {
@@ -395,8 +392,7 @@ export default class ElasticApiParser {
         } else if (val === 'null') {
           result.null_string = { value: 'null' };
         } else if (Number.isFinite(val)) {
-          // $FlowFixMe
-          result[`number_${val}`] = { value: val };
+          result[`number_${(val: any)}`] = { value: val };
         } else if (typeof val === 'string') {
           result[val] = { value: val };
         }
@@ -456,7 +452,7 @@ export default class ElasticApiParser {
     return result;
   }
 
-  reassembleNestedFields(fields: GraphQLFieldConfigMap<*, *>): GraphQLFieldConfigMap<*, *> {
+  reassembleNestedFields(fields: ComposeFieldConfigMap<any, any>): GraphQLFieldConfigMap<*, *> {
     const result = {};
     Object.keys(fields).forEach(k => {
       const names = k.split('.');
@@ -467,8 +463,7 @@ export default class ElasticApiParser {
           result[names[0]] = {
             type: new GraphQLObjectType({
               name: `${this.prefix}_${upperFirst(names[0])}`,
-              // $FlowFixMe
-              fields: () => {},
+              fields: (() => {}: any),
             }),
             resolve: () => {
               return {};

src/__tests__/ElasticApiParser-test.js

@@ -17,7 +17,7 @@ import ElasticApiParser from '../ElasticApiParser';
 const apiPartialPath = path.resolve(__dirname, '../__mocks__/apiPartial.js');
 
 describe('ElasticApiParser', () => {
-  let parser;
+  let parser: ElasticApiParser;
 
   beforeEach(() => {
     parser = new ElasticApiParser({
@@ -44,6 +44,7 @@ describe('ElasticApiParser', () => {
     describe('findApiVersionFile()', () => {
       it('should find proper version in elasticsearch 12.x', () => {
         const { loadApiListFile } = ElasticApiParser;
+
         // $FlowFixMe
         ElasticApiParser.loadApiListFile = () =>
           `
@@ -60,19 +61,15 @@ describe('ElasticApiParser', () => {
         `;
 
         expect(ElasticApiParser.findApiVersionFile('5.0')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/5_0.js'
         );
         expect(ElasticApiParser.findApiVersionFile('2.4')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/2_4.js'
         );
         expect(ElasticApiParser.findApiVersionFile('1.7')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/1_7.js'
         );
         expect(ElasticApiParser.findApiVersionFile('_default')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/5_0.js'
         );
 
@@ -82,6 +79,7 @@ describe('ElasticApiParser', () => {
 
       it('should find proper version in elasticsearch 13.x', () => {
         const { loadApiListFile } = ElasticApiParser;
+
         // $FlowFixMe
         ElasticApiParser.loadApiListFile = () =>
           `
@@ -100,19 +98,15 @@ describe('ElasticApiParser', () => {
         `;
 
         expect(ElasticApiParser.findApiVersionFile('5.0')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/5_0.js'
         );
         expect(ElasticApiParser.findApiVersionFile('2.4')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/2_4.js'
         );
         expect(ElasticApiParser.findApiVersionFile('1.7')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/1_7.js'
         );
         expect(ElasticApiParser.findApiVersionFile('_default')).toMatch(
-          // $FlowFixMe
           'elasticsearch/src/lib/apis/5_3.js'
         );
 
@@ -267,8 +261,7 @@ describe('ElasticApiParser', () => {
           ElasticApiParser.parseSource('');
         }).toThrowError('Empty source');
         expect(() => {
-          // $FlowFixMe
-          ElasticApiParser.parseSource(123);
+          ElasticApiParser.parseSource((123: any));
         }).toThrowError('should be non-empty string');
       });
 
@@ -482,23 +475,23 @@ describe('ElasticApiParser', () => {
     });
 
     it('should combine nested field in GraphQLObjectType', () => {
-      const reFields = parser.reassembleNestedFields({
+      const reFields: any = parser.reassembleNestedFields({
         'cat.field1': { type: GraphQLString },
         'cat.field2': { type: GraphQLString },
         'index.exists': { type: GraphQLBoolean },
       });
       expect(Object.keys(reFields).length).toEqual(2);
       expect(reFields.cat).toBeDefined();
       expect(reFields.cat.type).toBeInstanceOf(GraphQLObjectType);
-      // $FlowFixMe
+
       const tc = TypeComposer.create(reFields.cat.type);
       expect(tc.getFieldNames()).toEqual(['field1', 'field2']);
       expect(tc.getFieldType('field1')).toEqual(GraphQLString);
       expect(tc.getFieldType('field2')).toEqual(GraphQLString);
 
       expect(reFields.index).toBeDefined();
       expect(reFields.index.type).toBeInstanceOf(GraphQLObjectType);
-      // $FlowFixMe
+
       const tc2 = TypeComposer.create(reFields.index.type);
       expect(tc2.getFieldNames()).toEqual(['exists']);
       expect(tc2.getFieldType('exists')).toEqual(GraphQLBoolean);
@@ -508,8 +501,7 @@ describe('ElasticApiParser', () => {
   describe('generateFieldConfig()', () => {
     it('should throw error if provided empty method name', () => {
       expect(() => {
-        // $FlowFixMe
-        parser.generateFieldConfig();
+        parser.generateFieldConfig((undefined: any));
       }).toThrowError('provide Elastic search method');
     });
 

src/__tests__/mappingConverter-test.js

@@ -60,8 +60,10 @@ const mapping = {
 describe('PropertiesConverter', () => {
   describe('convertToSourceTC()', () => {
     it('should throw error on empty mapping', () => {
-      // $FlowFixMe
-      expect(() => convertToSourceTC()).toThrowError('incorrect mapping');
+      expect(() => {
+        // $FlowFixMe
+        convertToSourceTC();
+      }).toThrowError('incorrect mapping');
     });
 
     it('should throw error on empty typeName', () => {

src/elasticApiFieldConfig.js

@@ -11,7 +11,7 @@ import ElasticApiParser from './ElasticApiParser';
 
 const DEFAULT_ELASTIC_API_VERSION = '_default';
 
-export function elasticApiFieldConfig(esClientOrOpts: Object): GraphQLFieldConfig<*, *> {
+export function elasticApiFieldConfig(esClientOrOpts: Object): GraphQLFieldConfig<any, any> {
   if (!esClientOrOpts || typeof esClientOrOpts !== 'object') {
     throw new Error(
       'You should provide ElasticClient instance or ElasticClientConfig in first argument.'
@@ -25,7 +25,7 @@ export function elasticApiFieldConfig(esClientOrOpts: Object): GraphQLFieldConfi
   }
 }
 
-function instanceElasticClient(elasticClient: Object): GraphQLFieldConfig<*, *> {
+function instanceElasticClient(elasticClient: Object): GraphQLFieldConfig<any, any> {
   const apiVersion = elasticClient.transport._config.apiVersion || DEFAULT_ELASTIC_API_VERSION;
   const prefix = `ElasticAPI${apiVersion.replace('.', '')}`;
 
@@ -44,7 +44,7 @@ function instanceElasticClient(elasticClient: Object): GraphQLFieldConfig<*, *>
   };
 }
 
-function contextElasticClient(elasticConfig: Object): GraphQLFieldConfig<*, *> {
+function contextElasticClient(elasticConfig: Object): GraphQLFieldConfig<any, any> {
   if (!elasticConfig.apiVersion) {
     elasticConfig.apiVersion = DEFAULT_ELASTIC_API_VERSION;
   }

src/elasticDSL/Aggs/Aggs.js

@@ -51,9 +51,8 @@ export function convertAggsRules(rules: GqlAggRules): ElasticAggsRulesT {
     if (key === 'aggs' && rules.aggs) {
       result.aggs = convertAggsBlocks(rules.aggs);
     } else {
-      // $FlowFixMe
       result[key] = rules[key];
     }
   });
-  return result;
+  return (result: any);
 }

src/elasticDSL/Commons/Date.js

@@ -1,10 +1,10 @@
 /* @flow */
 /* eslint-disable no-unused-vars */
 
-import { InputTypeComposer } from 'graphql-compose';
+import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../utils';
 
-export function getDateRangeITC(opts: mixed = {}): mixed {
+export function getDateRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('DateRange', opts);
   const description = desc(`Date range where \`from\` value includes and \`to\` value excludes.`);
 
@@ -20,7 +20,7 @@ export function getDateRangeITC(opts: mixed = {}): mixed {
   );
 }
 
-export function getDateFormatFC(opts: mixed = {}): mixed {
+export function getDateFormatFC(opts: mixed = {}): ComposeInputFieldConfigAsObject {
   return {
     type: 'String',
     description: desc(
@@ -32,7 +32,7 @@ export function getDateFormatFC(opts: mixed = {}): mixed {
   };
 }
 
-export function getDateIntervalFC(opts: mixed = {}): mixed {
+export function getDateIntervalFC(opts: mixed = {}): ComposeInputFieldConfigAsObject {
   return {
     type: 'String',
     description: desc(
@@ -45,7 +45,7 @@ export function getDateIntervalFC(opts: mixed = {}): mixed {
   };
 }
 
-export function getDateMathFC(opts: mixed = {}): mixed {
+export function getDateMathFC(opts: mixed = {}): ComposeInputFieldConfigAsObject {
   return {
     type: 'String',
     description: desc(
@@ -59,7 +59,7 @@ export function getDateMathFC(opts: mixed = {}): mixed {
   };
 }
 
-export function getDateTimeZoneFC(opts: mixed = {}): mixed {
+export function getDateTimeZoneFC(opts: mixed = {}): ComposeInputFieldConfigAsObject {
   return {
     type: 'String',
     description: desc(

src/elasticDSL/Commons/FieldNames.js

@@ -200,7 +200,6 @@ export function getFieldConfigMap(
 
   const fcMap = {};
   if (addAll) {
-    // $FlowFixMe
     fcMap._all = fc;
   }
   getFieldNamesByElasticType(opts.fieldMap, types).forEach(fieldName => {

src/elasticDSL/Commons/Float.js

@@ -4,7 +4,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../utils';
 
-export function getFloatRangeITC(opts: mixed = {}): mixed {
+export function getFloatRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('FloatRange', opts);
   const description = desc(`Float range where \`from\` value includes and \`to\` value excludes.`);
 
@@ -20,7 +20,7 @@ export function getFloatRangeITC(opts: mixed = {}): mixed {
   );
 }
 
-export function getFloatRangeKeyedITC(opts: mixed = {}): mixed {
+export function getFloatRangeKeyedITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('FloatRangeKeyed', opts);
   const description = desc(
     `