Skip to content

Commit 17feaca

Browse files
committed
deps: update "graphql" to 16.3.0
1 parent 25a7a8b commit 17feaca

File tree

5 files changed

+125
-33
lines changed

5 files changed

+125
-33
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.18.0
1+
v12.22.0

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"chalk": "4.1.1",
7272
"chokidar": "^3.4.2",
7373
"cookie": "^0.4.2",
74-
"graphql": "^15.5.1",
74+
"graphql": "^16.3.0",
7575
"headers-utils": "^3.0.2",
7676
"inquirer": "^8.2.0",
7777
"is-node-process": "^1.0.1",

src/graphql.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DocumentNode } from 'graphql'
1+
import { DocumentNode, OperationTypeNode } from 'graphql'
22
import { ResponseResolver } from './handlers/RequestHandler'
33
import {
44
GraphQLHandler,
@@ -83,7 +83,7 @@ const standardGraphQLHandlers = {
8383
* })
8484
* @see {@link https://mswjs.io/docs/api/graphql/query `graphql.query()`}
8585
*/
86-
query: createScopedGraphQLHandler('query', '*'),
86+
query: createScopedGraphQLHandler(OperationTypeNode.QUERY, '*'),
8787

8888
/**
8989
* Captures a GraphQL mutation by a given name.
@@ -93,14 +93,14 @@ const standardGraphQLHandlers = {
9393
* })
9494
* @see {@link https://mswjs.io/docs/api/graphql/mutation `graphql.mutation()`}
9595
*/
96-
mutation: createScopedGraphQLHandler('mutation', '*'),
96+
mutation: createScopedGraphQLHandler(OperationTypeNode.MUTATION, '*'),
9797
}
9898

9999
function createGraphQLLink(url: Path): typeof standardGraphQLHandlers {
100100
return {
101101
operation: createGraphQLOperationHandler(url),
102-
query: createScopedGraphQLHandler('query', url),
103-
mutation: createScopedGraphQLHandler('mutation', url),
102+
query: createScopedGraphQLHandler(OperationTypeNode.QUERY, url),
103+
mutation: createScopedGraphQLHandler(OperationTypeNode.MUTATION, url),
104104
}
105105
}
106106

src/handlers/GraphQLHandler.test.ts

Lines changed: 114 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @jest-environment jsdom
33
*/
4-
import { parse } from 'graphql'
4+
import { OperationTypeNode, parse } from 'graphql'
55
import { Headers } from 'headers-utils/lib'
66
import { context } from '..'
77
import { createMockedRequest } from '../../test/support/utils'
@@ -70,15 +70,25 @@ const LOGIN = `
7070

7171
describe('info', () => {
7272
test('exposes request handler information for query', () => {
73-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
73+
const handler = new GraphQLHandler(
74+
OperationTypeNode.QUERY,
75+
'GetUser',
76+
'*',
77+
resolver,
78+
)
7479

7580
expect(handler.info.header).toEqual('query GetUser (origin: *)')
7681
expect(handler.info.operationType).toEqual('query')
7782
expect(handler.info.operationName).toEqual('GetUser')
7883
})
7984

8085
test('exposes request handler information for mutation', () => {
81-
const handler = new GraphQLHandler('mutation', 'Login', '*', resolver)
86+
const handler = new GraphQLHandler(
87+
OperationTypeNode.MUTATION,
88+
'Login',
89+
'*',
90+
resolver,
91+
)
8292

8393
expect(handler.info.header).toEqual('mutation Login (origin: *)')
8494
expect(handler.info.operationType).toEqual('mutation')
@@ -94,7 +104,12 @@ describe('info', () => {
94104
}
95105
`)
96106

97-
const handler = new GraphQLHandler('query', node, '*', resolver)
107+
const handler = new GraphQLHandler(
108+
OperationTypeNode.QUERY,
109+
node,
110+
'*',
111+
resolver,
112+
)
98113

