fix: several compilation issues with the new "prisma-client" generator

fixes #2243

Author: ymc9

packages/schema/src/plugins/enhancer/enhance/index.ts

@@ -129,13 +129,19 @@ export class EnhancerGenerator {
         }
 
         // `models.ts` for exporting model types
-        const modelsTsContent = [
-            `export * from '${resultPrismaBaseImport}/models';`,
-            `export * from './json-types';`,
-        ].join('\n');
-        const modelsTs = this.project.createSourceFile(path.join(this.outDir, 'models.ts'), modelsTsContent, {
-            overwrite: true,
-        });
+
+        const modelsTsContent = [`export * from '${resultPrismaBaseImport}/models';`];
+        if (this.model.declarations.some((d) => isTypeDef(d))) {
+            modelsTsContent.push(`export * from './json-types';`);
+        }
+
+        const modelsTs = this.project.createSourceFile(
+            path.join(this.outDir, 'models.ts'),
+            modelsTsContent.join('\n'),
+            {
+                overwrite: true,
+            }
+        );
         this.saveSourceFile(modelsTs);
 
         // `enums.ts` for exporting enums
@@ -159,7 +165,8 @@ export class EnhancerGenerator {
         this.saveSourceFile(clientTs);
 
         // `enhance.ts` and `enhance-edge.ts`
-        for (const target of ['node', 'edge'] as const) {
+        const targets = this.isNewPrismaClientGenerator ? (['node'] as const) : (['node', 'edge'] as const);
+        for (const target of targets) {
             this.generateEnhance(prismaImport, `${resultPrismaBaseImport}/client`, needsLogicalClient, target);
         }
 
@@ -596,12 +603,13 @@ export type Enhanced<Client> =
         fs.renameSync(internalFilenameFixed, internalFilename);
 
         // Create a shared file for all JSON fields type definitions
-        const jsonFieldsFile = project.createSourceFile(path.join(this.outDir, 'json-types.ts'), undefined, {
-            overwrite: true,
-        });
-
-        this.generateExtraTypes(jsonFieldsFile);
-        await saveSourceFile(jsonFieldsFile);
+        if (this.model.declarations.some(isTypeDef)) {
+            const jsonFieldsFile = project.createSourceFile(path.join(this.outDir, 'json-types.ts'), undefined, {
+                overwrite: true,
+            });
+            this.generateExtraTypes(jsonFieldsFile);
+            await saveSourceFile(jsonFieldsFile);
+        }
 
         for (const d of this.model.declarations.filter(isDataModel)) {
             const fileName = `${prismaClientDir}/models/${d.name}.ts`;

packages/schema/src/plugins/enhancer/index.ts

@@ -2,6 +2,7 @@ import {
     PluginError,
     RUNTIME_PACKAGE,
     createProject,
+    getPrismaClientGenerator,
     normalizedRelative,
     resolvePath,
     type PluginFunction,
@@ -35,7 +36,8 @@ const run: PluginFunction = async (model, options, _dmmf, globalOptions) => {
             // handle custom output path
 
             // get the absolute path of the prisma client types
-            const prismaClientPathAbs = path.resolve(outDir, 'models');
+            const prismaGenerator = getPrismaClientGenerator(model);
+            const prismaClientPathAbs = path.resolve(outDir, prismaGenerator?.isNewGenerator ? 'client' : 'models');
 
             // resolve it relative to the schema path
             prismaClientPath = normalizedRelative(path.dirname(options.schemaPath), prismaClientPathAbs);

packages/sdk/src/code-gen.ts

@@ -29,7 +29,6 @@ export function saveSourceFile(sourceFile: SourceFile) {
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
     ${sourceFile.getText()}`
     );
@@ -49,11 +48,6 @@ export async function saveProject(project: Project) {
  * Emit a TS project to JS files.
  */
 export async function emitProject(project: Project) {
-    // ignore type checking for all source files
-    for (const sf of project.getSourceFiles()) {
-        sf.insertStatements(0, '// @ts-nocheck');
-    }
-
     const errors = project.getPreEmitDiagnostics().filter((d) => d.getCategory() === DiagnosticCategory.Error);
     if (errors.length > 0) {
         console.error('Error compiling generated code:');