mutano 3.0.7 → 3.0.9

package/README.md

@@ -90,16 +90,16 @@ export interface InsertableUser {
 
 **Kysely Types:**
 ```typescript
-export interface UserTable {
+export interface User {
   id: Generated<number>;
   name: string;
   email: string;
   role: 'admin' | 'user';
 }
 
-export type User = Selectable<UserTable>;
-export type NewUser = Insertable<UserTable>;
-export type UserUpdate = Updateable<UserTable>;
+export type SelectableUser = Selectable<User>;
+export type InsertableUser = Insertable<User>;
+export type UpdateableUser = Updateable<User>;
 ```
 
 ## Configuration

package/dist/main.js

@@ -277,24 +277,36 @@ 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 (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 +321,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 +375,27 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   } else {
     baseType = isZodDestination ? "z.string()" : "string";
   }
-  if (shouldBeNullable) {
-    if (isZodDestination) {
+  if (isZodDestination) {
+    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({
@@ -544,7 +568,7 @@ function generateKyselyContent({
 `;
   content += `// This interface defines the structure of the '${table}' table
 `;
-  content += `export interface ${pascalTable}Table {
+  content += `export interface ${pascalTable} {
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
@@ -560,11 +584,11 @@ function generateKyselyContent({
   content += "}\n\n";
   content += `// Use these types for inserting, selecting and updating the table
 `;
-  content += `export type Selectable${pascalTable} = Selectable<${pascalTable}Table>;
+  content += `export type Selectable${pascalTable} = Selectable<${pascalTable}>;
 `;
-  content += `export type Insertable${pascalTable} = Insertable<${pascalTable}Table>;
+  content += `export type Insertable${pascalTable} = Insertable<${pascalTable}>;
 `;
-  content += `export type Updateable${pascalTable} = Updateable<${pascalTable}Table>;
+  content += `export type Updateable${pascalTable} = Updateable<${pascalTable}>;
 `;
   return content;
 }

package/package.json

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