prisma-to-zod-v4 0.6.2 → 0.6.4

package/README.md

@@ -125,27 +125,38 @@ This project uses pnpm.
 
     ```prisma
     generator zod {
-      provider                 = "prisma-to-zod-v4"
-      output                   = "./zod" // (default) the directory where generated zod schemas will be saved
+			provider = "prisma-to-zod-v4"
 
-      relationModel            = true // (default) Create and export both plain and related models.
-      // relationModel         = "default" // Do not export model without relations.
-      // relationModel         = false // Do not generate related model
+			// Output directory for generated Zod schemas
+			output = "./zod" // default
 
-      modelCase                = "PascalCase" // (default) Output models using pascal case (ex. UserModel, PostModel)
-      // modelCase             = "camelCase" // Output models using camel case (ex. userModel, postModel)
+			// Relation model generation
+			relationModel = true        // default: generate both plain and related models
+			// relationModel = "default" // generate only related models (no plain models)
+			// relationModel = false     // disable related model generation
 
-      modelSuffix              = "Model" // (default) Suffix to apply to your prisma models when naming Zod schemas
+			// Naming conventions
+			modelCase   = "PascalCase" // default: UserModel, PostModel
+			// modelCase = "camelCase" // userModel, postModel
 
-      // useDecimalJs          = false // (default) represent the prisma Decimal type using as a JS number
-      useDecimalJs             = true // represent the prisma Decimal type using Decimal.js (as Prisma does)
+			// Suffix appended to generated Zod schemas
+			modelSuffix = "Model" // default
 
-      imports                  = null // (default) will import the referenced file in generated schemas to be used via imports.someExportedVariable
+			// Decimal handling
+			// useDecimalJs = false // default: represent Prisma Decimal as number
+			useDecimalJs  = true  // represent Prisma Decimal using Decimal.js (matches Prisma behavior)
 
-      // https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-by-null-values
-      prismaJsonNullability    = true // (default) uses prisma's scheme for JSON field nullability
-      // prismaJsonNullability = false // allows null assignment to optional JSON fields
-    }
+			// Enable coercion for input schemas (e.g. strings → numbers, dates)
+			useCoerce = true
+
+			// Custom imports for generated schemas
+			imports = null // default: no additional imports
+
+			// JSON field nullability behavior
+			// See: https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-by-null-values
+			prismaJsonNullability = true  // default: follow Prisma's JSON nullability rules
+			// prismaJsonNullability = false // allow null assignment to optional JSON fields
+		}
     ```
 
 3.  Run `npx prisma generate` or `pnpm prisma generate` to generate your zod schemas

package/dist/index.js

@@ -213047,7 +213047,7 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
 });
 
 // package.json
-var version = "0.6.2";
+var version = "0.6.4";
 
 // src/index.ts
 var import_generator_helper = require("@prisma/generator-helper");
@@ -213063,6 +213063,7 @@ var configSchema = import_zod.z.object({
   modelSuffix: import_zod.z.string().default("Model"),
   modelCase: import_zod.z.enum(["PascalCase", "camelCase"]).default("PascalCase"),
   useDecimalJs: configBoolean,
+  useCoerce: configBoolean.default(false),
   imports: import_zod.z.string().optional(),
   prismaJsonNullability: configBoolean
 });
@@ -213132,25 +213133,26 @@ var computeModifiers = (docString) => {
 };
 
 // src/types.ts
