Skip to content

Commit f6bc025

Browse files
nodkznodkz
committed
fix: update graphql-compose version 7.12.0 & update dependencies
1 parent 9035384 commit f6bc025

File tree

8 files changed

+49
-49
lines changed

8 files changed

+49
-49
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
"eslint-plugin-prettier": "3.1.2",
5353
"express": "^4.17.1",
5454
"express-graphql": "^0.9.0",
55-
"flow-bin": "0.110.0",
55+
"flow-bin": "0.118.0",
5656
"graphql": "14.6.0",
57-
"graphql-compose": "7.11.0",
57+
"graphql-compose": "7.12.0",
5858
"jest": "25.1.0",
5959
"nodemon": "2.0.2",
6060
"npm-run-all": "^4.1.5",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function getGeoDistanceITC<TContext>(
4343
description: 'Eg. 12km',
4444
},
4545
distance_type: getDistanceCalculationModeFC(opts),
46-
...fields,
46+
...(fields: any),
4747
validation_method: 'String',
4848
},
4949
}));

‎src/elasticDSL/Query/Query.js

+34-35
Original file line numberDiff line numberDiff line change
@@ -56,54 +56,53 @@ export function getQueryITC<TContext>(opts: CommonOpts<TContext>): InputTypeComp
5656
return opts.getOrCreateITC(name, () => ({
5757
name,
5858
description,
59-
// $FlowFixMe
6059
fields: {
61-
match_all: () => getMatchAllITC(opts),
60+
match_all: getMatchAllITC(opts),
6261

6362
// Compound quries
64-
bool: () => getBoolITC(opts),
65-
constant_score: () => getConstantScoreITC(opts),
66-
dis_max: () => getDisMaxITC(opts),
67-
boosting: () => getBoostingITC(opts),
68-
function_score: () => getFunctionScoreITC(opts),
63+
bool: getBoolITC(opts),
64+
constant_score: getConstantScoreITC(opts),
65+
dis_max: getDisMaxITC(opts),
66+
boosting: getBoostingITC(opts),
67+
function_score: getFunctionScoreITC(opts),
6968

7069
// FullText queries
71-
match: () => getMatchITC(opts),
72-
match_phrase: () => getMatchPhraseITC(opts),
73-
match_phrase_prefix: () => getMatchPhrasePrefixITC(opts),
74-
multi_match: () => getMultiMatchITC(opts),
75-
common: () => getCommonITC(opts),
76-
query_string: () => getQueryStringITC(opts),
77-
simple_query_string: () => getSimpleQueryStringITC(opts),
70+
match: getMatchITC(opts),
71+
match_phrase: getMatchPhraseITC(opts),
72+
match_phrase_prefix: getMatchPhrasePrefixITC(opts),
73+
multi_match: getMultiMatchITC(opts),
74+
common: getCommonITC(opts),
75+
query_string: getQueryStringITC(opts),
76+
simple_query_string: getSimpleQueryStringITC(opts),
7877

7978
// Term queries
80-
exists: () => getExistsITC(opts),
81-
fuzzy: () => getFuzzyITC(opts),
82-
ids: () => getIdsITC(opts),
83-
prefix: () => getPrefixITC(opts),
84-
range: () => getRangeITC(opts),
85-
regexp: () => getRegexpITC(opts),
86-
type: () => getTypeITC(opts),
87-
term: () => getTermITC(opts),
88-
terms: () => getTermsITC(opts),
89-
wildcard: () => getWildcardITC(opts),
79+
exists: getExistsITC(opts),
80+
fuzzy: getFuzzyITC(opts),
81+
ids: getIdsITC(opts),
82+
prefix: getPrefixITC(opts),
83+
range: getRangeITC(opts),
84+
regexp: getRegexpITC(opts),
85+
type: getTypeITC(opts),
86+
term: getTermITC(opts),
87+
terms: getTermsITC(opts),
88+
wildcard: getWildcardITC(opts),
9089

9190
// Geo queries
92-
geo_bounding_box: () => getGeoBoundingBoxITC(opts),
93-
geo_distance: () => getGeoDistanceITC(opts),
94-
geo_polygon: () => getGeoPolygonITC(opts),
95-
geo_shape: () => getGeoShapeITC(opts),
91+
geo_bounding_box: getGeoBoundingBoxITC(opts),
92+
geo_distance: getGeoDistanceITC(opts),
93+
geo_polygon: getGeoPolygonITC(opts),
94+
geo_shape: getGeoShapeITC(opts),
9695

9796
// Specialized queries
98-
more_like_this: () => getMoreLikeThisITC(opts),
99-
percolate: () => getPercolateITC(opts),
100-
script: () => getScriptITC(opts),
97+
more_like_this: getMoreLikeThisITC(opts),
98+
percolate: getPercolateITC(opts),
99+
script: getScriptITC(opts),
101100

102101
// Joining queries
103-
has_child: () => getHasChildITC(opts),
104-
has_parent: () => getHasParentITC(opts),
105-
nested: () => getNestedITC(opts),
106-
parent_id: () => getParentIdITC(opts),
102+
has_child: getHasChildITC(opts),
103+
has_parent: getHasParentITC(opts),
104+
nested: getNestedITC(opts),
105+
parent_id: getParentIdITC(opts),
107106
},
108107
}));
109108
}

