mutano 3.0.8 → 3.0.10

package/dist/main.js

@@ -277,24 +277,44 @@ function getType(op, desc, config, destination) {
       enumValues = config.enumDeclarations[type];
     }
     if (enumValues.length > 0) {
-      const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
+      const shouldBeNullable = isNull;
+      const shouldBeOptional = op === "insertable" && (hasDefaultValue || isGenerated) || op === "updateable";
       if (isZodDestination) {
         const enumString = `z.enum([${enumValues.map((v) => `'${v}'`).join(",")}])`;
         const nullishOption = destination.nullish;
-        const nullableMethod = nullishOption ? "nullish" : "nullable";
-        return shouldBeNullable ? `${enumString}.${nullableMethod}()` : enumString;
+        if (op === "insertable" && hasDefaultValue && Default !== null && !isGenerated) {
+          if (shouldBeNullable) {
+            const nullableMethod = nullishOption ? "nullish" : "nullable";
+            return `${enumString}.${nullableMethod}().default('${Default}')`;
+          } else {
+            return `${enumString}.default('${Default}')`;
+          }
+        }
+        if (shouldBeNullable && shouldBeOptional) {
+          const nullableMethod = nullishOption ? "nullish" : "nullable";
+          return `${enumString}.${nullableMethod}()`;
+        } else if (shouldBeNullable) {
+          const nullableMethod = nullishOption ? "nullish" : "nullable";
+          return `${enumString}.${nullableMethod}()`;
+        } else if (shouldBeOptional) {
+          return `${enumString}.optional()`;
+        } else {
+          return enumString;
+        }
       } else if (isTsDestination) {
-        const enumType = destination.enumType;
-        if (enumType === "enum") {
-          const enumString = enumValues.map((v) => `'${v}'`).join(" | ");
-          return shouldBeNullable ? `${enumString} | null` : enumString;
+        const enumString = enumValues.map((v) => `'${v}'`).join(" | ");
+        if (shouldBeNullable) {
+          return `${enumString} | null`;
         } else {
-          const enumString = enumValues.map((v) => `'${v}'`).join(" | ");
-          return shouldBeNullable ? `${enumString} | null` : enumString;
+          return enumString;
         }
       } else if (isKyselyDestination) {
         const enumString = enumValues.map((v) => `'${v}'`).join(" | ");
-        return shouldBeNullable ? `${enumString} | null` : enumString;
+        if (shouldBeNullable) {
+          return `${enumString} | null`;
+        } else {
+          return enumString;
+        }
       }
     }
   }
@@ -309,7 +329,8 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   const isGenerated = Extra.toLowerCase().includes("auto_increment") || Extra.toLowerCase().includes("default_generated");
   const isZodDestination = destination.type === "zod";
   const isKyselyDestination = destination.type === "kysely";
-  const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
+  const shouldBeNullable = isNull;
+  const shouldBeOptional = op === "insertable" && (hasDefaultValue || isGenerated) || op === "updateable";
   let baseType;
   if (typeMappings.dateTypes.includes(type)) {
     if (isZodDestination) {
@@ -362,16 +383,46 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   } else {
     baseType = isZodDestination ? "z.string()" : "string";
   }
-  if (shouldBeNullable) {
-    if (isZodDestination) {
+  if (isZodDestination) {
+    if (op === "insertable" && hasDefaultValue && Default !== null && !isGenerated) {
+      let defaultValueFormatted = Default;
+      if (typeMappings.stringTypes.includes(type) || typeMappings.dateTypes.includes(type)) {
+        defaultValueFormatted = `'${Default}'`;
+      } else if (typeMappings.booleanTypes.includes(type)) {
+        defaultValueFormatted = Default.toLowerCase() === "true" ? "true" : "false";
+      } else if (typeMappings.numberTypes.includes(type)) {
+        defaultValueFormatted = Default;
+      } else {
+        defaultValueFormatted = `'${Default}'`;
+      }
+      if (shouldBeNullable) {
+        const nullishOption = destination.nullish;
+        const nullableMethod = nullishOption ? "nullish" : "nullable";
+        return `${baseType}.${nullableMethod}().default(${defaultValueFormatted})`;
+      } else {
+        return `${baseType}.default(${defaultValueFormatted})`;
+      }
+    }
+    if (shouldBeNullable && shouldBeOptional) {
       const nullishOption = destination.nullish;
       const nullableMethod = nullishOption ? "nullish" : "nullable";
       return `${baseType}.${nullableMethod}()`;
+    } else if (shouldBeNullable) {
+      const nullishOption = destination.nullish;
+      const nullableMethod = nullishOption ? "nullish" : "nullable";
+      return `${baseType}.${nullableMethod}()`;
+    } else if (shouldBeOptional) {
+      return `${baseType}.optional()`;
     } else {
+      return baseType;
+    }
+  } else {
+    if (shouldBeNullable) {
       return `${baseType} | null`;
+    } else {
+      return baseType;
     }
   }
-  return baseType;
 }
 
 function generateViewContent({
@@ -830,15 +881,28 @@ function extractPrismaColumnDescriptions(config, entityName, enumDeclarations) {
     let defaultValue = null;
     if (field.attributes) {
       for (const attr of field.attributes) {
-        if (attr.name === "default") {
+        if (attr.name === "updatedAt") {
+          defaultGenerated = true;
+        } else if (attr.name === "default") {
           if (attr.args && attr.args.length > 0) {
             const arg = attr.args[0];
             if (typeof arg === "object" && "value" in arg) {
-              if (arg.value === "autoincrement()" || arg.value === "cuid()" || arg.value === "uuid()") {
-                defaultGenerated = true;
+              if (typeof arg.value === "object" && arg.value.type === "function") {
+                const functionName = arg.value.name;
+                if (functionName === "autoincrement" || functionName === "cuid" || functionName === "uuid" || functionName === "now") {
+                  defaultGenerated = true;
+                }
+              } else if (typeof arg.value === "string") {
+                let cleanValue = arg.value;
+                if (cleanValue.startsWith('"') && cleanValue.endsWith('"')) {
+                  cleanValue = cleanValue.slice(1, -1);
+                }
+                defaultValue = cleanValue;
               } else {
                 defaultValue = String(arg.value);
               }
+            } else if (typeof arg === "string") {
+              defaultValue = arg;
             }
           }
         }

package/package.json

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