-var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(), nativeType) => {
+var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(), nativeType, useCoerce) => {
   var _a, _b, _c, _d;
   let zodType = "z.unknown()";
-  let extraModifiers = [""];
+  const zodVar = useCoerce ? "z.coerce" : "z";
+  const extraModifiers = [""];
   if (field.kind === "scalar") {
     switch (field.type) {
       case "String":
-        zodType = "z.string()";
+        zodType = zodVar + ".string()";
         if (nativeType == null ? void 0 : nativeType.match(/^Uuid/)) zodType = "z.uuid()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^Citext/)) zodType = "z.string().toLowerCase()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Citext/)) zodType = zodVar + ".string().toLowerCase()";
         else if (nativeType == null ? void 0 : nativeType.match(/^VarChar\(\d+\)/)) {
           const length = (_a = nativeType.match(/VarChar\((\d+)\)/)) == null ? void 0 : _a[1];
           if (length) extraModifiers.push(`max(${length})`);
         } else if (nativeType == null ? void 0 : nativeType.match(/^Char\(\d+\)/)) {
           const length = (_b = nativeType.match(/Char\((\d+)\)/)) == null ? void 0 : _b[1];
           if (length) extraModifiers.push(`max(${length})`);
-        } else if (nativeType == null ? void 0 : nativeType.match(/^Text/)) zodType = "z.string()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^VarBit/)) zodType = "z.string()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^Bit/)) zodType = "z.string()";
+        } else if (nativeType == null ? void 0 : nativeType.match(/^Text/)) zodType = zodVar + ".string()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^VarBit/)) zodType = zodVar + ".string()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Bit/)) zodType = zodVar + ".string()";
         else if (nativeType == null ? void 0 : nativeType.match(/^VarBinary/)) zodType = "z.unknown()";
         else if (nativeType == null ? void 0 : nativeType.match(/^Binary/)) zodType = "z.unknown()";
         else if (nativeType == null ? void 0 : nativeType.match(/^NVarChar\(\d+\)/)) {
@@ -213159,11 +213161,11 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
         } else if (nativeType == null ? void 0 : nativeType.match(/^NChar\(\d+\)/)) {
           const length = (_d = nativeType.match(/NChar\((\d+)\)/)) == null ? void 0 : _d[1];
           if (length) extraModifiers.push(`max(${length})`);
-        } else if (nativeType == null ? void 0 : nativeType.match(/^NText/)) zodType = "z.string()";
+        } else if (nativeType == null ? void 0 : nativeType.match(/^NText/)) zodType = zodVar + ".string()";
         else if (nativeType == null ? void 0 : nativeType.match(/^ObjectId/)) extraModifiers.push("regex(/^[0-9a-f]{24}$/i)");
         break;
       case "Int":
-        zodType = "z.number()";
+        zodType = zodVar + ".number()";
         extraModifiers.push("int()");
         if (nativeType == null ? void 0 : nativeType.match(/^SmallInt/)) extraModifiers.push("min(-32768)", "max(32767)");
         else if (nativeType == null ? void 0 : nativeType.match(/^UnsignedInt/)) extraModifiers.push("min(0)");
@@ -213172,40 +213174,47 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
         else if (nativeType == null ? void 0 : nativeType.match(/^TinyInt/)) extraModifiers.push("min(-128)", "max(127)");
         break;
       case "BigInt":
-        zodType = "z.bigint()";
+        zodType = zodVar + ".bigint()";
         break;
       case "Float":
-        zodType = "z.coerce.number()";
+        zodType = zodVar + ".number()";
         break;
       case "Decimal":
-        zodType = "z.coerce.number()";
+        zodType = zodVar + ".number()";
         if (nativeType == null ? void 0 : nativeType.match(/^Numeric\(\d+,\d+\)/)) {
           const match = nativeType.match(/Numeric\((\d+),(\d+)\)/);
           if (match) {
             const [, precision, scale] = match;
-            extraModifiers.push(`refine(x => /^\\d{1,${Number(precision) - parseInt(scale)}}(\\.\\d{1,${scale}})?$/.test(x.toString()))`);
+            extraModifiers.push(
+              `refine(x => /^\\d{1,${Number(precision) - parseInt(scale)}}(\\.\\d{1,${scale}})?$/.test(x.toString()))`
+            );
           }
         } else if (nativeType == null ? void 0 : nativeType.match(/^Decimal\(\d+,\d+\)/)) {
           const match = nativeType.match(/Decimal\((\d+),(\d+)\)/);
           if (match) {
             const [, precision, scale] = match;
-            extraModifiers.push(`refine(x => /^\\d{1,${Number(precision) - parseInt(scale)}}(\\.\\d{1,${scale}})?$/.test(x.toString()))`);
+            extraModifiers.push(
+              `refine(x => /^\\d{1,${Number(precision) - parseInt(scale)}}(\\.\\d{1,${scale}})?$/.test(x.toString()))`
+            );
           }
         }
         break;
       case "DateTime":
