fix #99

examples/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "compilerOptions": {
-    "sourceMap": true,
-    "outDir": "dist",
-    "strict": true,
-    "lib": ["esnext"],
-    "esModuleInterop": true
-  }
+	"compilerOptions": {
+		"sourceMap": true,
+		"outDir": "dist",
+		"strict": true,
+		"lib": ["esnext"],
+		"esModuleInterop": true
+	}
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zod-prisma",
-	"version": "0.5.4",
+	"version": "0.5.5",
 	"description": "A Prisma generator that creates Zod schemas for all of your models",
 	"license": "MIT",
 	"author": "Carter Grimmeisen",
@@ -52,24 +52,24 @@
 		"testEnvironment": "node"
 	},
 	"dependencies": {
-		"@prisma/generator-helper": "~3.8.1",
+		"@prisma/generator-helper": "~3.10.0",
 		"parenthesis": "^3.1.8",
-		"ts-morph": "^13.0.2"
+		"ts-morph": "^13.0.3"
 	},
 	"devDependencies": {
-		"@prisma/client": "~3.8.1",
-		"@prisma/sdk": "~3.7.0",
+		"@prisma/client": "~3.10.0",
+		"@prisma/sdk": "~3.10.0",
 		"@tsconfig/recommended": "^1.0.1",
 		"@types/fs-extra": "^9.0.13",
-		"dts-cli": "^1.1.5",
-		"execa": "^5.1.0",
-		"fast-glob": "^3.2.5",
-		"fs-extra": "^10.0.0",
+		"dts-cli": "^1.4.0",
+		"execa": "^5.1.1",
+		"fast-glob": "^3.2.11",
+		"fs-extra": "^10.0.1",
 		"husky": "^7.0.4",
 		"jest-mock-extended": "^2.0.4",
-		"prisma": "^3.4.2",
+		"prisma": "^3.10.0",
 		"tslib": "^2.3.1",
-		"typescript": "^4.5.4",
+		"typescript": "^4.5.5",
 		"zod": "^3.11.6"
 	},
 	"peerDependencies": {

src/generator.ts

@@ -53,7 +53,7 @@ export const writeImportsForModel = (
 			kind: StructureKind.ImportDeclaration,
 			isTypeOnly: enumFields.length === 0,
 			moduleSpecifier: dotSlash(relativePath),
-			namedImports: enumFields.map((f) => f.type),
+			defaultImport: 'prisma',
 		})
 	}
 

src/test/functional/driver.test.ts

@@ -113,10 +113,22 @@ describe('Functional Tests', () => {
 	test.concurrent('Optional fields', ftForDir('optional'))
 	test.concurrent('Config Import', ftForDir('config-import'))
 
-	test.concurrent('Type Check Everything', async () => {
+	test('Type Check Everything', async () => {
 		const typeCheckResults = await execa(
 			path.resolve(__dirname, '../../../node_modules/.bin/tsc'),
-			['--strict', '--noEmit', ...(await glob(`${__dirname}/*/expected/*.ts`))]
+			[
+				'--strict',
+				'--noEmit',
+				'--esModuleInterop',
+				'--allowSyntheticDefaultImports',
+				'--target',
+				'esnext',
+				'--module',
+				'esnext',
+				'--moduleResolution',
+				'node',
+				...(await glob(`${__dirname}/*/expected/*.ts`)),
+			]
 		)
 
 		expect(typeCheckResults.exitCode).toBe(0)

src/test/functional/imports/expected/document.ts

@@ -1,12 +1,12 @@
 import * as z from "zod"
-import { Status } from "../prisma/.client"
+import prisma from "../prisma/.client"
 
 export const DocumentModel = z.object({
   id: z.string(),
   filename: z.string(),
   author: z.string(),
   contents: z.string(),
-  status: z.nativeEnum(Status),
+  status: z.nativeEnum(prisma.Status),
   created: z.date(),
   updated: z.date(),
 })

src/test/functional/imports/prisma/.client/index.ts

@@ -75,3 +75,8 @@ export const Status = {
 }
 
 export type Status = typeof Status[keyof typeof Status]
+
+// TODO figure out why TSC fails and we ahd to add this explicitly
+export default {
+	Status,
+}

src/test/regressions.test.ts

@@ -35,7 +35,7 @@ describe('Regression Tests', () => {
 		writeImportsForModel(model, testFile, config, prismaOptions)
 
 		expect(testFile.print()).toBe(
-			'import * as z from "zod";\nimport { UserType } from "@prisma/client";\n'
+			'import * as z from "zod";\nimport prisma from "@prisma/client";\n'
 		)
 	})
 })

src/types.ts

@@ -41,7 +41,7 @@ export const getZodConstructor = (
 				break
 		}
 	} else if (field.kind === 'enum') {
-		zodType = `z.nativeEnum(${field.type})`
+		zodType = `z.nativeEnum(prisma.${field.type})`
 	} else if (field.kind === 'object') {
 		zodType = getRelatedModelName(field.type)
 	}

tsconfig.json

@@ -28,6 +28,7 @@
 		"noEmit": true,
 		"downlevelIteration": true,
 		"resolveJsonModule": true,
+		"allowSyntheticDefaultImports": true,
 		"noErrorTruncation": true
 	}
 }