prisma-to-zod-v4 0.6.0 → 0.6.2

package/README.md

@@ -217,7 +217,7 @@ Generated code:
 ```ts
 export const PostModel = z.object({
 	id: z.string().uuid(),
-	title: z.string().max(255, { message: 'The title must be shorter than 256 characters' }),
+	title: z.string().max(255, { message: "The title must be shorter than 256 characters" }),
 	contents: z.string().max(10240),
 })
 ```
@@ -243,7 +243,7 @@ The referenced file can then be used by simply referring to exported members via
 The generated zod schema files will now include a namespaced import like the following.
 
 ```typescript
-import * as imports from '../../src/zod-schemas'
+import * as imports from "../../src/zod-schemas"
 ```
 
 #### Custom Zod Schema

package/bin/cli.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../dist/index')
+require("../dist/index")

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.0";
+var version = "0.6.2";
 
 // src/index.ts
 var import_generator_helper = require("@prisma/generator-helper");
@@ -213140,62 +213140,52 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
     switch (field.type) {
       case "String":
         zodType = "z.string()";
-        if (nativeType == null ? void 0 : nativeType.includes("Uuid")) zodType = "z.uuid()";
-        if (nativeType == null ? void 0 : nativeType.includes("Citext")) zodType = "z.string().toLowerCase()";
-        if (nativeType == null ? void 0 : nativeType.includes("Char")) {
-          const length = (_a = nativeType.match(/Char\((\d+)\)/)) == null ? void 0 : _a[1];
+        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(/^VarChar\(\d+\)/)) {
+          const length = (_a = nativeType.match(/VarChar\((\d+)\)/)) == null ? void 0 : _a[1];
           if (length) extraModifiers.push(`max(${length})`);
-        }
-        if (nativeType == null ? void 0 : nativeType.includes("VarChar")) {
-          const length = (_b = nativeType.match(/VarChar\((\d+)\)/)) == null ? void 0 : _b[1];
+        } 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})`);
-        }
-        if (nativeType == null ? void 0 : nativeType.includes("Text")) zodType = "z.string()";
-        if (nativeType == null ? void 0 : nativeType.includes("Bit")) zodType = "z.string()";
-        if (nativeType == null ? void 0 : nativeType.includes("VarBit")) zodType = "z.string()";
-        if (nativeType == null ? void 0 : nativeType.includes("VarBinary")) zodType = "z.unknown()";
-        if (nativeType == null ? void 0 : nativeType.includes("Binary")) zodType = "z.unknown()";
-        if (nativeType == null ? void 0 : nativeType.includes("NChar")) {
-          const length = (_c = nativeType.match(/NChar\((\d+)\)/)) == null ? void 0 : _c[1];
+        } 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(/^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+\)/)) {
+          const length = (_c = nativeType.match(/NVarChar\((\d+)\)/)) == null ? void 0 : _c[1];
           if (length) extraModifiers.push(`max(${length})`);
-        }
-        if (nativeType == null ? void 0 : nativeType.includes("NVarChar")) {
-          const length = (_d = nativeType.match(/NVarChar\((\d+)\)/)) == null ? void 0 : _d[1];
+        } 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})`);
-        }
-        if (nativeType == null ? void 0 : nativeType.includes("NText")) zodType = "z.string()";
-        if (nativeType == null ? void 0 : nativeType.includes("ObjectId")) extraModifiers.push("regex(/^[0-9a-f]{24}$/i)");
+        } else if (nativeType == null ? void 0 : nativeType.match(/^NText/)) zodType = "z.string()";
+        else if (nativeType == null ? void 0 : nativeType.match(/^ObjectId/)) extraModifiers.push("regex(/^[0-9a-f]{24}$/i)");
         break;
       case "Int":
         zodType = "z.number()";
         extraModifiers.push("int()");
-        if (nativeType == null ? void 0 : nativeType.includes("SmallInt")) extraModifiers.push("min(-32768)", "max(32767)");
-        if (nativeType == null ? void 0 : nativeType.includes("TinyInt")) extraModifiers.push("min(-128)", "max(127)");
-        if (nativeType == null ? void 0 : nativeType.includes("UnsignedTinyInt")) extraModifiers.push("min(0)", "max(255)");
-        if (nativeType == null ? void 0 : nativeType.includes("UnsignedSmallInt")) extraModifiers.push("min(0)", "max(65535)");
-        if (nativeType == null ? void 0 : nativeType.includes("UnsignedInt")) extraModifiers.push("min(0)");
-        if (nativeType == null ? void 0 : nativeType.includes("Int")) zodType = "z.number().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)");
+        else if (nativeType == null ? void 0 : nativeType.match(/^UnsignedSmallInt/)) extraModifiers.push("min(0)", "max(65535)");
+        else if (nativeType == null ? void 0 : nativeType.match(/^UnsignedTinyInt/)) extraModifiers.push("min(0)", "max(255)");
+        else if (nativeType == null ? void 0 : nativeType.match(/^TinyInt/)) extraModifiers.push("min(-128)", "max(127)");
         break;
       case "BigInt":
         zodType = "z.bigint()";