-        zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.match(/^TimestampTz/)) zodType = "z.date()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^Timestamp/)) zodType = "z.date()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^TimeTz/)) zodType = "z.string().regex(/^\\d{2}:\\d{2}:\\d{2}[+-]\\d{2}:\\d{2}$/)";
-        else if (nativeType == null ? void 0 : nativeType.match(/^Time/)) zodType = "z.string().regex(/^\\d{2}:\\d{2}:\\d{2}$/)";
-        else if (nativeType == null ? void 0 : nativeType.match(/^Date/)) zodType = "z.string().regex(/^\\d{4}-\\d{2}-\\d{2}$/)";
-        else if (nativeType == null ? void 0 : nativeType.match(/^DateTime/)) zodType = "z.date()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^DateTimeOffset/)) zodType = "z.date()";
-        else if (nativeType == null ? void 0 : nativeType.match(/^DateTime2/)) zodType = "z.date()";
+        zodType = zodVar + ".date()";
+        if (nativeType == null ? void 0 : nativeType.match(/^TimestampTz/)) zodType = zodVar + ".date()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Timestamp/)) zodType = zodVar + ".date()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^TimeTz/))
+          zodType = zodVar + ".string().regex(/^\\d{2}:\\d{2}:\\d{2}[+-]\\d{2}:\\d{2}$/)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Time/))
+          zodType = zodVar + ".string().regex(/^\\d{2}:\\d{2}:\\d{2}$/)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Date/))
+          zodType = zodVar + ".string().regex(/^\\d{4}-\\d{2}-\\d{2}$/)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^DateTime/)) zodType = zodVar + ".date()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^DateTimeOffset/)) zodType = zodVar + ".date()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^DateTime2/)) zodType = zodVar + ".date()";
         break;
       case "Boolean":
-        zodType = "z.boolean()";
+        zodType = zodVar + ".boolean()";
         break;
       case "Bytes":
         zodType = "z.instanceof(Buffer)";
@@ -213233,7 +213242,7 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
     extraModifiers.push(...computeModifiers(field.documentation));
   }
   if (!field.isRequired && field.type !== "Json") extraModifiers.push("nullish()");
-  const validModifiers = extraModifiers.filter((m) => m !== "");
+  const validModifiers = extraModifiers.filter((m) => m !== "").filter((m, i, l) => l.indexOf(m) === i);
   return validModifiers.length > 0 ? `${zodType}.${validModifiers.join(".")}` : zodType;
 };
 
