fix(Flowtype): Update graphql-compose and fix Flow errors

Author: nodkz

.eslintignore

@@ -0,0 +1,2 @@
+flow-typed
+lib

.flowconfig

@@ -1,4 +1,8 @@
 [ignore]
+.*/coverage/.*
+.*/resources/.*
+<PROJECT_ROOT>/lib/.*
+<PROJECT_ROOT>/dist/.*
 .*/node_modules/ajv.*
 .*/node_modules/acorn.*
 .*/node_modules/async.*

package.json

@@ -27,15 +27,16 @@
   },
   "peerDependencies": {
     "elasticsearch": ">=12.0.0 || >=13.0.0",
-    "graphql-compose": ">=1.20.2"
+    "graphql-compose": ">=1.20.4"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
     "babel-eslint": "^7.2.3",
+    "babel-jest": "^20.0.3",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.22.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.5.1",
+    "babel-preset-env": "^1.5.2",
     "cz-conventional-changelog": "^2.0.0",
     "elasticsearch": "^13.0.1",
     "eslint": "^3.19.0",
@@ -48,11 +49,10 @@
     "express-graphql": "^0.6.6",
     "flow-bin": "^0.47.0",
     "graphql": "^0.10.1",
-    "graphql-compose": "^1.20.2",
+    "graphql-compose": "^1.20.4",
     "jest": "^20.0.4",
-    "jest-babel": "^1.0.1",
     "npm-run-all": "^4.0.1",
-    "prettier": "^1.4.2",
+    "prettier": "^1.4.4",
     "rimraf": "^2.5.4",
     "semantic-release": "^6.3.2"
   },
@@ -78,7 +78,7 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "watch": "npm run test:watch",
-    "flow": "./node_modules/.bin/flow",
+    "flow": "./node_modules/.bin/flow stop && ./node_modules/.bin/flow",
     "all": "npm run test && npm run lint && npm run flow",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
     "docker": "npm run docker:v5",

src/elasticApiFieldConfig.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-param-reassign */
 
 import { graphql } from 'graphql-compose';
-import type { GraphQLFieldConfig } from 'graphql/type/definition';
+import type { GraphQLFieldConfig } from 'graphql-compose/lib/definition';
 import elasticsearch from 'elasticsearch';
 import ElasticApiParser from './ElasticApiParser';
 

src/elasticDSL/Aggs/__tests__/Aggs-test.js

@@ -12,7 +12,6 @@ describe('AGGS args converter', () => {
         name: 'RootQuery',
         fields: {
           search: {
-            // $FlowFixMe
             args: TypeMapper.convertArgConfigMap({
               body: {
                 type: getAggsITC({

src/elasticDSL/Commons/FieldNames.js

@@ -5,7 +5,7 @@ import { upperFirst, graphql } from 'graphql-compose';
 import type {
   GraphQLEnumValueConfigMap,
   GraphQLInputFieldConfigMap,
-} from 'graphql/type/definition';
+} from 'graphql-compose/lib/definition';
 import { getTypeName, getOrSetType, desc } from '../../utils';
 
 const { GraphQLEnumType } = graphql;

src/elasticDSL/Query/__tests__/Query-test.js

@@ -12,7 +12,6 @@ describe('AGGS args converter', () => {
         name: 'RootQuery',
         fields: {
           search: {
-            // $FlowFixMe
             args: TypeMapper.convertArgConfigMap({
               body: {
                 type: getQueryITC({

src/resolvers/search.js

@@ -97,7 +97,6 @@ export default function createSearchResolver(
     })
     .reorderFields(['hits', 'count', 'aggregations', 'max_score', 'took', 'timed_out', '_shards']);
 
-  // $FlowFixMe
   return new Resolver({
     type,
     name: 'search',

yarn.lock

@@ -727,9 +727,9 @@ babel-polyfill@^6.16.0, babel-polyfill@^6.23.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-preset-env@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
+babel-preset-env@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -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.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.20.2.tgz#4198b9bbe62fead32df5556ac1d054c5f25995ee"
+graphql-compose@^1.20.4:
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.20.4.tgz#de70282439b29e2014fae0ee6effca6fbd348b9e"
   dependencies:
     babel-runtime "^6.23.0"
     object-path "^0.11.4"
@@ -2393,14 +2393,14 @@ istanbul-api@^1.1.1:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha.0, istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
-
-istanbul-lib-coverage@^1.0.1:
+istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212"
 
+istanbul-lib-coverage@^1.0.0-alpha.0, istanbul-lib-coverage@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+
 istanbul-lib-hook@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
@@ -2469,10 +2469,6 @@ iterall@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.1.tgz#f7f0af11e9a04ec6426260f5019d9fcca4d50214"
 
-jest-babel@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jest-babel/-/jest-babel-1.0.1.tgz#ef659df0e9397b083c0f6aebd4cb8cfaa77df8bf"
-
 jest-changed-files@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
@@ -3491,9 +3487,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.3.1, prettier@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.4.2.tgz#bcdd95ed1eca434ac7f98ca26ea4d25a2af6a2ac"
+prettier@^1.3.1, prettier@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.4.4.tgz#a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a"
 
 pretty-format@^20.0.3:
   version "20.0.3"