Skip to content

Commit 9834420

Browse files
TriPSsTriPSs
committed
Merge branch 'master' into improvements
2 parents 84eb87e + 6f9c1a2 commit 9834420

File tree

9 files changed

+44
-43
lines changed

9 files changed

+44
-43
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"eslint-plugin-tsdoc": "0.2.17",
8989
"graphql": "16.9.0",
9090
"graphql-query-complexity": "1.0.0",
91-
"graphql-subscriptions": "2.0.0",
91+
"graphql-subscriptions": "^3.0.0",
9292
"graphql-tools": "9.0.1",
9393
"husky": "9.1.5",
9494
"jest": "29.7.0",
@@ -113,7 +113,7 @@
113113
"ts-node": "10.9.2",
114114
"tsconfig-extends": "1.0.1",
115115
"tsconfig-paths": "4.2.0",
116-
"typescript": "5.5.4"
116+
"typescript": "^5.7.2"
117117
},
118118
"packageManager": "[email protected]"
119119
}

‎packages/query-graphql/__tests__/resolvers/create.resolver.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { anything, deepEqual, instance, mock, objectContaining, verify, when } f
1414
import { CreatedEvent } from '../../src/resolvers/create.resolver'
1515
import { EventType, getDTOEventName } from '../../src/subscription'
1616
import { createResolverFromNest, generateSchema, TestResolverDTO, TestResolverInputDTO, TestService } from '../__fixtures__'
17+
import { PubSubAsyncIterableIterator } from 'graphql-subscriptions/dist/pubsub-async-iterable-iterator'
1718