@@ -213242,60 +213251,41 @@ var parseNativeTypes = (schemaPath) => {
   var _a;
   let schemaContent = "";
   let resolvedPath = schemaPath;
-  try {
-    if (!(0, import_fs.existsSync)(resolvedPath)) {
-      const withFile = import_path.default.join(schemaPath, "schema.prisma");
-      const parentDir = import_path.default.dirname(schemaPath);
-      if ((0, import_fs.existsSync)(withFile)) {
-        resolvedPath = withFile;
-      } else if ((0, import_fs.existsSync)(parentDir)) {
-        resolvedPath = parentDir;
-      } else {
-        console.warn(`Schema path not found: ${schemaPath}`);
-        return /* @__PURE__ */ new Map();
-      }
-    }
-    const stat = (0, import_fs.statSync)(resolvedPath);
-    if (stat.isFile()) {
-      schemaContent = (0, import_fs.readFileSync)(resolvedPath, "utf-8");
-    } else if (stat.isDirectory()) {
-      const prismaFiles = findPrismaFiles(resolvedPath);
-      if (prismaFiles.length === 0) {
-        console.warn(`No .prisma files found in ${resolvedPath}`);
-        return /* @__PURE__ */ new Map();
-      }
-      prismaFiles.forEach((filePath) => {
-        schemaContent += (0, import_fs.readFileSync)(filePath, "utf-8") + "\n";
-      });
-    }
-  } catch (error) {
-    console.error(`Error reading schema path: ${schemaPath}`, error);
-    return /* @__PURE__ */ new Map();
+  if (!(0, import_fs.existsSync)(resolvedPath)) {
+    const withFile = import_path.default.join(schemaPath, "schema.prisma");
+    const parentDir = import_path.default.dirname(schemaPath);
+    if ((0, import_fs.existsSync)(withFile)) resolvedPath = withFile;
+    else if ((0, import_fs.existsSync)(parentDir)) resolvedPath = parentDir;
+    else return /* @__PURE__ */ new Map();
   }
-  if (!schemaContent) {
-    console.warn(`No schema content found at ${schemaPath}`);
-    return /* @__PURE__ */ new Map();
+  const stat = (0, import_fs.statSync)(resolvedPath);
+  if (stat.isFile()) schemaContent = (0, import_fs.readFileSync)(resolvedPath, "utf-8");
+  else if (stat.isDirectory()) {
+    const prismaFiles = findPrismaFiles(resolvedPath);
+    if (prismaFiles.length === 0) return /* @__PURE__ */ new Map();
+    prismaFiles.forEach((filePath) => {
+      schemaContent += (0, import_fs.readFileSync)(filePath, "utf-8") + "\n";
+    });
   }
   const nativeTypes = /* @__PURE__ */ new Map();
-  const modelRegex = /model\s+(\w+)\s*\{([^}]+)\}/g;
-  const fieldRegex = /(\w+)\s+(\w+(?:\[\])?)\s+([^;\n]+)/g;
+  const modelRegex = /model\s+(\w+)\s*\{([\s\S]*?)\}/g;
   let modelMatch;
   while ((modelMatch = modelRegex.exec(schemaContent)) !== null) {
     const modelName = modelMatch[1];
     const modelBody = modelMatch[2];
     const fields = /* @__PURE__ */ new Map();
-    let fieldMatch;
-    while ((fieldMatch = fieldRegex.exec(modelBody)) !== null) {
-      const fieldName = fieldMatch[1];
-      const fieldLine = fieldMatch[0];
-      const dbMatch = (_a = fieldLine.match(/@db\.(\w+(?:\([^)]*\))?)/)) == null ? void 0 : _a[1];
-      if (dbMatch) {
-        fields.set(fieldName, dbMatch);
-      }
-    }
-    if (fields.size > 0) {
-      nativeTypes.set(modelName, fields);
+    const lines = modelBody.split("\n");
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("//")) continue;
+      const parts = trimmed.split(/\s+/);
+      if (parts.length < 2) continue;
+      const fieldName = parts[0];
+      const attributes = parts.slice(2).join(" ");
+      const dbMatch = (_a = attributes.match(/@db\.([A-Za-z0-9_()]+)/)) == null ? void 0 : _a[1];
+      if (dbMatch) fields.set(fieldName, dbMatch);
     }
+    if (fields.size > 0) nativeTypes.set(modelName, fields);
   }
   return nativeTypes;
 };
