mutano 3.0.13 → 3.0.15

package/dist/main.js

@@ -246,7 +246,26 @@ function getType(op, desc, config, destination) {
       const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
       const nullishOption = destination.nullish;
       const nullableMethod = nullishOption ? "nullish" : "nullable";
-      return shouldBeNullable ? zodOverrideType.includes(`.${nullableMethod}()`) || zodOverrideType.includes(".optional()") ? zodOverrideType : `${zodOverrideType}.${nullableMethod}()` : zodOverrideType;
+      let finalType = zodOverrideType;
+      if (shouldBeNullable) {
+        if (!zodOverrideType.includes(`.${nullableMethod}()`) && !zodOverrideType.includes(".optional()")) {
+          finalType = `${zodOverrideType}.${nullableMethod}()`;
+        }
+      }
+      if ((op === "table" || 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}'`;
+        }
+        finalType = `${finalType}.default(${defaultValueFormatted})`;
+      }
+      return finalType;
     }
   }
   const overrideTypes = config.origin.overrideTypes;
@@ -282,7 +301,7 @@ function getType(op, desc, config, destination) {
       if (isZodDestination) {
         const enumString = `z.enum([${enumValues.map((v) => `'${v}'`).join(",")}])`;
         const nullishOption = destination.nullish;
-        if ((op === "table" || op === "insertable" || op === "selectable") && hasDefaultValue && Default !== null && !isGenerated) {
+        if ((op === "table" || op === "insertable") && hasDefaultValue && Default !== null && !isGenerated) {
           if (shouldBeNullable) {
             const nullableMethod = nullishOption ? "nullish" : "nullable";
             return `${enumString}.${nullableMethod}().default('${Default}')`;
@@ -384,7 +403,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     baseType = isZodDestination ? "z.string()" : "string";
   }
   if (isZodDestination) {
-    if ((op === "table" || op === "insertable" || op === "selectable") && hasDefaultValue && Default !== null && !isGenerated) {
+    if ((op === "table" || op === "insertable") && hasDefaultValue && Default !== null && !isGenerated) {
       let defaultValueFormatted = Default;
       if (typeMappings.stringTypes.includes(type) || typeMappings.dateTypes.includes(type)) {
         defaultValueFormatted = `'${Default}'`;
@@ -604,11 +623,14 @@ function generateKyselyContent({
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
     let fieldType = getType("table", desc, config, destination);
-    const isAutoIncrement = desc.Extra.toLowerCase().includes("auto_increment");
-    const isDefaultGenerated = desc.Extra.toLowerCase().includes("default_generated");
-    const hasExplicitDefault = desc.Default !== null && !isAutoIncrement && !isDefaultGenerated;
-    if (isAutoIncrement || isDefaultGenerated || hasExplicitDefault) {
-      fieldType = `Generated<${fieldType.replace(" | null", "")}>${fieldType.includes(" | null") ? " | null" : ""}`;
+    const hasMagicComment = config.magicComments && (desc.Comment.includes("@kysely(") || desc.Comment.includes("@ts("));
+    if (!hasMagicComment) {
+      const isAutoIncrement = desc.Extra.toLowerCase().includes("auto_increment");
+      const isDefaultGenerated = desc.Extra.toLowerCase().includes("default_generated");
+      const hasExplicitDefault = desc.Default !== null && !isAutoIncrement && !isDefaultGenerated;
+      if (isAutoIncrement || isDefaultGenerated || hasExplicitDefault) {
+        fieldType = `Generated<${fieldType.replace(" | null", "")}>${fieldType.includes(" | null") ? " | null" : ""}`;
+      }
     }
     content += `  ${fieldName}: ${fieldType};
 `;

package/package.json

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