1819
describe('CreateResolver', () => {
1920
const expectResolverSDL = async (opts?: CreateResolverOpts<TestResolverDTO>) => {
@@ -307,11 +308,11 @@ describe('CreateResolver', () => {
307308
stringField: 'foo'
308309
}
309310
}
310-
const mockIterator = mock<AsyncIterator<CreatedEvent<TestResolverDTO>>>()
311-
when(mockPubSub.asyncIterator(eventName)).thenReturn(instance(mockIterator))
311+
const mockIterator = mock<PubSubAsyncIterableIterator<CreatedEvent<TestResolverDTO>>>()
312+
when(mockPubSub.asyncIterableIterator(eventName)).thenReturn(instance(mockIterator))
312313
when(mockIterator.next()).thenResolve({ done: false, value: event })
313314
const result = await resolver.createdSubscription().next()
314-
verify(mockPubSub.asyncIterator(eventName)).once()
315+
verify(mockPubSub.asyncIterableIterator(eventName)).once()
315316
return expect(result).toEqual({
316317
done: false,
317318
value: event

‎packages/query-graphql/__tests__/resolvers/delete.resolver.spec.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { DeleteManyInputType, DeleteOneInputType, DeleteResolver, DeleteResolver
77
import { DeletedEvent } from '../../src/resolvers/delete.resolver'
88
import { EventType, getDTOEventName } from '../../src/subscription'
99
import { createResolverFromNest, generateSchema, TestResolverDTO, TestService } from '../__fixtures__'
10+
import { PubSubAsyncIterableIterator } from 'graphql-subscriptions/dist/pubsub-async-iterable-iterator'
1011

1112
describe('DeleteResolver', () => {
1213
const expectResolverSDL = async (opts?: DeleteResolverOpts<TestResolverDTO>) => {
@@ -341,14 +342,14 @@ describe('DeleteResolver', () => {
341342
stringField: 'foo'
342343
}
343344
}
344-
const mockIterator = mock<AsyncIterator<DeletedEvent<TestResolverDTO>>>()
345+
const mockIterator = mock<PubSubAsyncIterableIterator<DeletedEvent<TestResolverDTO>>>()
345346

346-
when(mockPubSub.asyncIterator(eventName)).thenReturn(instance(mockIterator))
347+
when(mockPubSub.asyncIterableIterator(eventName)).thenReturn(instance(mockIterator))
347348
when(mockIterator.next()).thenResolve({ done: false, value: event })
348349

349350
const result = await resolver.deletedOneSubscription().next()
350351

351-
verify(mockPubSub.asyncIterator(eventName)).once()
352+
verify(mockPubSub.asyncIterableIterator(eventName)).once()
352353

353354
return expect(result).toEqual({
354355
done: false,
@@ -379,14 +380,14 @@ describe('DeleteResolver', () => {
379380
const { resolver, mockPubSub } = await createTestResolver({ enableSubscriptions: true })
380381
const eventName = getDTOEventName(EventType.DELETED_MANY, TestResolverDTO)
381382
const event: DeleteManyResponse = { deletedCount: 1 }
382-
const mockIterator = mock<AsyncIterator<DeleteManyResponse>>()
383+
const mockIterator = mock<PubSubAsyncIterableIterator<DeleteManyResponse>>()
383384

384-
when(mockPubSub.asyncIterator(eventName)).thenReturn(instance(mockIterator))
385+
when(mockPubSub.asyncIterableIterator(eventName)).thenReturn(instance(mockIterator))
385386
when(mockIterator.next()).thenResolve({ done: false, value: event })
386387

387388
const result = await resolver.deletedManySubscription().next()
388389

389-
verify(mockPubSub.asyncIterator(eventName)).once()
390+
verify(mockPubSub.asyncIterableIterator(eventName)).once()
390391

391392
return expect(result).toEqual({
392393
done: false,

‎packages/query-graphql/__tests__/resolvers/update.resolver.spec.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { anything, deepEqual, instance, mock, objectContaining, verify, when } f
1414
import { UpdatedEvent } from '../../src/resolvers/update.resolver'
1515
import { EventType, getDTOEventName } from '../../src/subscription'
1616
import { createResolverFromNest, generateSchema, TestResolverDTO, TestResolverInputDTO, TestService } from '../__fixtures__'
17+
import { PubSubAsyncIterableIterator } from 'graphql-subscriptions/dist/pubsub-async-iterable-iterator'
1718

1819
describe('UpdateResolver', () => {
1920
const expectResolverSDL = async (opts?: UpdateResolverOpts<TestResolverDTO>) => {
@@ -361,11 +362,11 @@ describe('UpdateResolver', () => {
361362
stringField: 'foo'
362363
}
363364
}
364-
const mockIterator = mock<AsyncIterator<UpdatedEvent<TestResolverDTO>>>()
365-
when(mockPubSub.asyncIterator(eventName)).thenReturn(instance(mockIterator))
365+
const mockIterator = mock<PubSubAsyncIterableIterator<UpdatedEvent<TestResolverDTO>>>()
366+
when(mockPubSub.asyncIterableIterator(eventName)).thenReturn(instance(mockIterator))
366367
when(mockIterator.next()).thenResolve({ done: false, value: event })
367368
const result = await resolver.updatedOneSubscription().next()
368-
verify(mockPubSub.asyncIterator(eventName)).once()
369+
verify(mockPubSub.asyncIterableIterator(eventName)).once()
369370
return expect(result).toEqual({
370371
done: false,
371372
value: event
@@ -395,11 +396,11 @@ describe('UpdateResolver', () => {
395396
const { resolver, mockPubSub } = await createTestResolver({ enableSubscriptions: true })
396397
const eventName = getDTOEventName(EventType.UPDATED_MANY, TestResolverDTO)
397398
const event: UpdateManyResponse = { updatedCount: 1 }
398-
const mockIterator = mock<AsyncIterator<UpdateManyResponse>>()
399-
when(mockPubSub.asyncIterator(eventName)).thenReturn(instance(mockIterator))
399+
const mockIterator = mock<PubSubAsyncIterableIterator<UpdateManyResponse>>()
400+
when(mockPubSub.asyncIterableIterator(eventName)).thenReturn(instance(mockIterator))
400401
when(mockIterator.next()).thenResolve({ done: false, value: event })
401402
const result = await resolver.updatedManySubscription().next()
402-
verify(mockPubSub.asyncIterator(eventName)).once()
403+
verify(mockPubSub.asyncIterableIterator(eventName)).once()
403404
return expect(result).toEqual({
404405
done: false,
405406
value: event

‎packages/query-graphql/src/resolvers/create.resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export const Creatable =
191191
}
192192

193193
const eventName = getSubscriptionEventName(createdEvent, authorizeFilter)
194-
return this.pubSub.asyncIterator<CreatedEvent<DTO>>(eventName)
194+
return this.pubSub.asyncIterableIterator<CreatedEvent<DTO>>(eventName)
195195
}
196196
}
197197

‎packages/query-graphql/src/resolvers/delete.resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export const Deletable =
199199
throw new Error(`Unable to subscribe to ${deletedOneEvent}`)
200200
}
201201
const eventName = getSubscriptionEventName(deletedOneEvent, authorizeFilter)
202-
return this.pubSub.asyncIterator(eventName)
202+
return this.pubSub.asyncIterableIterator(eventName)
203203
}
204204

205205
@ResolverSubscription(() => DMR, { name: deletedManyEvent }, commonResolverOpts, {
@@ -214,7 +214,7 @@ export const Deletable =
214214
throw new Error(`Unable to subscribe to ${deletedManyEvent}`)
215215
}
216216
const eventName = getSubscriptionEventName(deletedManyEvent, authorizeFilter)
217-
return this.pubSub.asyncIterator(eventName)
217+
return this.pubSub.asyncIterableIterator(eventName)
218218
}
219219
}
220220

‎packages/query-graphql/src/resolvers/update.resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export const Updateable =
204204
throw new Error(`Unable to subscribe to ${updateOneEvent}`)
205205
}
206206
const eventName = getSubscriptionEventName(updateOneEvent, authorizeFilter)
207-
return this.pubSub.asyncIterator(eventName)
207+
return this.pubSub.asyncIterableIterator(eventName)
208208
}
209209

210210
@ResolverSubscription(() => UMR, { name: updateManyEvent }, commonResolverOpts, {
@@ -219,7 +219,7 @@ export const Updateable =
219219
throw new Error(`Unable to subscribe to ${updateManyEvent}`)
220220
}
221221
const eventName = getSubscriptionEventName(updateManyEvent, authorizeFilter)
222-
return this.pubSub.asyncIterator(eventName)
222+
return this.pubSub.asyncIterableIterator(eventName)
223223
}
224224
}
225225

‎packages/query-graphql/src/subscription/pub-sub.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ export interface GraphQLPubSub {
88
// eslint-disable-next-line @typescript-eslint/no-explicit-any
99
unsubscribe(subId: number): any
1010

11-
asyncIterator<T>(triggers: string | string[]): AsyncIterator<T>
11+
asyncIterableIterator<T>(triggers: string | string[]): AsyncIterator<T>
1212
}

‎yarn.lock

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11177,14 +11177,12 @@ __metadata:
1117711177
languageName: node
1117811178
linkType: hard
1117911179

11180-
"graphql-subscriptions@npm:2.0.0":
11181-
version: 2.0.0
11182-
resolution: "graphql-subscriptions@npm:2.0.0"
11183-
dependencies:
11184-
iterall: "npm:^1.3.0"
11180+
"graphql-subscriptions@npm:^3.0.0":
11181+
version: 3.0.0
11182+
resolution: "graphql-subscriptions@npm:3.0.0"
1118511183
peerDependencies:
1118611184
graphql: ^15.7.2 || ^16.0.0
11187-
checksum: 10/fcf47bd8cef90f3d38f07b49b4b0e70514c22d56e3604a6cde03a250d3129a6c5b3e8420953a6fe5dab68e48d092a4d13fa39bcc61610bdd6c4a0804b9ee2f82
11185+
checksum: 10/9dbee94d1f8a8742631e6deba33fed4a688b893bb5e287c346b5d01a237b80f96eb4ed2576a3b44c608e553cfd1f2cb400f88b0ffc882cb4effaa4db789f1ce0
1118811186
languageName: node
1118911187
linkType: hard
1119011188

@@ -12709,7 +12707,7 @@ __metadata:
1270912707
languageName: node
1271012708
linkType: hard
1271112709

12712-
"iterall@npm:1.3.0, iterall@npm:^1.2.1, iterall@npm:^1.3.0":
12710+
"iterall@npm:1.3.0, iterall@npm:^1.2.1":
1271312711
version: 1.3.0
1271412712
resolution: "iterall@npm:1.3.0"
1271512713
checksum: 10/700c3e9ae194a00b66dc8dcb449195f84add4e64afaf7ed624177e19565393f9bddd34d621ea70c8eceab87a8536fc0e45bb1c9d1ea7c710d41ed0c3d937b19f
@@ -15435,11 +15433,11 @@ __metadata:
1543515433
linkType: hard
1543615434

1543715435
"nanoid@npm:^3.3.7":
15438-
version: 3.3.7
15439-
resolution: "nanoid@npm:3.3.7"
15436+
version: 3.3.8
15437+
resolution: "nanoid@npm:3.3.8"
1544015438
bin:
1544115439
nanoid: bin/nanoid.cjs
15442-
checksum: 10/ac1eb60f615b272bccb0e2b9cd933720dad30bf9708424f691b8113826bb91aca7e9d14ef5d9415a6ba15c266b37817256f58d8ce980c82b0ba3185352565679
15440+
checksum: 10/2d1766606cf0d6f47b6f0fdab91761bb81609b2e3d367027aff45e6ee7006f660fb7e7781f4a34799fe6734f1268eeed2e37a5fdee809ade0c2d4eb11b0f9c40
1544315441
languageName: node
1544415442
linkType: hard
1544515443

@@ -15556,7 +15554,7 @@ __metadata:
1555615554
eslint-plugin-tsdoc: "npm:0.2.17"
1555715555
graphql: "npm:16.9.0"
1555815556
graphql-query-complexity: "npm:1.0.0"
15559-
graphql-subscriptions: "npm:2.0.0"
15557+
graphql-subscriptions: "npm:^3.0.0"
1556015558
graphql-tools: "npm:9.0.1"
1556115559
husky: "npm:9.1.5"
1556215560
jest: "npm:29.7.0"
@@ -15587,7 +15585,7 @@ __metadata:
1558715585
tsconfig-paths: "npm:4.2.0"
1558815586
tslib: "npm:^2.6.3"
1558915587
typeorm: "npm:0.3.17"
15590-
typescript: "npm:5.5.4"
15588+
typescript: "npm:^5.7.2"
1559115589
languageName: unknown
1559215590
linkType: soft
1559315591

@@ -20334,13 +20332,13 @@ __metadata:
2033420332
languageName: node
2033520333
linkType: hard
2033620334

20337-
"typescript@npm:5.5.4":
20338-
version: 5.5.4
20339-
resolution: "typescript@npm:5.5.4"
20335+
"typescript@npm:^5.7.2":
20336+
version: 5.7.2
20337+
resolution: "typescript@npm:5.7.2"
2034020338
bin:
2034120339
tsc: bin/tsc
2034220340
tsserver: bin/tsserver
20343-
checksum: 10/1689ccafef894825481fc3d856b4834ba3cc185a9c2878f3c76a9a1ef81af04194849840f3c69e7961e2312771471bb3b460ca92561e1d87599b26c37d0ffb6f
20341+
checksum: 10/4caa3904df69db9d4a8bedc31bafc1e19ffb7b24fbde2997a1633ae1398d0de5bdbf8daf602ccf3b23faddf1aeeb9b795223a2ed9c9a4fdcaf07bfde114a401a
2034420342
languageName: node
2034520343
linkType: hard
2034620344

@@ -20364,13 +20362,13 @@ __metadata:
2036420362
languageName: node
2036520363
linkType: hard
2036620364

20367-
"typescript@patch:typescript@npm%3A5.5.4#optional!builtin<compat/typescript>":
20368-
version: 5.5.4
20369-
resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin<compat/typescript>::version=5.5.4&hash=379a07"
20365+
"typescript@patch:typescript@npm%3A^5.7.2#optional!builtin<compat/typescript>":
20366+
version: 5.7.2
20367+
resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin<compat/typescript>::version=5.7.2&hash=74658d"
2037020368
bin:
2037120369
tsc: bin/tsc
2037220370
tsserver: bin/tsserver
20373-
checksum: 10/746fdd0865c5ce4f15e494c57ede03a9e12ede59cfdb40da3a281807853fe63b00ef1c912d7222143499aa82f18b8b472baa1830df8804746d09b55f6cf5b1cc
20371+
checksum: 10/ff27fc124bceb8969be722baa38af945b2505767cf794de3e2715e58f61b43780284060287d651fcbbdfb6f917f4653b20f4751991f17e0706db389b9bb3f75d
2037420372
languageName: node
2037520373
linkType: hard
2037620374

0 commit comments

Comments
 (0)