@@ -213335,9 +213325,7 @@ var writeImportsForModel = (model, sourceFile, config, { schemaPath, outputPath,
     importList.push({
       kind: import_ts_morph.StructureKind.ImportDeclaration,
       namespaceImport: "imports",
-      moduleSpecifier: dotSlash(
-        import_path.default.relative(outputPath, import_path.default.resolve(baseDir, config.imports))
-      )
+      moduleSpecifier: dotSlash(import_path.default.relative(outputPath, import_path.default.resolve(baseDir, config.imports)))
     });
   }
   const hasNonCustomDecimalFieldForImports = model.fields.some(
@@ -213368,12 +213356,7 @@ var writeImportsForModel = (model, sourceFile, config, { schemaPath, outputPath,
         kind: import_ts_morph.StructureKind.ImportDeclaration,
         moduleSpecifier: "./index",
         namedImports: Array.from(
-          new Set(
-            filteredFields.flatMap((f) => [
-              `Complete${f.type}`,
-              relatedModelName(f.type)
-            ])
-          )
+          new Set(filteredFields.flatMap((f) => [`Complete${f.type}`, relatedModelName(f.type)]))
         )
       });
     }
@@ -213383,12 +213366,13 @@ var writeImportsForModel = (model, sourceFile, config, { schemaPath, outputPath,
 var writeTypeSpecificSchemas = (model, sourceFile, config, _prismaOptions) => {
   if (model.fields.some((f) => f.type === "Json")) {
     sourceFile.addStatements((writer) => {
-      writer.newLine();
       writeArray(writer, [
+        "",
         "// Helper schema for JSON fields",
-        `type Literal = boolean | number | string${config.prismaJsonNullability ? "" : "| null"}`,
+        `type Literal = boolean | number | string${config.prismaJsonNullability ? "" : " | null"}`,
         "type Json = Literal | { [key: string]: Json } | Json[]",
         `const literalSchema = z.union([z.string(), z.number(), z.boolean()${config.prismaJsonNullability ? "" : ", z.null()"}])`,
+        // Keep jsonSchema initializer fully on one line
         "const jsonSchema: z.ZodSchema<Json> = z.lazy(() => z.union([literalSchema, z.array(jsonSchema), z.record(z.string(), jsonSchema)]))"
       ]);
     });
@@ -213401,8 +213385,7 @@ var writeTypeSpecificSchemas = (model, sourceFile, config, _prismaOptions) => {
       writer.newLine();
       writeArray(writer, [
         "// Helper schema for Decimal fields",
-        "z",
-        ".instanceof(Decimal)",
+        "z.instanceof(Decimal)",
         ".or(z.string())",
         ".or(z.number())",
         ".refine((value) => {",
@@ -213437,7 +213420,8 @@ var generateSchemaForModel = (model, sourceFile, config, { schemaPath }) => {
                 `${field.name}: ${getZodConstructor(
                   field,
                   void 0,
-                  nativeType
+                  nativeType,
+                  config.useCoerce
                 )}`
               ).write(",").newLine();
             });
@@ -213480,17 +213464,21 @@ var generateRelatedSchemaForModel = (model, sourceFile, config, _prismaOptions)
         name: relatedModelName(model.name),
         type: `z.ZodSchema<Complete${model.name}>`,
         initializer(writer) {
-          writer.write(`z.lazy(() => ${modelName(model.name)}.extend(`).inlineBlock(() => {
-            relationFields.forEach((field) => {
-              writeArray(writer, getJSDocs(field.documentation));
-              writer.write(
-                `${field.name}: ${getZodConstructor(
-                  field,
-                  relatedModelName
-                )}`
-              ).write(",").newLine();
-            });
-          }).write("))");
+          writer.write("z.lazy(() =>").newLine().indent(() => {
+            writer.write(`${modelName(model.name)}.extend({`).newLine().indent(() => {
+              relationFields.forEach((field) => {
+                writeArray(writer, getJSDocs(field.documentation));
+                writer.write(
+                  `${field.name}: ${getZodConstructor(
+                    field,
+                    relatedModelName,
+                    null,
+                    config.useCoerce
+                  )},`
+                ).newLine();
+              });
+            }).write("})");
+          }).newLine().write(")");
         }
       }
     ]
@@ -213522,7 +213510,11 @@ var import_ts_morph2 = require("ts-morph");
     };
   },
   onGenerate(options) {
-    const project = new import_ts_morph2.Project();
+    const project = new import_ts_morph2.Project({
+      manipulationSettings: {
+        quoteKind: import_ts_morph2.QuoteKind.Single
+      }
+    });
     const models = [...options.dmmf.datamodel.models];
     const schemaPath = options.schemaPath;
     const schemaDir = import_path2.default.dirname(schemaPath);
@@ -213542,11 +213534,7 @@ var import_ts_morph2 = require("ts-morph");
       schemaPath: schemaDir
       // Pass the directory, not the file
     };
-    const indexFile = project.createSourceFile(
-      `${outputPath}/index.ts`,
-      {},
-      { overwrite: true }
-    );
+    const indexFile = project.createSourceFile(`${outputPath}/index.ts`, {}, { overwrite: true });
     generateBarrelFile(models, indexFile);
     indexFile.formatText({
       indentSize: 2,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prisma-to-zod-v4",
-	"version": "0.6.2",
+	"version": "0.6.4",
 	"description": "A Prisma generator that creates Zod schemas for all of your models",
 	"license": "MIT",
 	"author": "yassinrais",
@@ -37,7 +37,7 @@
 		"printWidth": 100,
 		"semi": false,
 		"singleQuote": true,
-		"tabWidth": 4,
+		"tabWidth": 2,
 		"trailingComma": "es5",
 		"useTabs": true
 	},