Skip to content
Merged
Changes from 32 commits
Commits
Show all changes
35 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
999fdde
chore: Improve performance for prisma-client generation
mhodgson Jul 8, 2025
3bfa67c
Additional fixes for generated types in Prisma namespace
mhodgson Jul 8, 2025
c882c18
several fixes
ymc9 Jul 14, 2025
6def505
pin test projects to zod3
ymc9 Jul 14, 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
27 changes: 18 additions & 9 deletions packages/schema/src/plugins/enhancer/enhance/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -503,16 +503,13 @@ export type Enhanced<Client> =
for (const d of this.model.declarations.filter(isDataModel)) {
const fileName = `${prismaClientDir}/models/${d.name}.ts`;
const sf = project.addSourceFileAtPath(fileName);
const sfNew = project.createSourceFile(`${prismaClientDir}/models/${d.name}-fixed.ts`, undefined, {
overwrite: true,
});

const syntaxList = sf.getChildren()[0];
if (!Node.isSyntaxList(syntaxList)) {
throw new PluginError(name, `Unexpected syntax list structure in ${fileName}`);
}

sfNew.addStatements('import $Types = runtime.Types;');
const statements = ['import $Types = runtime.Types;'];

// Add import for json-types if this model has JSON type fields
const modelWithJsonFields = this.modelsWithJsonTypeFields.find((m) => m.name === d.name);
Expand All @@ -525,23 +522,35 @@ export type Enhanced<Client> =
const typeNames = [...new Set(jsonFieldTypes.map((field) => field.type.reference!.$refText))];

if (typeNames.length > 0) {
sfNew.addStatements(`import type { ${typeNames.join(', ')} } from "../../json-types";`);
statements.push(`import type { ${typeNames.join(', ')} } from "../../json-types";`);
}
}

syntaxList.getChildren().forEach((node) => {
if (Node.isInterfaceDeclaration(node)) {
sfNew.addInterface(this.transformInterface(node, delegateInfo));
statements.push(this.transformInterface(node, delegateInfo));
} else if (Node.isTypeAliasDeclaration(node)) {
sfNew.addTypeAlias(this.transformTypeAlias(node, delegateInfo));
statements.push(this.transformTypeAlias(node, delegateInfo));
} else {
sfNew.addStatements(node.getText());
statements.push(node.getText());
}
});

await sfNew.move(sf.getFilePath(), { overwrite: true });
const structure = sf.getStructure();
structure.statements = statements;

const sfNew = project.createSourceFile(`${prismaClientDir}/models/${d.name}-fixed.ts`, structure, {
overwrite: true,
});
await sfNew.save();
}

for (const d of this.model.declarations.filter(isDataModel)) {
const fixedFileName = `${prismaClientDir}/models/${d.name}-fixed.ts`;
const fileName = `${prismaClientDir}/models/${d.name}.ts`;

fs.renameSync(fixedFileName, fileName);
}
}

private transformPrismaTypes(sf: SourceFile, sfNew: SourceFile, delegateInfo: DelegateInfo) {
Expand Down