Skip to content

Commit 7f8a970

Browse files
nodkznodkz
committed
fix: Flowtype definitions for graphql-compose@3.0.0
1 parent d4e4953 commit 7f8a970

File tree

6 files changed

+97
-106
lines changed

6 files changed

+97
-106
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"devDependencies": {
2828
"babel-cli": "^6.26.0",
2929
"babel-eslint": "^8.2.1",
30-
"babel-jest": "^22.2.0",
30+
"babel-jest": "^22.2.2",
3131
"babel-plugin-transform-flow-strip-types": "^6.22.0",
3232
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3333
"babel-plugin-transform-runtime": "^6.23.0",
@@ -41,8 +41,8 @@
4141
"eslint-plugin-prettier": "^2.6.0",
4242
"flow-bin": "^0.65.0",
4343
"graphql": "0.13.0",
44-
"graphql-compose": "^3.0.0-beta.3",
45-
"jest": "^22.2.1",
44+
"graphql-compose": "^3.0.0-beta.5",
45+
"jest": "^22.2.2",
4646
"prettier": "^1.10.2",
4747
"rimraf": "^2.6.2",
4848
"semantic-release": "^12.4.1"

‎src/__tests__/composeWithRelay-test.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ describe('composeWithRelay', () => {
6464
});
6565

6666
it('should resolve globalId in `user.id` field', async () => {
67-
rootQueryTypeComposer.setField(
68-
'user',
69-
userTypeComposer.getResolver('findById').getFieldConfig()
70-
);
67+
rootQueryTypeComposer.setField('user', userTypeComposer.getResolver('findById'));
7168
const schema = new GraphQLSchema({
7269
query: rootQueryTypeComposer.getType(),
7370
});
@@ -83,10 +80,7 @@ describe('composeWithRelay', () => {
8380
});
8481

8582
it('should resolve globalId in `node.id` field', async () => {
86-
rootQueryTypeComposer.setField(
87-
'user',
88-
userTypeComposer.getResolver('findById').getFieldConfig()
89-
);
83+
rootQueryTypeComposer.setField('user', userTypeComposer.getResolver('findById'));
9084
const schema = new GraphQLSchema({
9185
query: rootQueryTypeComposer.getType(),
9286
});
@@ -105,10 +99,7 @@ describe('composeWithRelay', () => {
10599
});
106100

107101
it('should passthru clientMutationId in mutations', async () => {
108-
rootMutationComposer.setField(
109-
'createUser',
110-
userTypeComposer.getResolver('createOne').getFieldConfig()
111-
);
102+
rootMutationComposer.setField('createUser', userTypeComposer.getResolver('createOne'));
112103
const schema = new GraphQLSchema({
113104
query: rootQueryTypeComposer.getType(),
114105
mutation: rootMutationComposer.getType(),

‎src/__tests__/wrapMutationResolver.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import { toGlobalId } from '../globalId';
1313

1414
describe('wrapMutationResolver', () => {
1515
composeWithRelay(userTypeComposer);
16-
const fieldConfig = userTypeComposer.getResolver('createOne').getFieldConfig();
17-
const fieldConfigManyArgsWithInput = userTypeComposer
16+
const fieldConfig: any = userTypeComposer.getResolver('createOne').getFieldConfig();
17+
const fieldConfigManyArgsWithInput: any = userTypeComposer
1818
.getResolver('manyArgsWithInput')
1919
.getFieldConfig();
20-
const fieldConfigManyArgsWithoutInput = userTypeComposer
20+
const fieldConfigManyArgsWithoutInput: any = userTypeComposer
2121
.getResolver('manyArgsWithoutInput')
2222
.getFieldConfig();
2323

‎src/nodeFieldConfig.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { fromGlobalId } from './globalId';
77
import NodeInterface from './nodeInterface';
88

99
export type TypeMapForRelayNode = {
10-
[typeName: string]: { resolver: Resolver<*, *>, tc: TypeComposer },
10+
[typeName: string]: { resolver: Resolver, tc: TypeComposer },
1111
};
1212

1313
// this fieldConfig must be set to RootQuery.node field

‎src/wrapMutationResolver.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ function upperFirst(str: string): string {
2020
return str.charAt(0).toUpperCase() + str.slice(1);
2121
}
2222

23-
export default function wrapMutationResolver<TSource, TContext>(
24-
resolver: Resolver<TSource, TContext>,
23+
export default function wrapMutationResolver(
24+
resolver: Resolver,
2525
opts: WrapMutationResolverOpts
26-
): Resolver<TSource, TContext> {
26+
): Resolver {
2727
const { resolverName, rootTypeName } = opts;
2828

29-
function prepareArgs(newResolver: Resolver<TSource, TContext>) {
29+
function prepareArgs(newResolver: Resolver) {
3030
let ITC: InputTypeComposer;
3131
if (newResolver.args.input && newResolver.args.input.type) {
3232
const inputNamedType = getNamedType(newResolver.args.input.type);

‎yarn.lock‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ babel-helpers@^6.24.1:
552552
babel-runtime "^6.22.0"
553553
babel-template "^6.24.1"
554554

555-
babel-jest@^22.2.0:
556-
version "22.2.0"
557-
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.2.0.tgz#2d04087f5d149585e14f641d529551963fc9b4f8"
555+
babel-jest@^22.2.2:
556+
version "22.2.2"
557+
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.2.2.tgz#eda38dca284e32cc5257f96a9b51351975de4e04"
558558
dependencies:
559559
babel-plugin-istanbul "^4.1.5"
560560
babel-preset-jest "^22.2.0"
@@ -1747,9 +1747,9 @@ expand-range@^1.8.1:
17471747
dependencies:
17481748
fill-range "^2.1.0"
17491749

1750-
expect@^22.2.0:
1751-
version "22.2.0"
1752-
resolved "https://registry.yarnpkg.com/expect/-/expect-22.2.0.tgz#dddcaab2e22ccc9f51e7c1732e0aa723f2f1f2b8"
1750+
expect@^22.2.2:
1751+
version "22.2.2"
1752+
resolved "https://registry.yarnpkg.com/expect/-/expect-22.2.2.tgz#6cb6ae2eeb651a4187b9096de70333a018fab63f"
17531753
dependencies:
17541754
ansi-styles "^3.2.0"
17551755
jest-diff "^22.1.0"
@@ -2112,9 +2112,9 @@ graceful-fs@^4.1.4:
21122112
version "4.1.9"
21132113
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.9.tgz#baacba37d19d11f9d146d3578bc99958c3787e29"
21142114

2115-
graphql-compose@^3.0.0-beta.3:
2116-
version "3.0.0-beta.3"
2117-
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-3.0.0-beta.3.tgz#7b1ee91bcf4cb0ded692db1e2cb93de4c9072ea7"
2115+
graphql-compose@^3.0.0-beta.5:
2116+
version "3.0.0-beta.5"
2117+
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-3.0.0-beta.5.tgz#f7ce749248594dd7479a9cea9acb7cc23aecf830"
21182118
dependencies:
21192119
babel-runtime "^6.26.0"
21202120
object-path "^0.11.4"
@@ -2670,9 +2670,9 @@ jest-changed-files@^22.2.0:
26702670
dependencies:
26712671
throat "^4.0.0"
26722672

2673-
jest-cli@^22.2.1:
2674-
version "22.2.1"
2675-
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.2.1.tgz#f1df6675cd719e0773be77d6314c5f4b1d8af47f"
2673+
jest-cli@^22.2.2:
2674+
version "22.2.2"
2675+
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.2.2.tgz#4431a93a29549da5dcb6d4a41dd03503c9198cd6"
26762676
dependencies:
26772677
ansi-escapes "^3.0.0"
26782678
chalk "^2.0.1"
@@ -2686,18 +2686,18 @@ jest-cli@^22.2.1:
26862686
istanbul-lib-instrument "^1.8.0"
26872687
istanbul-lib-source-maps "^1.2.1"
26882688
jest-changed-files "^22.2.0"
2689-
jest-config "^22.2.1"
2690-
jest-environment-jsdom "^22.2.0"
2689+
jest-config "^22.2.2"
2690+
jest-environment-jsdom "^22.2.2"
26912691
jest-get-type "^22.1.0"
2692-
jest-haste-map "^22.2.0"
2692+
jest-haste-map "^22.2.2"
26932693
jest-message-util "^22.2.0"
26942694
jest-regex-util "^22.1.0"
26952695
jest-resolve-dependencies "^22.1.0"
2696-
jest-runner "^22.2.1"
2697-
jest-runtime "^22.2.1"
2696+
jest-runner "^22.2.2"
2697+
jest-runtime "^22.2.2"
26982698
jest-snapshot "^22.2.0"
2699-
jest-util "^22.2.0"
2700-
jest-worker "^22.2.0"
2699+
jest-util "^22.2.2"
2700+
jest-worker "^22.2.2"
27012701
micromatch "^2.3.11"
27022702
node-notifier "^5.2.1"
27032703
realpath-native "^1.0.0"
@@ -2708,20 +2708,20 @@ jest-cli@^22.2.1:
27082708
which "^1.2.12"
27092709
yargs "^10.0.3"
27102710

2711-
jest-config@^22.2.1:
2712-
version "22.2.1"
2713-
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.2.1.tgz#8617e99cff0544f0a5f254a5dde37f43b5383934"
2711+
jest-config@^22.2.2:
2712+
version "22.2.2"
2713+
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.2.2.tgz#6b8ed615bc51239847d15460086f174dad4a7015"
27142714
dependencies:
27152715
chalk "^2.0.1"
27162716
glob "^7.1.1"
2717-
jest-environment-jsdom "^22.2.0"
2718-
jest-environment-node "^22.2.0"
2717+
jest-environment-jsdom "^22.2.2"
2718+
jest-environment-node "^22.2.2"
27192719
jest-get-type "^22.1.0"
2720-
jest-jasmine2 "^22.2.1"
2720+
jest-jasmine2 "^22.2.2"
27212721
jest-regex-util "^22.1.0"
2722-
jest-resolve "^22.2.0"
2723-
jest-util "^22.2.0"
2724-
jest-validate "^22.2.0"
2722+
jest-resolve "^22.2.2"
2723+
jest-util "^22.2.2"
2724+
jest-validate "^22.2.2"
27252725
pretty-format "^22.1.0"
27262726

27272727
jest-diff@^22.1.0:
@@ -2737,50 +2737,50 @@ jest-docblock@^21.0.0:
27372737
version "21.2.0"
27382738
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
27392739

2740-
jest-docblock@^22.2.0:
2741-
version "22.2.0"
2742-
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.2.0.tgz#4d054eac354751e94a43a0ea2e2fe5c04cc61bbb"
2740+
jest-docblock@^22.2.2:
2741+
version "22.2.2"
2742+
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.2.2.tgz#617f13edb16ec64202002b3c336cd14ae36c0631"
27432743
dependencies:
27442744
detect-newline "^2.1.0"
27452745

2746-
jest-environment-jsdom@^22.2.0:
2747-
version "22.2.0"
2748-
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.2.0.tgz#e9537400cbdef2d1e61d7196f8afa40e826fe9d8"
2746+
jest-environment-jsdom@^22.2.2:
2747+
version "22.2.2"
2748+
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.2.2.tgz#3513ccdccc2bc41daf9cdee199b7069b0d9feebc"
27492749
dependencies:
27502750
jest-mock "^22.2.0"
2751-
jest-util "^22.2.0"
2751+
jest-util "^22.2.2"
27522752
jsdom "^11.5.1"
27532753

2754-
jest-environment-node@^22.2.0:
2755-
version "22.2.0"
2756-
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.2.0.tgz#ba7d0183fac076d34867367a4ac53ced69e3d3a9"
2754+
jest-environment-node@^22.2.2:
2755+
version "22.2.2"
2756+
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.2.2.tgz#570896eef2dd0f939c71bd5712ef4321958c1270"
27572757
dependencies:
27582758
jest-mock "^22.2.0"
2759-
jest-util "^22.2.0"
2759+
jest-util "^22.2.2"
27602760

27612761
jest-get-type@^22.1.0:
27622762
version "22.1.0"
27632763
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
27642764

2765-
jest-haste-map@^22.2.0:
2766-
version "22.2.0"
2767-
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.2.0.tgz#c9f508b8f63322490339ba02343dd688474d9ad5"
2765+
jest-haste-map@^22.2.2:
2766+
version "22.2.2"
2767+
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.2.2.tgz#9d3d5a14bd5e05ab9176979f2a5fbb4ddc80eb20"
27682768
dependencies:
27692769
fb-watchman "^2.0.0"
27702770
graceful-fs "^4.1.11"
2771-
jest-docblock "^22.2.0"
2772-
jest-worker "^22.2.0"
2771+
jest-docblock "^22.2.2"
2772+
jest-worker "^22.2.2"
27732773
micromatch "^2.3.11"
27742774
sane "^2.0.0"
27752775

2776-
jest-jasmine2@^22.2.1:
2777-
version "22.2.1"
2778-
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.2.1.tgz#58d115f3f4a0a186b5e90c5db8ac68aecfc41051"
2776+
jest-jasmine2@^22.2.2:
2777+
version "22.2.2"
2778+
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.2.2.tgz#9065255c8f635ae9dfa33fc66068f59adf53c9aa"
27792779
dependencies:
27802780
callsites "^2.0.0"
27812781
chalk "^2.0.1"
27822782
co "^4.6.0"
2783-
expect "^22.2.0"
2783+
expect "^22.2.2"
27842784
graceful-fs "^4.1.11"
27852785
is-generator-fn "^1.0.0"
27862786
jest-diff "^22.1.0"
@@ -2827,45 +2827,45 @@ jest-resolve-dependencies@^22.1.0:
28272827
dependencies:
28282828
jest-regex-util "^22.1.0"
28292829

2830-
jest-resolve@^22.2.0:
2831-
version "22.2.0"
2832-
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.2.0.tgz#25aa8b887b31ab8c79763503e209d7c136f74ab1"
2830+
jest-resolve@^22.2.2:
2831+
version "22.2.2"
2832+
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.2.2.tgz#6f49d91e3680c86a4d5e5f72ccdab3996d1cbc19"
28332833
dependencies:
28342834
browser-resolve "^1.11.2"
28352835
chalk "^2.0.1"
28362836

2837-
jest-runner@^22.2.1:
2838-
version "22.2.1"
2839-
resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.2.1.tgz#539b2b7eb0ceb34e63a1ca78a1eda46ace70b940"
2837+
jest-runner@^22.2.2:
2838+
version "22.2.2"
2839+
resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.2.2.tgz#17fff27a61b63b58cf104c9cdcc0fdfccd3878ce"
28402840
dependencies:
28412841
exit "^0.1.2"
2842-
jest-config "^22.2.1"
2843-
jest-docblock "^22.2.0"
2844-
jest-haste-map "^22.2.0"
2845-
jest-jasmine2 "^22.2.1"
2842+
jest-config "^22.2.2"
2843+
jest-docblock "^22.2.2"
2844+
jest-haste-map "^22.2.2"
2845+
jest-jasmine2 "^22.2.2"
28462846
jest-leak-detector "^22.1.0"
28472847
jest-message-util "^22.2.0"
2848-
jest-runtime "^22.2.1"
2849-
jest-util "^22.2.0"
2850-
jest-worker "^22.2.0"
2848+
jest-runtime "^22.2.2"
2849+
jest-util "^22.2.2"
2850+
jest-worker "^22.2.2"
28512851
throat "^4.0.0"
28522852

2853-
jest-runtime@^22.2.1:
2854-
version "22.2.1"
2855-
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.2.1.tgz#c5b0173a7f5274b28da30019cf7bb7b8cda68040"
2853+
jest-runtime@^22.2.2:
2854+
version "22.2.2"
2855+
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.2.2.tgz#256d0efb65deae1c23b819d88cec5ab43d7a4ed6"
28562856
dependencies:
28572857
babel-core "^6.0.0"
2858-
babel-jest "^22.2.0"
2858+
babel-jest "^22.2.2"
28592859
babel-plugin-istanbul "^4.1.5"
28602860
chalk "^2.0.1"
28612861
convert-source-map "^1.4.0"
28622862
exit "^0.1.2"
28632863
graceful-fs "^4.1.11"
2864-
jest-config "^22.2.1"
2865-
jest-haste-map "^22.2.0"
2864+
jest-config "^22.2.2"
2865+
jest-haste-map "^22.2.2"
28662866
jest-regex-util "^22.1.0"
2867-
jest-resolve "^22.2.0"
2868-
jest-util "^22.2.0"
2867+
jest-resolve "^22.2.2"
2868+
jest-util "^22.2.2"
28692869
json-stable-stringify "^1.0.1"
28702870
micromatch "^2.3.11"
28712871
realpath-native "^1.0.0"
@@ -2885,39 +2885,39 @@ jest-snapshot@^22.2.0:
28852885
natural-compare "^1.4.0"
28862886
pretty-format "^22.1.0"
28872887

2888-
jest-util@^22.2.0:
2889-
version "22.2.0"
2890-
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.2.0.tgz#afad693641447858bec7b37f32952516bf887262"
2888+
jest-util@^22.2.2:
2889+
version "22.2.2"
2890+
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.2.2.tgz#335484b6aeae0c5a1ae498401630324977fe3465"
28912891
dependencies:
28922892
callsites "^2.0.0"
28932893
chalk "^2.0.1"
28942894
graceful-fs "^4.1.11"
28952895
is-ci "^1.0.10"
28962896
jest-message-util "^22.2.0"
2897-
jest-validate "^22.2.0"
2897+
jest-validate "^22.2.2"
28982898
mkdirp "^0.5.1"
28992899

2900-
jest-validate@^22.2.0:
2901-
version "22.2.0"
2902-
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.2.0.tgz#f7ce459105a8210825e5e57279f868ab080063fa"
2900+
jest-validate@^22.2.2:
2901+
version "22.2.2"
2902+
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.2.2.tgz#9cdce422c93cc28395e907ac6bbc929158d9a6ba"
29032903
dependencies:
29042904
chalk "^2.0.1"
29052905
jest-get-type "^22.1.0"
29062906
leven "^2.1.0"
29072907
pretty-format "^22.1.0"
29082908

2909-
jest-worker@^22.2.0:
2910-
version "22.2.0"
2911-
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.0.tgz#d88d6ee176d6409f206cbbf7b485250793264262"
2909+
jest-worker@^22.2.2:
2910+
version "22.2.2"
2911+
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.2.tgz#c1f5dc39976884b81f68ec50cb8532b2cbab3390"
29122912
dependencies:
29132913
merge-stream "^1.0.1"
29142914

2915-
jest@^22.2.1:
2916-
version "22.2.1"
2917-
resolved "https://registry.yarnpkg.com/jest/-/jest-22.2.1.tgz#fb6524d35bd02968afe3b17f330d6f7207846147"
2915+
jest@^22.2.2:
2916+
version "22.2.2"
2917+
resolved "https://registry.yarnpkg.com/jest/-/jest-22.2.2.tgz#26aca0f5e4eaa76d52f2792b14033a3d1e7be2bd"
29182918
dependencies:
29192919
import-local "^1.0.0"
2920-
jest-cli "^22.2.1"
2920+
jest-cli "^22.2.2"
29212921

29222922
js-tokens@^3.0.0, js-tokens@^3.0.2:
29232923
version "3.0.2"

0 commit comments

Comments
 (0)