99114
expect(handler.info).toHaveProperty('header', 'query GetUser (origin: *)')
100115
expect(handler.info).toHaveProperty('operationType', 'query')
@@ -109,7 +124,12 @@ describe('info', () => {
109124
}
110125
}
111126
`)
112-
const handler = new GraphQLHandler('mutation', node, '*', resolver)
127+
const handler = new GraphQLHandler(
128+
OperationTypeNode.MUTATION,
129+
node,
130+
'*',
131+
resolver,
132+
)
113133

114134
expect(handler.info).toHaveProperty('header', 'mutation Login (origin: *)')
115135
expect(handler.info).toHaveProperty('operationType', 'mutation')
@@ -125,7 +145,9 @@ describe('info', () => {
125145
}
126146
`)
127147

128-
expect(() => new GraphQLHandler('query', node, '*', resolver)).toThrow(
148+
expect(
149+
() => new GraphQLHandler(OperationTypeNode.QUERY, node, '*', resolver),
150+
).toThrow(
129151
'Failed to create a GraphQL handler: provided a DocumentNode with a mismatched operation type (expected "query", but got "mutation").',
130152
)
131153
})
@@ -134,7 +156,12 @@ describe('info', () => {
134156
describe('parse', () => {
135157
describe('query', () => {
136158
test('parses a query without variables (GET)', () => {
137-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
159+
const handler = new GraphQLHandler(
160+
OperationTypeNode.QUERY,
161+
'GetUser',
162+
'*',
163+
resolver,
164+
)
138165
const request = createGetGraphQLRequest({
139166
query: GET_USER,
140167
})
@@ -147,7 +174,12 @@ describe('parse', () => {
147174
})
148175

149176
test('parses a query with variables (GET)', () => {
150-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
177+
const handler = new GraphQLHandler(
178+
OperationTypeNode.QUERY,
179+
'GetUser',
180+
'*',
181+
resolver,
182+
)
151183
const request = createGetGraphQLRequest({
152184
query: GET_USER,
153185
variables: {
@@ -165,7 +197,12 @@ describe('parse', () => {
165197
})
166198

167199
test('parses a query without variables (POST)', () => {
168-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
200+
const handler = new GraphQLHandler(
201+
OperationTypeNode.QUERY,
202+
'GetUser',
203+
'*',
204+
resolver,
205+
)
169206
const request = createPostGraphQLRequest({
170207
query: GET_USER,
171208
})
@@ -178,7 +215,12 @@ describe('parse', () => {
178215
})
179216

180217
test('parses a query with variables (POST)', () => {
181-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
218+
const handler = new GraphQLHandler(
219+
OperationTypeNode.QUERY,
220+
'GetUser',
221+
'*',
222+
resolver,
223+
)
182224
const request = createPostGraphQLRequest({
183225
query: GET_USER,
184226
variables: {
@@ -198,7 +240,12 @@ describe('parse', () => {
198240

199241
describe('mutation', () => {
200242
test('parses a mutation without variables (GET)', () => {
201-
const handler = new GraphQLHandler('mutation', 'GetUser', '*', resolver)
243+
const handler = new GraphQLHandler(
244+
OperationTypeNode.MUTATION,
245+
'GetUser',
246+
'*',
247+
resolver,
248+
)
202249
const request = createGetGraphQLRequest({
203250
query: LOGIN,
204251
})
@@ -211,7 +258,12 @@ describe('parse', () => {
211258
})
212259

213260
test('parses a mutation with variables (GET)', () => {
214-
const handler = new GraphQLHandler('mutation', 'GetUser', '*', resolver)
261+
const handler = new GraphQLHandler(
262+
OperationTypeNode.MUTATION,
263+
'GetUser',
264+
'*',
265+
resolver,
266+
)
215267
const request = createGetGraphQLRequest({
216268
query: LOGIN,
217269
variables: {
@@ -229,7 +281,12 @@ describe('parse', () => {
229281
})
230282

231283
test('parses a mutation without variables (POST)', () => {
232-
const handler = new GraphQLHandler('mutation', 'GetUser', '*', resolver)
284+
const handler = new GraphQLHandler(
285+
OperationTypeNode.MUTATION,
286+
'GetUser',
287+
'*',
288+
resolver,
289+
)
233290
const request = createPostGraphQLRequest({
234291
query: LOGIN,
235292
})
@@ -242,7 +299,12 @@ describe('parse', () => {
242299
})
243300

244301
test('parses a mutation with variables (POST)', () => {
245-
const handler = new GraphQLHandler('mutation', 'GetUser', '*', resolver)
302+
const handler = new GraphQLHandler(
303+
OperationTypeNode.MUTATION,
304+
'GetUser',
305+
'*',
306+
resolver,
307+
)
246308
const request = createPostGraphQLRequest({
247309
query: LOGIN,
248310
variables: {
@@ -263,7 +325,12 @@ describe('parse', () => {
263325

264326
describe('predicate', () => {
265327
test('respects operation type', () => {
266-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
328+
const handler = new GraphQLHandler(
329+
OperationTypeNode.QUERY,
330+
'GetUser',
331+
'*',
332+
resolver,
333+
)
267334
const request = createPostGraphQLRequest({
268335
query: GET_USER,
269336
})
@@ -278,7 +345,12 @@ describe('predicate', () => {
278345
})
279346

280347
test('respects operation name', () => {
281-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
348+
const handler = new GraphQLHandler(
349+
OperationTypeNode.QUERY,
350+
'GetUser',
351+
'*',
352+
resolver,
353+
)
282354
const request = createPostGraphQLRequest({
283355
query: GET_USER,
284356
})
@@ -316,7 +388,7 @@ describe('predicate', () => {
316388

317389
test('respects custom endpoint', () => {
318390
const handler = new GraphQLHandler(
319-
'query',
391+
OperationTypeNode.QUERY,
320392
'GetUser',
321393
'https://api.github.com/graphql',
322394
resolver,
@@ -340,7 +412,12 @@ describe('predicate', () => {
340412

341413
describe('test', () => {
342414
test('respects operation type', () => {
343-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
415+
const handler = new GraphQLHandler(
416+
OperationTypeNode.QUERY,
417+
'GetUser',
418+
'*',
419+
resolver,
420+
)
344421
const request = createPostGraphQLRequest({
345422
query: GET_USER,
346423
})
@@ -353,7 +430,12 @@ describe('test', () => {
353430
})
354431

355432
test('respects operation name', () => {
356-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
433+
const handler = new GraphQLHandler(
434+
OperationTypeNode.QUERY,
435+
'GetUser',
436+
'*',
437+
resolver,
438+
)
357439
const request = createPostGraphQLRequest({
358440
query: GET_USER,
359441
})
@@ -373,7 +455,7 @@ describe('test', () => {
373455

374456
test('respects custom endpoint', () => {
375457
const handler = new GraphQLHandler(
376-
'query',
458+
OperationTypeNode.QUERY,
377459
'GetUser',
378460
'https://api.github.com/graphql',
379461
resolver,
@@ -395,7 +477,12 @@ describe('test', () => {
395477

396478
describe('run', () => {
397479
test('returns a mocked response given a matching query', async () => {
398-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
480+
const handler = new GraphQLHandler(
481+
OperationTypeNode.QUERY,
482+
'GetUser',
483+
'*',
484+
resolver,
485+
)
399486
const request = createPostGraphQLRequest({
400487
query: GET_USER,
401488
variables: {
@@ -428,7 +515,12 @@ describe('run', () => {
428515
})
429516

430517
test('returns null given a non-matching query', async () => {
431-
const handler = new GraphQLHandler('query', 'GetUser', '*', resolver)
518+
const handler = new GraphQLHandler(
519+
OperationTypeNode.QUERY,
520+
'GetUser',
521+
'*',
522+
resolver,
523+
)
432524
const request = createPostGraphQLRequest({
433525
query: LOGIN,
434526
})

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5040,10 +5040,10 @@ graceful-fs@^4.2.9:
50405040
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
50415041
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
50425042

5043-
graphql@^15.5.1:
5044-
version "15.5.1"
5045-
resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad"
5046-
integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==
5043+
graphql@^16.3.0:
5044+
version "16.3.0"
5045+
resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.3.0.tgz#a91e24d10babf9e60c706919bb182b53ccdffc05"
5046+
integrity sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==
50475047

50485048
growly@^1.3.0:
50495049
version "1.3.0"

0 commit comments

Comments
 (0)