-        if (nativeType == null ? void 0 : nativeType.includes("BigInt")) zodType = "z.bigint()";
         break;
       case "Float":
-        zodType = "z.number()";
-        if (nativeType == null ? void 0 : nativeType.includes("Real")) zodType = "z.number()";
-        if (nativeType == null ? void 0 : nativeType.includes("Float")) zodType = "z.number()";
-        if (nativeType == null ? void 0 : nativeType.includes("Double")) zodType = "z.number()";
+        zodType = "z.coerce.number()";
         break;
       case "Decimal":
-        zodType = "z.number()";
-        if (nativeType == null ? void 0 : nativeType.includes("Numeric")) {
+        zodType = "z.coerce.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()))`);
           }
-        }
-        if (nativeType == null ? void 0 : nativeType.includes("Decimal")) {
+        } else if (nativeType == null ? void 0 : nativeType.match(/^Decimal\(\d+,\d+\)/)) {
           const match = nativeType.match(/Decimal\((\d+),(\d+)\)/);
           if (match) {
             const [, precision, scale] = match;
@@ -213205,34 +213195,31 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
         break;
       case "DateTime":
         zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.includes("Timestamp")) zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.includes("TimestampTz")) zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.includes("Date")) zodType = "z.string().regex(/^\\d{4}-\\d{2}-\\d{2}$/)";
-        if (nativeType == null ? void 0 : nativeType.includes("Time")) zodType = "z.string().regex(/^\\d{2}:\\d{2}:\\d{2}$/)";
-        if (nativeType == null ? void 0 : nativeType.includes("TimeTz")) zodType = "z.string().regex(/^\\d{2}:\\d{2}:\\d{2}[+-]\\d{2}:\\d{2}$/)";
-        if (nativeType == null ? void 0 : nativeType.includes("DateTime")) zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.includes("DateTime2")) zodType = "z.date()";
-        if (nativeType == null ? void 0 : nativeType.includes("DateTimeOffset")) 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()";
         break;
       case "Boolean":
         zodType = "z.boolean()";
         break;
       case "Bytes":
         zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("ByteA")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("Blob")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("TinyBlob")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("MediumBlob")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("LongBlob")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("Binary")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("VarBinary")) zodType = "z.instanceof(Buffer)";
-        if (nativeType == null ? void 0 : nativeType.includes("Image")) zodType = "z.instanceof(Buffer)";
+        if (nativeType == null ? void 0 : nativeType.match(/^ByteA/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^LongBlob/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^MediumBlob/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^TinyBlob/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Blob/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Image/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^VarBinary/)) zodType = "z.instanceof(Buffer)";
+        else if (nativeType == null ? void 0 : nativeType.match(/^Binary/)) zodType = "z.instanceof(Buffer)";
         break;
       case "Json":
         zodType = "jsonSchema";
-        if (nativeType == null ? void 0 : nativeType.includes("Json")) zodType = "jsonSchema";
-        if (nativeType == null ? void 0 : nativeType.includes("JsonB")) zodType = "jsonSchema";
-        if (nativeType == null ? void 0 : nativeType.includes("Json")) zodType = "jsonSchema";
         break;
     }
   } else if (field.kind === "enum") {
@@ -213381,7 +213368,12 @@ 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)
+            ])
+          )
         )
       });
     }
@@ -213441,7 +213433,13 @@ var generateSchemaForModel = (model, sourceFile, config, { schemaPath }) => {
             model.fields.filter((f) => f.kind !== "object").forEach((field) => {
               writeArray(writer, getJSDocs(field.documentation));
               const nativeType = modelNativeTypes.get(field.name);
-              writer.write(`${field.name}: ${getZodConstructor(field, void 0, nativeType)}`).write(",").newLine();
+              writer.write(
+                `${field.name}: ${getZodConstructor(
+                  field,
+                  void 0,
+                  nativeType
+                )}`
+              ).write(",").newLine();
             });
           }).write(")");
         }
@@ -213485,7 +213483,12 @@ var generateRelatedSchemaForModel = (model, sourceFile, config, _prismaOptions)
           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();
+              writer.write(
+                `${field.name}: ${getZodConstructor(
+                  field,
+                  relatedModelName
+                )}`
+              ).write(",").newLine();
             });
           }).write("))");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prisma-to-zod-v4",
-	"version": "0.6.0",
+	"version": "0.6.2",
 	"description": "A Prisma generator that creates Zod schemas for all of your models",
 	"license": "MIT",
 	"author": "yassinrais",