‎src/resolvers/search.js

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export default function createSearchResolver<TSource, TContext>(
7878
.removeField(topLevelArgs);
7979
Object.keys(argsConfigMap).forEach(argKey => {
8080
if (topLevelArgs.indexOf(argKey) === -1) {
81+
// $FlowFixMe
8182
delete argsConfigMap[argKey];
8283
}
8384
});

‎src/types/FindByIdOutput.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function getFindByIdOutputTC<TContext>(
1515
_index: 'String',
1616
_type: 'String',
1717
_version: 'Int',
18-
...sourceTC.getFields(),
18+
...(sourceTC.getFields(): any),
1919
},
2020
}));
2121
}

‎src/types/UpdateByIdOutput.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function getUpdateByIdOutputTC<TContext>(
1616
_type: 'String',
1717
_version: 'Int',
1818
result: 'String',
19-
...sourceTC.getFields(),
19+
...(sourceTC.getFields(): any),
2020
},
2121
}));
2222
}

‎src/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export type CommonOpts<TContext = {}> = {
3838

3939
export function prepareCommonOpts<TContext>(
4040
schemaComposer: SchemaComposer<TContext>,
41-
opts: mixed = {}
41+
opts: any = {}
4242
): CommonOpts<TContext> {
4343
return {
4444
schemaComposer,

‎yarn.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -3453,10 +3453,10 @@ flatted@^2.0.0:
34533453
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
34543454
integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
34553455

3456-
flow-bin@0.110.0:
3457-
version "0.110.0"
3458-
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.110.0.tgz#c6c140e239f662839d8f61b64b7b911f12d3306c"
3459-
integrity sha512-mmdEPEMoTuX+mguy/tjRlOlCtPfVdXZQeMgCAsEDVDgWMA5vwWhM2y653OcJiKX38t4gtZ2e/MNVo0qzyYeZDQ==
3456+
flow-bin@0.118.0:
3457+
version "0.118.0"
3458+
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.118.0.tgz#fb706364a58c682d67a2ca7df39396467dc397d1"
3459+
integrity sha512-jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==
34603460

34613461
flush-write-stream@^1.0.0:
34623462
version "1.1.1"
@@ -3772,10 +3772,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
37723772
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
37733773
integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
37743774

3775-
graphql-compose@7.11.0:
3776-
version "7.11.0"
3777-
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.11.0.tgz#77e7435918f7f9a186ae9e939fa2c92c3bb85cdd"
3778-
integrity sha512-vmAaNA4BUM7PBe1PpujLRIsAlx1qjaoAsol1IvGQKBIi8TwdrLnFZEza0O7+AalqbmcP2eqZ5On/pALP/88ZiA==
3775+
graphql-compose@7.12.0:
3776+
version "7.12.0"
3777+
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.12.0.tgz#223e3c811c18e18e153be2c77c632afa3015477a"
3778+
integrity sha512-AbuQl2LfHYWtgVNJd8De2m8+KtJnkIXII8QkuSt2NMsniFc7DUuIp3MBaNPS9pRCA6l1OTGk2labuWRSyXZVlw==
37793779
dependencies:
37803780
graphql-type-json "^0.3.1"
37813781
object-path "^0.11.4"

0 commit comments

Comments
 (0)