Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
efe65ec
merge dev to main (v2.9.2) (#1882)
ymc9 Nov 22, 2024
f5e4e7c
merge dev to main (v2.9.3) (#1886)
ymc9 Nov 26, 2024
251c699
merge dev to main (v2.9.4) (#1892)
ymc9 Nov 27, 2024
7cc5f00
merge dev to main (v2.10.0) (#1907)
ymc9 Dec 5, 2024
f7f85ea
merge dev to main (v2.10.1) (#1913)
ymc9 Dec 13, 2024
689d013
merge dev to main (v2.10.2) (#1919)
ymc9 Dec 18, 2024
70a81c6
merge dev to main (v2.11.0) (#1943)
ymc9 Jan 7, 2025
4b7d813
merge dev to main (v2.11.1) (#1952)
ymc9 Jan 8, 2025
ba80eda
merge dev to main (v2.11.2) (#1957)
ymc9 Jan 13, 2025
b220213
merge dev to main (v2.11.3) (#1963)
ymc9 Jan 14, 2025
ff393da
merge dev to main (v2.11.4) (#1966)
ymc9 Jan 17, 2025
a1dfdcd
merge dev to main (v2.11.5) (#1973)
ymc9 Jan 29, 2025
584d8af
merge dev to main (v2.11.6) (#1981)
ymc9 Feb 7, 2025
0107e1c
merge dev to main (v2.12.0) (#2013)
ymc9 Feb 25, 2025
8934679
merge dev to main (v2.12.1) (#2026)
ymc9 Mar 4, 2025
d4fb5ab
merge dev to main (v2.12.2) (#2032)
ymc9 Mar 7, 2025
a4acf35
merge dev to main (v2.12.3) (#2043)
ymc9 Mar 13, 2025
8a62f63
merge dev to main (v2.13.0) (#2057)
ymc9 Mar 24, 2025
79197c6
merge dev to main (v2.13.1) (#2068)
ymc9 Apr 4, 2025
c017a40
merge dev to main (v2.13.2) (#2072)
ymc9 Apr 7, 2025
2f69aa8
merge dev to main (v2.13.3) (#2076)
ymc9 Apr 9, 2025
bf9be5c
merge dev to main (v2.14.0) (#2086)
ymc9 Apr 15, 2025
88f8c77
merge dev to main (v2.14.0) (#2091)
ymc9 Apr 15, 2025
3895746
merge dev to main (v2.14.1) (#2110)
ymc9 May 5, 2025
b79a749
merge dev to main (v2.14.2) (#2113)
ymc9 May 8, 2025
53bf340
merge dev to main (v2.15.0) (#2126)
ymc9 May 20, 2025
e835599
merge dev to main (v2.15.0) (#2130)
ymc9 May 21, 2025
d8bc32d
merge dev to main (v2.15.0) (#2132)
ymc9 May 21, 2025
19f4870
merge dev to main (v2.15.1) (#2138)
ymc9 Jun 3, 2025
9596d33
merge dev to main (v2.16.0) (#2156)
ymc9 Jun 21, 2025
b73b3de
merge dev to main (v2.16.1) (#2174)
ymc9 Jul 7, 2025
b199ac2
merge dev to main (v2.17.0) (#2191)
ymc9 Jul 20, 2025
1da7440
merge dev to main (v2.17.1) (#2200)
ymc9 Jul 21, 2025
692b714
merge dev to main (v2.17.2) (#2204)
ymc9 Jul 27, 2025
d70bd9b
merge dev to main (v2.18.0) (#2217)
ymc9 Aug 9, 2025
d8a90cd
merge dev to main (v2.18.0) (#2219)
ymc9 Aug 9, 2025
789e772
merge dev to main (v2.18.1) (#2225)
ymc9 Aug 17, 2025
f8847f8
merge dev to main (v2.19.0) (#2237)
ymc9 Sep 12, 2025
be9c553
merge dev to main (v2.19.1) (#2256)
ymc9 Sep 29, 2025
dfe721c
merge dev to main (v2.19.2) (#2261)
ymc9 Oct 1, 2025
db5e4c6
merge dev to main (v2.20.0) (#2271)
ymc9 Oct 15, 2025
2bebf66
chore: update README (#2272) (#2273)
ymc9 Oct 15, 2025
c9cae5c
merge dev to main (v2.20.1) (#2275)
ymc9 Oct 15, 2025
1b05fec
merge dev to main (v2.21.0) (#2290)
ymc9 Oct 30, 2025
76ef757
merge dev to main (v2.21.1) (#2300)
ymc9 Nov 8, 2025
b53b1cb
merge dev to main (v2.22.0) (#2308)
ymc9 Nov 25, 2025
b8ffbbd
fix(openapi): use ZModel AST array flag for TypeDef[] @json fields
olup Dec 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/plugins/openapi/src/rpc-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,11 @@ export class RPCOpenAPIGenerator extends OpenAPIGeneratorBase {
const field = dataModel.fields.find((f) => f.name === def.name);
if (field?.type.reference?.ref && isTypeDef(field.type.reference.ref)) {
// This Json field references a TypeDef
// Use field.type.array from ZModel AST instead of def.isList from DMMF,
// since Prisma treats TypeDef fields as plain Json and doesn't know about arrays
return this.wrapArray(
this.wrapNullable(this.ref(field.type.reference.ref.name, true), !def.isRequired),
def.isList
field.type.array
);
}
}
Expand Down
59 changes: 59 additions & 0 deletions packages/plugins/openapi/tests/openapi-rpc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,65 @@ model Product {
}
});

it('array of TypeDef with enum directly on model field', async () => {
for (const specVersion of ['3.0.0', '3.1.0']) {
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
plugin openapi {
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
specVersion = '${specVersion}'
}

enum Language {
FR
EN
ES
DE
IT
}

type TranslatedField {
language Language
content String
}

model Article {
id String @id @default(cuid())
title TranslatedField[] @json
description TranslatedField[] @json

@@allow('all', true)
}
`);

const { name: output } = tmp.fileSync({ postfix: '.yaml' });

const options = buildOptions(model, modelFile, output);
await generate(model, options, dmmf);

await OpenAPIParser.validate(output);

const parsed = YAML.parse(fs.readFileSync(output, 'utf-8'));
expect(parsed.openapi).toBe(specVersion);

// Verify TranslatedField TypeDef is generated
expect(parsed.components.schemas.TranslatedField).toBeDefined();

// Verify Language enum is generated
expect(parsed.components.schemas.Language).toBeDefined();

// Verify enum reference inside TranslatedField
expect(parsed.components.schemas.TranslatedField.properties.language.$ref).toBe('#/components/schemas/Language');

// Verify array of TypeDef directly on model field
expect(parsed.components.schemas.Article.properties.title.type).toBe('array');
expect(parsed.components.schemas.Article.properties.title.items.$ref).toBe('#/components/schemas/TranslatedField');

// Verify second array field as well
expect(parsed.components.schemas.Article.properties.description.type).toBe('array');
expect(parsed.components.schemas.Article.properties.description.items.$ref).toBe('#/components/schemas/TranslatedField');
}
});

it('full-text search', async () => {
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
generator js {
Expand Down
Loading