Skip to content

Commit d6dd648

Browse files
nodkznodkz
committed
refactor: migrate code to graphql-compose@7.0.0
BREAKING CHANGE: required graphql-compose@7.0.0
1 parent 4de65f2 commit d6dd648

26 files changed

+186
-123
lines changed

‎src/ElasticApiParser.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {
88
upperFirst,
99
ObjectTypeComposer,
1010
EnumTypeComposer,
11-
type ComposeFieldConfigMap,
12-
type ComposeFieldConfigArgumentMap,
13-
type ComposeArgumentConfig,
14-
type ComposeArgumentConfigAsObject,
11+
type ObjectTypeComposerFieldConfigMapDefinition,
12+
type ObjectTypeComposerArgumentConfigMapDefinition,
13+
type ObjectTypeComposerArgumentConfigDefinition,
14+
type ObjectTypeComposerArgumentConfigAsObjectDefinition,
1515
} from 'graphql-compose';
1616
import { reorderKeys } from './utils';
1717

@@ -252,7 +252,7 @@ export default class ElasticApiParser {
252252
return result;
253253
}
254254

255-
generateFieldMap(): ComposeFieldConfigMap<any, any> {
255+
generateFieldMap(): ObjectTypeComposerFieldConfigMapDefinition<any, any> {
256256
const result = {};
257257
Object.keys(this.parsedSource).forEach(methodName => {
258258
result[methodName] = this.generateFieldConfig(methodName);
@@ -316,8 +316,8 @@ export default class ElasticApiParser {
316316
paramCfg: ElasticParamConfigT,
317317
fieldName: string,
318318
description?: ?string
319-
): ComposeArgumentConfig {
320-
const result: { ...ComposeArgumentConfigAsObject } = {
319+
): ObjectTypeComposerArgumentConfigDefinition {
320+
const result: { ...ObjectTypeComposerArgumentConfigAsObjectDefinition } = {
321321
type: this.paramTypeToGraphQL(paramCfg, fieldName),
322322
};
323323

@@ -377,7 +377,7 @@ export default class ElasticApiParser {
377377
}
378378
}
379379

380-
getEnumType(fieldName: string, vals: mixed[]): EnumTypeComposer<any> {
380+
getEnumType(fieldName: string, vals: $ReadOnlyArray<any>): EnumTypeComposer<any> {
381381
const key = fieldName;
382382
const subKey = JSON.stringify(vals);
383383

@@ -423,7 +423,7 @@ export default class ElasticApiParser {
423423
settingsToArgMap(
424424
settings: ?ElasticCaSettingsT,
425425
descriptions: ElasticParsedArgsDescriptionsT = {}
426-
): ComposeFieldConfigArgumentMap<any> {
426+
): ObjectTypeComposerArgumentConfigMapDefinition<any> {
427427
const result = {};
428428
const { params, urls, url, method, needBody } = settings || {};
429429

@@ -460,7 +460,9 @@ export default class ElasticApiParser {
460460
return result;
461461
}
462462

463-
reassembleNestedFields(fields: ComposeFieldConfigMap<any, any>): ComposeFieldConfigMap<any, any> {
463+
reassembleNestedFields(
464+
fields: ObjectTypeComposerFieldConfigMapDefinition<any, any>
465+
): ObjectTypeComposerFieldConfigMapDefinition<any, any> {
464466
const result = {};
465467
Object.keys(fields).forEach(k => {
466468
const names = k.split('.');

‎src/elasticDSL/Commons/Date.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* @flow */
22
/* eslint-disable no-unused-vars */
33

4-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
4+
import {
5+
InputTypeComposer,
6+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
7+
} from 'graphql-compose';
58
import { getTypeName, type CommonOpts, desc } from '../../utils';
69

710
export function getDateRangeITC<TContext>(opts: CommonOpts<TContext>): InputTypeComposer<TContext> {
@@ -18,7 +21,9 @@ export function getDateRangeITC<TContext>(opts: CommonOpts<TContext>): InputType
1821
}));
1922
}
2023

21-
export function getDateFormatFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
24+
export function getDateFormatFC(
25+
opts: CommonOpts<any>
26+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
2227
return {
2328
type: 'String',
2429
description: desc(
@@ -30,7 +35,9 @@ export function getDateFormatFC(opts: CommonOpts<any>): ComposeInputFieldConfigA
3035
};
3136
}
3237

33-
export function getDateIntervalFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
38+
export function getDateIntervalFC(
39+
opts: CommonOpts<any>
40+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
3441
return {
3542
type: 'String',
3643
description: desc(
@@ -43,7 +50,9 @@ export function getDateIntervalFC(opts: CommonOpts<any>): ComposeInputFieldConfi
4350
};
4451
}
4552

46-
export function getDateMathFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
53+
export function getDateMathFC(
54+
opts: CommonOpts<any>
55+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
4756
return {
4857
type: 'String',
4958
description: desc(
@@ -57,7 +66,9 @@ export function getDateMathFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsO
5766
};
5867
}
5968

60-
export function getDateTimeZoneFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
69+
export function getDateTimeZoneFC(
70+
opts: CommonOpts<any>
71+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
6172
return {
6273
type: 'String',
6374
description: desc(

‎src/elasticDSL/Commons/FieldNames.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
/* @flow */
22
/* eslint-disable no-param-reassign */
33

4-
import { upperFirst, EnumTypeComposer, type ComposeInputFieldConfigMap } from 'graphql-compose';
5-
import type { ComposeEnumValueConfigMap } from 'graphql-compose/lib/EnumTypeComposer';
4+
import {
5+
upperFirst,
6+
EnumTypeComposer,
7+
type InputTypeComposerFieldConfigMapDefinition,
8+
} from 'graphql-compose';
9+
import type { EnumTypeComposerValueConfigMapDefinition } from 'graphql-compose/lib/EnumTypeComposer';
610
import { getTypeName, type CommonOpts, desc } from '../../utils';
711

812
export type ElasticDataType = string;
@@ -140,29 +144,29 @@ export function getFieldNamesType(
140144
const name = getTypeName(`${typePrefix}Fields`, opts);
141145
const description = desc(`Avaliable fields from mapping.`);
142146

143-
return opts.schemaComposer.getOrSet(name, () => {
147+
return (opts.schemaComposer.getOrSet(name, () => {
144148
if (!opts || !opts.fieldMap) {
145-
return 'String';
149+
return opts.schemaComposer.get('String');
146150
}
147151
const values = getEnumValues(opts.fieldMap, types, addAll);
148152

149153
if (Object.keys(values).length === 0) {
150-
return 'String';
154+
return opts.schemaComposer.get('String');
151155
}
152156

153157
return opts.schemaComposer.createEnumTC({
154158
name,
155159
description,
156160
values,
157161
});
158-
});
162+
}): any);
159163
}
160164

161165
function getEnumValues(
162166
fieldMap: any,
163167
types: ElasticDataType[],
164168
addAll: boolean = false
165-
): ComposeEnumValueConfigMap {
169+
): EnumTypeComposerValueConfigMapDefinition {
166170
const values = {};
167171
if (addAll) {
168172
values._all = {
@@ -186,7 +190,7 @@ export function getFieldConfigMap(
186190
types: ElasticDataType[],
187191
fc: any,
188192
addAll: boolean = false
189-
): ComposeInputFieldConfigMap | string {
193+
): InputTypeComposerFieldConfigMapDefinition | string {
190194
if (!fc) fc = 'JSON';
191195
if (!opts || !opts.fieldMap) {
192196
return 'JSON';

‎src/elasticDSL/Commons/Geo.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
/* @flow */
22
/* eslint-disable no-unused-vars */
33

4-
import { InputTypeComposer, graphql, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
4+
import {
5+
InputTypeComposer,
6+
graphql,
7+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
8+
} from 'graphql-compose';
59
import { getTypeName, type CommonOpts, desc } from '../../utils';
610

711
const { GraphQLScalarType, Kind } = graphql;
@@ -50,7 +54,9 @@ export function getGeoPointFC(opts: CommonOpts<any>): GraphQLScalarType {
5054
return ElasticGeoPointType;
5155
}
5256

53-
export function getDistanceUnitFC(opts: CommonOpts<any>): ComposeInputFieldConfigAsObject {
57+
export function getDistanceUnitFC(
58+
opts: CommonOpts<any>
59+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
5460
return {
5561
type: 'String',
5662
description: desc(
@@ -65,7 +71,7 @@ export function getDistanceUnitFC(opts: CommonOpts<any>): ComposeInputFieldConfi
6571

6672
export function getDistanceCalculationModeFC(
6773
opts: CommonOpts<any>
68-
): ComposeInputFieldConfigAsObject {
74+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
6975
return {
7076
type: 'String',
7177
description: desc(

‎src/elasticDSL/Query/FullText/Common.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
69

710
export function getCommonITC<TContext>(
811
opts: CommonOpts<TContext>
9-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
12+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1013
const name = getTypeName('QueryCommon', opts);
1114
const description = desc(
1215
`

‎src/elasticDSL/Query/FullText/Match.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
69

710
export function getMatchITC<TContext>(
811
opts: CommonOpts<TContext>
9-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
12+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1013
const name = getTypeName('QueryMatch', opts);
1114
const description = desc(
1215
`

‎src/elasticDSL/Query/FullText/MatchPhrase.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
69

710
export function getMatchPhraseITC<TContext>(
811
opts: CommonOpts<TContext>
9-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
12+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1013
const name = getTypeName('QueryMatchPhrase', opts);
1114
const description = desc(
1215
`

‎src/elasticDSL/Query/FullText/MatchPhrasePrefix.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
69

710
export function getMatchPhrasePrefixITC<TContext>(
811
opts: CommonOpts<TContext>
9-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
12+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1013
const name = getTypeName('QueryMatchPhrasePrefix', opts);
1114
const description = desc(
1215
`

‎src/elasticDSL/Query/Geo/GeoBoundingBox.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getGeoPointAsFieldConfigMap } from '../../Commons/FieldNames';
69
import { getGeoPointFC } from '../../Commons/Geo';
710

811
export function getGeoBoundingBoxITC<TContext>(
912
opts: CommonOpts<TContext>
10-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
13+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1114
const name = getTypeName('QueryGeoBoundingBox', opts);
1215
const description = desc(
1316
`

‎src/elasticDSL/Query/Geo/GeoDistance.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
/* @flow */
22

3-
import { InputTypeComposer, type ComposeInputFieldConfigAsObject } from 'graphql-compose';
3+
import {
4+
InputTypeComposer,
5+
type ObjectTypeComposerFieldConfigAsObjectDefinition,
6+
} from 'graphql-compose';
47
import { getTypeName, type CommonOpts, desc } from '../../../utils';
58
import { getGeoPointAsFieldConfigMap } from '../../Commons/FieldNames';
69
import { getGeoPointFC, getDistanceCalculationModeFC } from '../../Commons/Geo';
710

811
export function getGeoDistanceITC<TContext>(
912
opts: CommonOpts<TContext>
10-
): InputTypeComposer<TContext> | ComposeInputFieldConfigAsObject {
13+
): InputTypeComposer<TContext> | ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
1114
const name = getTypeName('QueryGeoDistance', opts);
1215
const description = desc(
1316
`

0 commit comments

Comments
 (0)