Skip to content

Commit ea72e9c

Browse files
ymc9ymc9
authored
chore: bump prisma dependency to 6.0.x (#1896)
1 parent a747d95 commit ea72e9c

File tree

25 files changed

+11364
-4693
lines changed

25 files changed

+11364
-4693
lines changed

‎packages/plugins/openapi/tests/baseline/rpc-3.0.0.baseline.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ components:
180180
$ref: '#/components/schemas/Post_ItemListRelationFilter'
181181
profile:
182182
oneOf:
183-
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
183+
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
184184
- $ref: '#/components/schemas/ProfileWhereInput'
185185
nullable: true
186186
UserOrderByWithRelationInput:
@@ -241,7 +241,7 @@ components:
241241
$ref: '#/components/schemas/Post_ItemListRelationFilter'
242242
profile:
243243
oneOf:
244-
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
244+
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
245245
- $ref: '#/components/schemas/ProfileWhereInput'
246246
nullable: true
247247
UserScalarWhereWithAggregatesInput:
@@ -319,7 +319,7 @@ components:
319319
- type: string
320320
user:
321321
oneOf:
322-
- $ref: '#/components/schemas/UserRelationFilter'
322+
- $ref: '#/components/schemas/UserScalarRelationFilter'
323323
- $ref: '#/components/schemas/UserWhereInput'
324324
ProfileOrderByWithRelationInput:
325325
type: object
@@ -364,7 +364,7 @@ components:
364364
nullable: true
365365
user:
366366
oneOf:
367-
- $ref: '#/components/schemas/UserRelationFilter'
367+
- $ref: '#/components/schemas/UserScalarRelationFilter'
368368
- $ref: '#/components/schemas/UserWhereInput'
369369
ProfileScalarWhereWithAggregatesInput:
370370
type: object
@@ -455,7 +455,7 @@ components:
455455
nullable: true
456456
author:
457457
oneOf:
458-
- $ref: '#/components/schemas/UserNullableRelationFilter'
458+
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
459459
- $ref: '#/components/schemas/UserWhereInput'
460460
nullable: true
461461
Post_ItemOrderByWithRelationInput:
@@ -538,7 +538,7 @@ components:
538538
nullable: true
539539
author:
540540
oneOf:
541-
- $ref: '#/components/schemas/UserNullableRelationFilter'
541+
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
542542
- $ref: '#/components/schemas/UserWhereInput'
543543
nullable: true
544544
Post_ItemScalarWhereWithAggregatesInput:
@@ -951,7 +951,7 @@ components:
951951
$ref: '#/components/schemas/Post_ItemWhereInput'
952952
none:
953953
$ref: '#/components/schemas/Post_ItemWhereInput'
954-
ProfileNullableRelationFilter:
954+
ProfileNullableScalarRelationFilter:
955955
type: object
956956
properties:
957957
is:
@@ -1105,7 +1105,7 @@ components:
11051105
- type: string
11061106
- $ref: '#/components/schemas/NestedStringNullableFilter'
11071107
nullable: true
1108-
UserRelationFilter:
1108+
UserScalarRelationFilter:
11091109
type: object
11101110
properties:
11111111
is:
@@ -1198,7 +1198,7 @@ components:
11981198
oneOf:
11991199
- type: integer
12001200
- $ref: '#/components/schemas/NestedIntFilter'
1201-
UserNullableRelationFilter:
1201+
UserNullableScalarRelationFilter:
12021202
type: object
12031203
properties:
12041204
is:
@@ -2660,14 +2660,14 @@ components:
26602660
- type: string
26612661
- $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
26622662
nullable: true
2663-
UserArgs:
2663+
UserDefaultArgs:
26642664
type: object
26652665
properties:
26662666
select:
26672667
$ref: '#/components/schemas/UserSelect'
26682668
include:
26692669
$ref: '#/components/schemas/UserInclude'
2670-
ProfileArgs:
2670+
ProfileDefaultArgs:
26712671
type: object
26722672
properties:
26732673
select:
@@ -2684,31 +2684,31 @@ components:
26842684
profile:
26852685
oneOf:
26862686
- type: boolean
2687-
- $ref: '#/components/schemas/ProfileArgs'
2687+
- $ref: '#/components/schemas/ProfileDefaultArgs'
26882688
_count:
26892689
oneOf:
26902690
- type: boolean
2691-
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
2691+
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
26922692
ProfileInclude:
26932693
type: object
26942694
properties:
26952695
user:
26962696
oneOf:
26972697
- type: boolean
2698-
- $ref: '#/components/schemas/UserArgs'
2698+
- $ref: '#/components/schemas/UserDefaultArgs'
26992699
Post_ItemInclude:
27002700
type: object
27012701
properties:
27022702
author:
27032703
oneOf:
27042704
- type: boolean
2705-
- $ref: '#/components/schemas/UserArgs'
2705+
- $ref: '#/components/schemas/UserDefaultArgs'
27062706
UserCountOutputTypeSelect:
27072707
type: object
27082708
properties:
27092709
posts:
27102710
type: boolean
2711-
UserCountOutputTypeArgs:
2711+
UserCountOutputTypeDefaultArgs:
27122712
type: object
27132713
properties:
27142714
select:
@@ -2733,11 +2733,11 @@ components:
27332733
profile:
27342734
oneOf:
27352735
- type: boolean
2736-
- $ref: '#/components/schemas/ProfileArgs'
2736+
- $ref: '#/components/schemas/ProfileDefaultArgs'
27372737
_count:
27382738
oneOf:
27392739
- type: boolean
2740-
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
2740+
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
27412741
ProfileSelect:
27422742
type: object
27432743
properties:
@@ -2748,7 +2748,7 @@ components:
27482748
user:
27492749
oneOf:
27502750
- type: boolean
2751-
- $ref: '#/components/schemas/UserArgs'
2751+
- $ref: '#/components/schemas/UserDefaultArgs'
27522752
userId:
27532753
type: boolean
27542754
Post_ItemSelect:
@@ -2765,7 +2765,7 @@ components:
27652765
author:
27662766
oneOf:
27672767
- type: boolean
2768-
- $ref: '#/components/schemas/UserArgs'
2768+
- $ref: '#/components/schemas/UserDefaultArgs'
27692769
authorId:
27702770
type: boolean
27712771
published:

‎packages/plugins/openapi/tests/baseline/rpc-3.1.0.baseline.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ components:
183183
$ref: '#/components/schemas/Post_ItemListRelationFilter'
184184
profile:
185185
oneOf:
186-
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
186+
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
187187
- $ref: '#/components/schemas/ProfileWhereInput'
188188
- type: 'null'
189189
UserOrderByWithRelationInput:
@@ -244,7 +244,7 @@ components:
244244
$ref: '#/components/schemas/Post_ItemListRelationFilter'
245245
profile:
246246
oneOf:
247-
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
247+
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
248248
- $ref: '#/components/schemas/ProfileWhereInput'
249249
- type: 'null'
250250
UserScalarWhereWithAggregatesInput:
@@ -322,7 +322,7 @@ components:
322322
- type: string
323323
user:
324324
oneOf:
325-
- $ref: '#/components/schemas/UserRelationFilter'
325+
- $ref: '#/components/schemas/UserScalarRelationFilter'
326326
- $ref: '#/components/schemas/UserWhereInput'
327327
ProfileOrderByWithRelationInput:
328328
type: object
@@ -367,7 +367,7 @@ components:
367367
- type: 'null'
368368
user:
369369
oneOf:
370-
- $ref: '#/components/schemas/UserRelationFilter'
370+
- $ref: '#/components/schemas/UserScalarRelationFilter'
371371
- $ref: '#/components/schemas/UserWhereInput'
372372
ProfileScalarWhereWithAggregatesInput:
373373
type: object
@@ -458,7 +458,7 @@ components:
458458
- type: 'null'
459459
author:
460460
oneOf:
461-
- $ref: '#/components/schemas/UserNullableRelationFilter'
461+
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
462462
- $ref: '#/components/schemas/UserWhereInput'
463463
- type: 'null'
464464
Post_ItemOrderByWithRelationInput:
@@ -541,7 +541,7 @@ components:
541541
- type: 'null'
542542
author:
543543
oneOf:
544-
- $ref: '#/components/schemas/UserNullableRelationFilter'
544+
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
545545
- $ref: '#/components/schemas/UserWhereInput'
546546
- type: 'null'
547547
Post_ItemScalarWhereWithAggregatesInput:
@@ -959,7 +959,7 @@ components:
959959
$ref: '#/components/schemas/Post_ItemWhereInput'
960960
none:
961961
$ref: '#/components/schemas/Post_ItemWhereInput'
962-
ProfileNullableRelationFilter:
962+
ProfileNullableScalarRelationFilter:
963963
type: object
964964
properties:
965965
is:
@@ -1116,7 +1116,7 @@ components:
11161116
- type: string
11171117
- $ref: '#/components/schemas/NestedStringNullableFilter'
11181118
- type: 'null'
1119-
UserRelationFilter:
1119+
UserScalarRelationFilter:
11201120
type: object
11211121
properties:
11221122
is:
@@ -1212,7 +1212,7 @@ components:
12121212
oneOf:
12131213
- type: integer
12141214
- $ref: '#/components/schemas/NestedIntFilter'
1215-
UserNullableRelationFilter:
1215+
UserNullableScalarRelationFilter:
12161216
type: object
12171217
properties:
12181218
is:
@@ -2689,14 +2689,14 @@ components:
26892689
- type: string
26902690
- $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
26912691
- type: 'null'
2692-
UserArgs:
2692+
UserDefaultArgs:
26932693
type: object
26942694
properties:
26952695
select:
26962696
$ref: '#/components/schemas/UserSelect'
26972697
include:
26982698
$ref: '#/components/schemas/UserInclude'
2699-
ProfileArgs:
2699+
ProfileDefaultArgs:
27002700
type: object
27012701
properties:
27022702
select:
@@ -2713,31 +2713,31 @@ components:
27132713
profile:
27142714
oneOf:
27152715
- type: boolean
2716-
- $ref: '#/components/schemas/ProfileArgs'
2716+
- $ref: '#/components/schemas/ProfileDefaultArgs'
27172717
_count:
27182718
oneOf:
27192719
- type: boolean
2720-
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
2720+
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
27212721
ProfileInclude:
27222722
type: object
27232723
properties:
27242724
user:
27252725
oneOf:
27262726
- type: boolean
2727-
- $ref: '#/components/schemas/UserArgs'
2727+
- $ref: '#/components/schemas/UserDefaultArgs'
27282728
Post_ItemInclude:
27292729
type: object
27302730
properties:
27312731
author:
27322732
oneOf:
27332733
- type: boolean
2734-
- $ref: '#/components/schemas/UserArgs'
2734+
- $ref: '#/components/schemas/UserDefaultArgs'
27352735
UserCountOutputTypeSelect:
27362736
type: object
27372737
properties:
27382738
posts:
27392739
type: boolean
2740-
UserCountOutputTypeArgs:
2740+
UserCountOutputTypeDefaultArgs:
27412741
type: object
27422742
properties:
27432743
select:
@@ -2762,11 +2762,11 @@ components:
27622762
profile:
27632763
oneOf:
27642764
- type: boolean
2765-
- $ref: '#/components/schemas/ProfileArgs'
2765+
- $ref: '#/components/schemas/ProfileDefaultArgs'
27662766
_count:
27672767
oneOf:
27682768
- type: boolean
2769-
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
2769+
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
27702770
ProfileSelect:
27712771
type: object
27722772
properties:
@@ -2777,7 +2777,7 @@ components:
27772777
user:
27782778
oneOf:
27792779
- type: boolean
2780-
- $ref: '#/components/schemas/UserArgs'
2780+
- $ref: '#/components/schemas/UserDefaultArgs'
27812781
userId:
27822782
type: boolean
27832783
Post_ItemSelect:
@@ -2794,7 +2794,7 @@ components:
27942794
author:
27952795
oneOf:
27962796
- type: boolean
2797-
- $ref: '#/components/schemas/UserArgs'
2797+
- $ref: '#/components/schemas/UserDefaultArgs'
27982798
authorId:
27992799
type: boolean
28002800
published:

‎packages/plugins/openapi/tests/openapi-rpc.test.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import OpenAPIParser from '@readme/openapi-parser';
55
import { getLiteral, getObjectLiteral } from '@zenstackhq/sdk';
66
import { Model, Plugin, isPlugin } from '@zenstackhq/sdk/ast';
7-
import { loadZModelAndDmmf, normalizePath } from '@zenstackhq/testtools';
7+
import { loadSchema, loadZModelAndDmmf, normalizePath } from '@zenstackhq/testtools';
88
import fs from 'fs';
99
import path from 'path';
1010
import * as tmp from 'tmp';
@@ -17,11 +17,13 @@ describe('Open API Plugin RPC Tests', () => {
1717
it('run plugin', async () => {
1818
for (const specVersion of ['3.0.0', '3.1.0']) {
1919
for (const omitInputDetails of [true, false]) {
20-
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
20+
const { projectDir } = await loadSchema(
21+
`
2122
plugin openapi {
2223
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
2324
specVersion = '${specVersion}'
2425
omitInputDetails = ${omitInputDetails}
26+
output = '$projectRoot/openapi.yaml'
2527
}
2628
2729
enum role {
@@ -89,18 +91,17 @@ model Bar {
8991
id String @id
9092
@@ignore
9193
}
92-
`);
93-
94-
const { name: output } = tmp.fileSync({ postfix: '.yaml' });
95-
96-
const options = buildOptions(model, modelFile, output);
97-
await generate(model, options, dmmf);
94+
`,
95+
{ provider: 'postgresql', pushDb: false }
96+
);
9897

9998
console.log(
100-
`OpenAPI specification generated for ${specVersion}${omitInputDetails ? ' - omit' : ''}: ${output}`
99+
`OpenAPI specification generated for ${specVersion}${
100+
omitInputDetails ? ' - omit' : ''
101+
}: ${projectDir}/openapi.yaml`
101102
);
102103

103-
const parsed = YAML.parse(fs.readFileSync(output, 'utf-8'));
104+
const parsed = YAML.parse(fs.readFileSync(path.join(projectDir, 'openapi.yaml'), 'utf-8'));
104105
expect(parsed.openapi).toBe(specVersion);
105106
const baseline = YAML.parse(
106107
fs.readFileSync(
@@ -110,7 +111,7 @@ model Bar {
110111
);
111112
expect(parsed).toMatchObject(baseline);
112113

113-
const api = await OpenAPIParser.validate(output);
114+
const api = await OpenAPIParser.validate(path.join(projectDir, 'openapi.yaml'));
114115

115116
expect(api.tags).toEqual(
116117
expect.arrayContaining([

0 commit comments

Comments
 (0)