mutano 3.0.23 → 3.1.0

package/README.md

@@ -145,6 +145,7 @@ export type UpdateableUser = Updateable<User>;
 
   // Zod specific
   useDateType?: boolean,
+  useBooleanType?: boolean,
   useTrim?: boolean,
   nullish?: boolean,
   requiredString?: boolean,
@@ -159,6 +160,15 @@ export type UpdateableUser = Updateable<User>;
 }
 ```
 
+### Zod Configuration Options
+
+- **`useDateType`**: When `true`, generates `z.union([z.number(), z.string(), z.date()]).pipe(z.coerce.date())` instead of `z.date()` for date fields
+- **`useBooleanType`**: When `true`, generates `z.union([z.number(), z.string(), z.boolean()]).pipe(z.coerce.boolean())` instead of `z.boolean()` for boolean fields
+- **`useTrim`**: When `true`, adds `.trim()` to string fields
+- **`nullish`**: When `true`, uses `.nullish()` instead of `.nullable()` for nullable fields (except selectable schemas)
+- **`requiredString`**: When `true`, adds `.min(1)` validation to required string fields
+- **`version`**: Zod version (3 or 4) for compatibility
+
 ### Global Options
 | Option | Description |
 |--------|-------------|

package/dist/main.d.ts

@@ -13,6 +13,7 @@ interface Desc {
 type Destination = {
     type: 'zod';
     useDateType?: boolean;
+    useBooleanType?: boolean;
     useTrim?: boolean;
     nullish?: boolean;
     requiredString?: boolean;

package/dist/main.js

@@ -311,9 +311,13 @@ function getType(op, desc, config, destination) {
         const enumString = `z.enum([${enumValues.map((v) => `'${v}'`).join(",")}])`;
         const nullishOption = destination.nullish;
         const nullableMethod = nullishOption && op !== "selectable" ? "nullish" : "nullable";
-        if ((op === "table" || op === "insertable") && hasDefaultValue && Default !== null && !isGenerated) {
-          if (shouldBeNullable) {
+        if ((op === "table" || op === "insertable" || op === "updateable") && hasDefaultValue && Default !== null && !isGenerated) {
+          if (shouldBeNullable && shouldBeOptional) {
             return `${enumString}.${nullableMethod}().default('${Default}')`;
+          } else if (shouldBeNullable) {
+            return `${enumString}.${nullableMethod}().default('${Default}')`;
+          } else if (shouldBeOptional) {
+            return `${enumString}.optional().default('${Default}')`;
           } else {
             return `${enumString}.default('${Default}')`;
           }
@@ -392,14 +396,23 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
       baseType = "number";
     }
   } else if (typeMappings.booleanTypes.includes(type)) {
-    baseType = isZodDestination ? "z.boolean()" : "boolean";
+    if (isZodDestination) {
+      const useBooleanType = destination.useBooleanType;
+      if (useBooleanType) {
+        baseType = "z.union([z.number(), z.string(), z.boolean()]).pipe(z.coerce.boolean())";
+      } else {
+        baseType = "z.boolean()";
+      }
+    } else {
+      baseType = "boolean";
+    }
   } else if (typeMappings.stringTypes.includes(type)) {
     if (isZodDestination) {
       const useTrim = destination.useTrim;
       const requiredString = destination.requiredString;
       baseType = "z.string()";
       if (useTrim && op !== "selectable") baseType += ".trim()";
-      if (requiredString && !shouldBeNullable && op !== "selectable") baseType += ".min(1)";
+      if (requiredString && !shouldBeNullable && op !== "selectable" && !(op === "updateable" && hasDefaultValue)) baseType += ".min(1)";
     } else {
       baseType = "string";
     }
@@ -409,7 +422,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   if (isZodDestination) {
     const nullishOption = destination.nullish;
     const nullableMethod = nullishOption && op !== "selectable" ? "nullish" : "nullable";
-    if ((op === "table" || op === "insertable") && hasDefaultValue && Default !== null && !isGenerated) {
+    if ((op === "table" || op === "insertable" || op === "updateable") && hasDefaultValue && Default !== null && !isGenerated) {
       let defaultValueFormatted = Default;
       if (typeMappings.stringTypes.includes(type) || typeMappings.dateTypes.includes(type)) {
         defaultValueFormatted = `'${Default}'`;
@@ -420,8 +433,12 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
       } else {
         defaultValueFormatted = `'${Default}'`;
       }
-      if (shouldBeNullable) {
+      if (shouldBeNullable && shouldBeOptional) {
+        return `${baseType}.${nullableMethod}().default(${defaultValueFormatted})`;
+      } else if (shouldBeNullable) {
         return `${baseType}.${nullableMethod}().default(${defaultValueFormatted})`;
+      } else if (shouldBeOptional) {
+        return `${baseType}.optional().default(${defaultValueFormatted})`;
       } else {
         return `${baseType}.default(${defaultValueFormatted})`;
       }
@@ -453,6 +470,17 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   }
 }
 
+function isAutoGeneratedDateTimeField(desc, schemaType) {
+  const { Type, Extra } = desc;
+  const type = schemaType === "prisma" ? Type : Type.toLowerCase();
+  const typeMappings = getTypeMappings(schemaType);
+  const isDateField = typeMappings.dateTypes.includes(type);
+  if (!isDateField) {
+    return false;
+  }
+  const isGenerated = Extra.toLowerCase().includes("auto_increment") || Extra.toLowerCase().includes("default_generated");
+  return isGenerated;
+}
 function toSnakeCase(str) {
   return str.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
 }
@@ -691,6 +719,10 @@ function generateZodContent({
   content += `export const updateable_${snakeTable} = z.object({
 `;
   for (const desc of describes) {
+    const isAutoGeneratedDatetime = isAutoGeneratedDateTimeField(desc, config.origin.type);
+    if (isAutoGeneratedDatetime) {
+      continue;
+    }
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
     const fieldType = getType("updateable", desc, config, destination);
     content += `  ${fieldName}: ${fieldType},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mutano",
   "type": "module",
-  "version": "3.0.23",
+  "version": "3.1.0",
   "description": "Converts Prisma/MySQL/PostgreSQL/SQLite schemas to Zod/TS/Kysely interfaces",
   "author": "Alisson Cavalcante Agiani <thelinuxlich@gmail.com>",
   "license": "MIT",