prisma-to-zod-v4 0.6.2 → 0.6.3

package/dist/index.js

@@ -213183,13 +213183,17 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
           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;
@@ -213197,7 +213201,8 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
         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(/^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()";
@@ -213233,7 +213238,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 +213247,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 +213321,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 +213352,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)]))
         )
       });
     }
@@ -213389,7 +213368,9 @@ var writeTypeSpecificSchemas = (model, sourceFile, config, _prismaOptions) => {
         `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()"}])`,
-        "const jsonSchema: z.ZodSchema<Json> = z.lazy(() => z.union([literalSchema, z.array(jsonSchema), z.record(z.string(), jsonSchema)]))"
+        "const jsonSchema: z.ZodSchema<Json> = z.lazy(() =>",
+        "	z.union([literalSchema, z.array(jsonSchema), z.record(z.string(), jsonSchema)])",
+        ")"
       ]);
     });
   }
@@ -213401,8 +213382,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) => {",
@@ -213433,13 +213413,7 @@ 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(")");
         }
@@ -213483,12 +213457,7 @@ 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("))");
         }
@@ -213522,7 +213491,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 +213515,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.3",
 	"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
 	},