refactor: migrate code to [email protected]

BREAKING CHANGE: required [email protected]

Author: nodkz

src/ElasticApiParser.js

@@ -8,10 +8,10 @@ import {
   upperFirst,
   ObjectTypeComposer,
   EnumTypeComposer,
-  type ComposeFieldConfigMap,
-  type ComposeFieldConfigArgumentMap,
-  type ComposeArgumentConfig,
-  type ComposeArgumentConfigAsObject,
+  type ObjectTypeComposerFieldConfigMapDefinition,
+  type ObjectTypeComposerArgumentConfigMapDefinition,
+  type ObjectTypeComposerArgumentConfigDefinition,
+  type ObjectTypeComposerArgumentConfigAsObjectDefinition,
 } from 'graphql-compose';
 import { reorderKeys } from './utils';
 
@@ -252,7 +252,7 @@ export default class ElasticApiParser {
     return result;
   }
 
-  generateFieldMap(): ComposeFieldConfigMap<any, any> {
+  generateFieldMap(): ObjectTypeComposerFieldConfigMapDefinition<any, any> {
     const result = {};
     Object.keys(this.parsedSource).forEach(methodName => {
       result[methodName] = this.generateFieldConfig(methodName);
@@ -316,8 +316,8 @@ export default class ElasticApiParser {
     paramCfg: ElasticParamConfigT,
     fieldName: string,
     description?: ?string
-  ): ComposeArgumentConfig {
-    const result: { ...ComposeArgumentConfigAsObject } = {
+  ): ObjectTypeComposerArgumentConfigDefinition {
+    const result: { ...ObjectTypeComposerArgumentConfigAsObjectDefinition } = {
       type: this.paramTypeToGraphQL(paramCfg, fieldName),
     };
 
@@ -377,7 +377,7 @@ export default class ElasticApiParser {
     }
   }
 
-  getEnumType(fieldName: string, vals: mixed[]): EnumTypeComposer<any> {
+  getEnumType(fieldName: string, vals: $ReadOnlyArray<any>): EnumTypeComposer<any> {
     const key = fieldName;
     const subKey = JSON.stringify(vals);
 
@@ -423,7 +423,7 @@ export default class ElasticApiParser {
   settingsToArgMap(
     settings: ?ElasticCaSettingsT,
     descriptions: ElasticParsedArgsDescriptionsT = {}
-  ): ComposeFieldConfigArgumentMap<any> {
+  ): ObjectTypeComposerArgumentConfigMapDefinition<any> {
     const result = {};
     const { params, urls, url, method, needBody } = settings || {};
 
@@ -460,7 +460,9 @@ export default class ElasticApiParser {
     return result;
   }
 
-  reassembleNestedFields(fields: ComposeFieldConfigMap<any, any>): ComposeFieldConfigMap<any, any> {
+  reassembleNestedFields(
+    fields: ObjectTypeComposerFieldConfigMapDefinition<any, any>
+  ): ObjectTypeComposerFieldConfigMapDefinition<any, any> {
     const result = {};
     Object.keys(fields).forEach(k => {
       const names = k.split('.');

src/elasticDSL/Commons/Date.js

@@ -1,7 +1,10 @@
 /* @flow */
 /* eslint-disable no-unused-vars */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../utils';
 
 export function getDateRangeITC<TContext>(opts: CommonOpts<TContext>): InputTypeComposer<TContext> {
@@ -18,7 +21,9 @@ export function getDateRangeITC<TContext>(opts: CommonOpts<TContext>): InputType
   }));
 }
 
-export function getDateFormatFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
+export function getDateFormatFC(
+  opts: CommonOpts<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(
@@ -30,7 +35,9 @@ export function getDateFormatFC(opts: CommonOpts<any>): ComposeInputFieldConfigA
   };
 }
 
-export function getDateIntervalFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
+export function getDateIntervalFC(
+  opts: CommonOpts<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(
@@ -43,7 +50,9 @@ export function getDateIntervalFC(opts: CommonOpts<any>): ComposeInputFieldConfi
   };
 }
 
-export function getDateMathFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
+export function getDateMathFC(
+  opts: CommonOpts<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(
@@ -57,7 +66,9 @@ export function getDateMathFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsO
   };
 }
 
-export function getDateTimeZoneFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
+export function getDateTimeZoneFC(
+  opts: CommonOpts<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(

src/elasticDSL/Commons/FieldNames.js

@@ -1,8 +1,12 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { upperFirst, EnumTypeComposer, type ComposeInputFieldConfigMap } from 'graphql-compose';
-import type { ComposeEnumValueConfigMap } from 'graphql-compose/lib/EnumTypeComposer';
+import {
+  upperFirst,
+  EnumTypeComposer,
+  type InputTypeComposerFieldConfigMapDefinition,
+} from 'graphql-compose';
+import type { EnumTypeComposerValueConfigMapDefinition } from 'graphql-compose/lib/EnumTypeComposer';
 import { getTypeName, type CommonOpts, desc } from '../../utils';
 
 export type ElasticDataType = string;
@@ -140,29 +144,29 @@ export function getFieldNamesType(
   const name = getTypeName(`${typePrefix}Fields`, opts);
   const description = desc(`Avaliable fields from mapping.`);
 
-  return opts.schemaComposer.getOrSet(name, () => {
+  return (opts.schemaComposer.getOrSet(name, () => {
     if (!opts || !opts.fieldMap) {
-      return 'String';
+      return opts.schemaComposer.get('String');
     }
     const values = getEnumValues(opts.fieldMap, types, addAll);
 
     if (Object.keys(values).length === 0) {
-      return 'String';
+      return opts.schemaComposer.get('String');
     }
 
     return opts.schemaComposer.createEnumTC({
       name,
       description,
       values,
     });
-  });
+  }): any);
 }
 
 function getEnumValues(
   fieldMap: any,
   types: ElasticDataType[],
   addAll: boolean = false
-): ComposeEnumValueConfigMap {
+): EnumTypeComposerValueConfigMapDefinition {
   const values = {};
   if (addAll) {
     values._all = {
@@ -186,7 +190,7 @@ export function getFieldConfigMap(
   types: ElasticDataType[],
   fc: any,
   addAll: boolean = false
-): ComposeInputFieldConfigMap | string {
+): InputTypeComposerFieldConfigMapDefinition | string {
   if (!fc) fc = 'JSON';
   if (!opts || !opts.fieldMap) {
     return 'JSON';

src/elasticDSL/Commons/Geo.js

@@ -1,7 +1,11 @@
 /* @flow */
 /* eslint-disable no-unused-vars */
 
-import { InputTypeComposer, graphql, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  graphql,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../utils';
 
 const { GraphQLScalarType, Kind } = graphql;
@@ -50,7 +54,9 @@ export function getGeoPointFC(opts: CommonOpts<any>): GraphQLScalarType {
   return ElasticGeoPointType;
 }
 
-export function getDistanceUnitFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
+export function getDistanceUnitFC(
+  opts: CommonOpts<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(
@@ -65,7 +71,7 @@ export function getDistanceUnitFC(opts: CommonOpts<any>): ComposeInputFieldConfi
 
 export function getDistanceCalculationModeFC(
   opts: CommonOpts<any>
-): ComposeInputFieldConfigAsObject {
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: 'String',
     description: desc(

src/elasticDSL/Query/FullText/Common.js

@@ -1,12 +1,15 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
 
 export function getCommonITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryCommon', opts);
   const description = desc(
     `

src/elasticDSL/Query/FullText/Match.js

@@ -1,12 +1,15 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
 
 export function getMatchITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryMatch', opts);
   const description = desc(
     `

src/elasticDSL/Query/FullText/MatchPhrase.js

@@ -1,12 +1,15 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
 
 export function getMatchPhraseITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryMatchPhrase', opts);
   const description = desc(
     `

src/elasticDSL/Query/FullText/MatchPhrasePrefix.js

@@ -1,12 +1,15 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
 
 export function getMatchPhrasePrefixITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryMatchPhrasePrefix', opts);
   const description = desc(
     `

src/elasticDSL/Query/Geo/GeoBoundingBox.js

@@ -1,13 +1,16 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getGeoPointAsFieldConfigMap } from '../../Commons/FieldNames';
 import { getGeoPointFC } from '../../Commons/Geo';
 
 export function getGeoBoundingBoxITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryGeoBoundingBox', opts);
   const description = desc(
     `

src/elasticDSL/Query/Geo/GeoDistance.js

@@ -1,13 +1,16 @@
 /* @flow */
 
-import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
+import {
+  InputTypeComposer,
+  type ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
 import { getTypeName, type CommonOpts, desc } from '../../../utils';
 import { getGeoPointAsFieldConfigMap } from '../../Commons/FieldNames';
 import { getGeoPointFC, getDistanceCalculationModeFC } from '../../Commons/Geo';
 
 export function getGeoDistanceITC<TContext>(
   opts: CommonOpts<TContext>
-): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
+): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const name = getTypeName('QueryGeoDistance', opts);
   const description = desc(
     `