mutano 3.3.0 → 3.5.0

package/README.md

@@ -115,22 +115,19 @@ export type UpdateableUser = Updateable<User>;
   password: string,
   database: string,
   schema?: string, // PostgreSQL only
-  ssl?: { ca, cert, key },
-  overrideTypes?: Record<string, string>
+  ssl?: { ca, cert, key }
 }
 
 // SQLite
 {
   type: 'sqlite',
-  path: string,
-  overrideTypes?: Record<string, string>
+  path: string
 }
 
 // Prisma
 {
   type: 'prisma',
-  path: string,
-  overrideTypes?: Record<string, string>
+  path: string
 }
 ```
 
@@ -181,6 +178,8 @@ export type UpdateableUser = Updateable<User>;
 | `dryRun` | Return content without writing files |
 | `magicComments` | Enable @zod/@ts/@kysely comments (Obs.: no SQLite support) |
 | `inflection` | Transform model names: `'singular'`, `'plural'`, or `'none'` (default) |
+| `overrideTypes` | Override types globally per destination (see below) |
+| `overrideColumns` | Override specific columns per table (see below) |
 
 ### Inflection
 
@@ -307,24 +306,103 @@ Generated types will only include: `id`, `email`, `name`, and `metadata`
 
 ## Type Overrides
 
-Override default types globally in your origin config:
+Override default types globally. Define destination-specific overrides for each output type:
 
 ```typescript
 {
   origin: {
     type: 'mysql',
     // ... connection config
-    overrideTypes: {
+  },
+  overrideTypes: {
+    zod: {
       json: 'z.record(z.string())',
       text: 'z.string().max(1000)',
       decimal: 'z.number().positive()'
+    },
+    ts: {
+      json: 'Record<string, string>',
+      text: 'string',
+      decimal: 'number'
+    },
+    kysely: {
+      json: 'Json',
+      text: 'string',
+      decimal: 'Decimal'
     }
   }
 }
 ```
 
+**Single destination with multiple outputs:**
+
+```typescript
+{
+  origin: {
+    type: 'postgres',
+    // ...
+  },
+  destinations: [
+    { type: 'zod', folder: './zod' },
+    { type: 'ts', folder: './types' },
+    { type: 'kysely', outFile: './db.ts' }
+  ],
+  overrideTypes: {
+    zod: { jsonb: 'z.record(z.string())' },
+    ts: { jsonb: 'Record<string, string>' },
+    kysely: { jsonb: 'Json' }
+  }
+}
+```
+
 **Common Overrides:**
 - **MySQL**: `json`, `text`, `decimal`, `enum`
 - **PostgreSQL**: `jsonb`, `uuid`, `text`, `numeric`
 - **SQLite**: `json`, `text`, `real`
-- **Prisma**: `Json`, `String`, `Decimal`
+- **Prisma**: `Json`, `String`, `Decimal`
+
+### Override Columns
+
+Override specific columns from specific tables. Takes priority over magic comments:
+
+```typescript
+{
+  origin: {
+    type: 'mysql',
+    // ... connection config
+  },
+  destinations: [
+    { type: 'zod', folder: './zod' },
+    { type: 'ts', folder: './types' },
+    { type: 'kysely', outFile: './db.ts' }
+  ],
+  overrideColumns: {
+    zod: {
+      users: {
+        email: 'z.string().email()',
+        metadata: 'z.record(z.unknown())'
+      },
+      posts: {
+        content: 'z.string().max(10000)'
+      }
+    },
+    ts: {
+      users: {
+        email: 'EmailAddress',
+        metadata: 'Record<string, unknown>'
+      }
+    },
+    kysely: {
+      users: {
+        metadata: 'CustomJsonType'
+      }
+    }
+  }
+}
+```
+
+**Priority order** (highest to lowest):
+1. `overrideColumns` - Specific column overrides
+2. Magic comments (`@zod`, `@ts`, `@kysely`) - Column-level comments
+3. `overrideTypes` - Global type overrides
+4. Default type mappings

package/dist/main.d.ts

@@ -7,6 +7,7 @@ interface Desc {
     Extra: string;
     Null: string;
     Type: string;
+    DataType?: string;
     Comment: string;
     EnumOptions?: string[];
 }
@@ -40,9 +41,6 @@ interface Config {
     origin: {
         type: 'prisma';
         path: string;
-        overrideTypes?: {
-            [k in PrismaValidTypes]?: string;
-        };
     } | {
         type: 'mysql';
         host: string;
@@ -50,10 +48,8 @@ interface Config {
         user: string;
         password: string;
         database: string;
-        overrideTypes?: {
-            [k in MySQLValidTypes]?: string;
-        };
         ssl?: Record<string, any>;
+        tinyIntAsBoolean?: boolean;
     } | {
         type: 'postgres';
         host: string;
@@ -62,16 +58,10 @@ interface Config {
         password: string;
         database: string;
         schema?: string;
-        overrideTypes?: {
-            [k in PostgresValidTypes]?: string;
-        };
         ssl?: Record<string, any>;
     } | {
         type: 'sqlite';
         path: string;
-        overrideTypes?: {
-            [k in SQLiteValidTypes]?: string;
-        };
     };
     destinations: Destination[];
     tables?: string[];
@@ -82,6 +72,16 @@ interface Config {
     silent?: boolean;
     dryRun?: boolean;
     magicComments?: boolean;
+    overrideTypes?: {
+        zod?: Record<string, string>;
+        ts?: Record<string, string>;
+        kysely?: Record<string, string>;
+    };
+    overrideColumns?: {
+        zod?: Record<string, Record<string, string>>;
+        ts?: Record<string, Record<string, string>>;
+        kysely?: Record<string, Record<string, string>>;
+    };
     includeViews?: boolean;
     enumDeclarations?: Record<string, string[]>;
     inflection?: 'singular' | 'plural' | 'none';
@@ -104,10 +104,6 @@ interface GenerateViewContentParams {
     enumDeclarations: Record<string, string[]>;
     defaultZodHeader: (version: 3 | 4) => string;
 }
-type MySQLValidTypes = 'tinyint' | 'smallint' | 'mediumint' | 'int' | 'bigint' | 'decimal' | 'float' | 'double' | 'bit' | 'char' | 'varchar' | 'binary' | 'varbinary' | 'tinyblob' | 'blob' | 'mediumblob' | 'longblob' | 'tinytext' | 'text' | 'mediumtext' | 'longtext' | 'enum' | 'set' | 'date' | 'time' | 'datetime' | 'timestamp' | 'year' | 'json';
-type PostgresValidTypes = 'smallint' | 'integer' | 'bigint' | 'decimal' | 'numeric' | 'real' | 'double precision' | 'smallserial' | 'serial' | 'bigserial' | 'money' | 'character varying' | 'varchar' | 'character' | 'char' | 'text' | 'bytea' | 'timestamp' | 'timestamp with time zone' | 'timestamp without time zone' | 'date' | 'time' | 'time with time zone' | 'time without time zone' | 'interval' | 'boolean' | 'enum' | 'point' | 'line' | 'lseg' | 'box' | 'path' | 'polygon' | 'circle' | 'cidr' | 'inet' | 'macaddr' | 'bit' | 'bit varying' | 'uuid' | 'xml' | 'json' | 'jsonb' | 'int4range' | 'int8range' | 'numrange' | 'tsrange' | 'tstzrange' | 'daterange' | 'name' | 'citext';
-type SQLiteValidTypes = 'integer' | 'real' | 'text' | 'blob' | 'numeric' | 'boolean' | 'date' | 'datetime' | 'character' | 'varchar' | 'varying character' | 'nchar' | 'native character' | 'nvarchar' | 'clob' | 'double' | 'double precision' | 'float' | 'int' | 'int2' | 'int8' | 'bigint' | 'unsigned big int' | 'mediumint' | 'tinyint' | 'smallint' | 'decimal' | 'json';
-type PrismaValidTypes = 'String' | 'Boolean' | 'Int' | 'BigInt' | 'Float' | 'Decimal' | 'DateTime' | 'Json' | 'Bytes' | 'Unsupported';
 
 /**
  * Constants and default headers for code generation
@@ -157,7 +153,7 @@ type OperationType = 'table' | 'insertable' | 'updateable' | 'selectable';
 /**
  * Generate the appropriate type for a database field
  */
-declare function getType(op: OperationType, desc: Desc, config: Config, destination: Destination): string;
+declare function getType(op: OperationType, desc: Desc, config: Config, destination: Destination, entityName?: string): string;
 
 /**
  * Mutano - Database schema to TypeScript/Zod/Kysely converter

package/dist/main.js

@@ -43,8 +43,8 @@ function filterViews(views, includedViews, ignoredViews) {
 }
 function createEntityList(tables, views) {
   const allEntities = [
-    ...tables.map((name) => ({ name, type: "table" })),
-    ...views.map((name) => ({ name, type: "view" }))
+    ...tables.filter((name) => typeof name === "string" && name.length > 0).map((name) => ({ name, type: "table" })),
+    ...views.filter((name) => typeof name === "string" && name.length > 0).map((name) => ({ name, type: "view" }))
   ];
   return allEntities.sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -60,7 +60,7 @@ function applyInflection(name, inflection) {
 }
 
 const dateTypes = {
-  mysql: ["date", "datetime", "timestamp"],
+  mysql: ["date", "datetime", "datetime(3)", "timestamp", "timestamp(3)"],
   postgres: [
     "timestamp",
     "timestamp with time zone",
@@ -218,10 +218,17 @@ const hasTableIgnoreDirective = (comment) => {
   return comment.includes("@@ignore");
 };
 
-function getType(op, desc, config, destination) {
-  const { Default, Extra, Null, Type, Comment, EnumOptions } = desc;
+function getType(op, desc, config, destination, entityName) {
+  const { Default, Extra, Null, Type, DataType, Comment, EnumOptions } = desc;
   const schemaType = config.origin.type;
   const type = schemaType === "prisma" ? Type : Type.toLowerCase();
+  let dataType = DataType ? schemaType === "prisma" ? DataType : DataType.toLowerCase() : type;
+  const isMySQL = schemaType === "mysql";
+  const tinyIntAsBoolean = isMySQL && config.origin.tinyIntAsBoolean !== false;
+  const isTinyInt1 = isMySQL && dataType === "tinyint" && Type.toLowerCase().includes("(1)");
+  if (tinyIntAsBoolean && isTinyInt1) {
+    dataType = "boolean";
+  }
   const isNull = Null === "YES";
   const hasDefaultValue = Default !== null;
   const isGenerated = Extra.toLowerCase().includes("auto_increment") || Extra.toLowerCase().includes("default_generated");
@@ -229,28 +236,18 @@ function getType(op, desc, config, destination) {
   const isKyselyDestination = destination.type === "kysely";
   const isZodDestination = destination.type === "zod";
   const typeMappings = getTypeMappings(schemaType);
-  if (isTsDestination || isKyselyDestination) {
-    const isJsonField = isJsonType(type);
-    if (isKyselyDestination && isJsonField) {
-      if (config.magicComments) {
-        const kyselyOverrideType = extractKyselyExpression(Comment);
-        if (kyselyOverrideType) {
-          return kyselyOverrideType;
-        }
-      }
+  const destKey = isZodDestination ? "zod" : isTsDestination ? "ts" : "kysely";
+  if (entityName && config.overrideColumns) {
+    const destOverrides = config.overrideColumns[destKey];
+    if (destOverrides && destOverrides[entityName] && destOverrides[entityName][desc.Field]) {
+      const columnOverride = destOverrides[entityName][desc.Field];
       const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
-      return shouldBeNullable ? "Json | null" : "Json";
-    }
-    if (isKyselyDestination && config.magicComments) {
-      const kyselyOverrideType = extractKyselyExpression(Comment);
-      if (kyselyOverrideType) {
-        return kyselyOverrideType;
-      }
-    }
-    if ((isTsDestination || isKyselyDestination) && config.magicComments) {
-      const tsOverrideType = extractTSExpression(Comment);
-      if (tsOverrideType) {
-        return tsOverrideType;
+      if (isZodDestination) {
+        const nullishOption = destination.nullish;
+        const nullableMethod = nullishOption && op !== "selectable" ? "nullish" : "nullable";
+        return shouldBeNullable ? `${columnOverride}.${nullableMethod}()` : columnOverride;
+      } else {
+        return shouldBeNullable ? `${columnOverride} | null` : columnOverride;
       }
     }
   }
@@ -260,9 +257,24 @@ function getType(op, desc, config, destination) {
       return zodOverrideType;
     }
   }
-  const overrideTypes = config.origin.overrideTypes;
-  if (overrideTypes && overrideTypes[Type]) {
-    const overrideType = overrideTypes[Type];
+  if (isTsDestination && config.magicComments) {
+    const tsOverrideType = extractTSExpression(Comment);
+    if (tsOverrideType) {
+      return tsOverrideType;
+    }
+  }
+  if (isKyselyDestination && config.magicComments) {
+    const kyselyOverrideType = extractKyselyExpression(Comment);
+    if (kyselyOverrideType) {
+      return kyselyOverrideType;
+    }
+    const tsOverrideType = extractTSExpression(Comment);
+    if (tsOverrideType) {
+      return tsOverrideType;
+    }
+  }
+  const overrideType = config.overrideTypes?.[destKey]?.[Type];
+  if (overrideType) {
     const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
     if (isZodDestination) {
       const nullishOption = destination.nullish;
@@ -272,12 +284,19 @@ function getType(op, desc, config, destination) {
       return shouldBeNullable ? `${overrideType} | null` : overrideType;
     }
   }
-  const enumTypesForSchema = typeMappings.enumTypes[schemaType] || [];
-  const isEnum = enumTypesForSchema.includes(type);
+  if (isTsDestination || isKyselyDestination) {
+    const isJsonField = isJsonType(dataType);
+    if (isKyselyDestination && isJsonField) {
+      const shouldBeNullable = isNull || ["insertable", "updateable"].includes(op) && (hasDefaultValue || isGenerated) || op === "updateable" && !isNull && !hasDefaultValue;
+      return shouldBeNullable ? "Json | null" : "Json";
+    }
+  }
+  const enumTypesForSchema = typeMappings.enumTypes || [];
+  const isEnum = enumTypesForSchema.includes(dataType);
   const isPrismaEnum = schemaType === "prisma" && config.enumDeclarations && config.enumDeclarations[type];
   if (isEnum || isPrismaEnum) {
     let enumValues = [];
-    if (schemaType === "mysql" && type === "enum") {
+    if (schemaType === "mysql" && dataType === "enum") {
       const match = Type.match(enumRegex);
       if (match) {
         enumValues = match[1].split(",").map((v) => v.trim().replace(/'/g, ""));
@@ -331,12 +350,12 @@ function getType(op, desc, config, destination) {
       }
     }
   }
-  return generateStandardType(op, desc, config, destination, typeMappings);
+  return generateStandardType(op, desc, config, destination, typeMappings, dataType);
 }
-function generateStandardType(op, desc, config, destination, typeMappings) {
+function generateStandardType(op, desc, config, destination, typeMappings, dataType) {
   const { Default, Extra, Null, Type } = desc;
   const schemaType = config.origin.type;
-  const type = schemaType === "prisma" ? Type : Type.toLowerCase();
+  schemaType === "prisma" ? Type : Type.toLowerCase();
   const isNull = Null === "YES";
   const hasDefaultValue = Default !== null;
   const isGenerated = Extra.toLowerCase().includes("auto_increment") || Extra.toLowerCase().includes("default_generated");
@@ -345,7 +364,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
   const shouldBeNullable = isNull;
   const shouldBeOptional = op === "insertable" && (hasDefaultValue || isGenerated) || op === "updateable";
   let baseType;
-  if (typeMappings.dateTypes.includes(type)) {
+  if (typeMappings.dateTypes.includes(dataType)) {
     if (isZodDestination) {
       const useDateType = destination.useDateType;
       if (useDateType) {
@@ -356,7 +375,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     } else {
       baseType = "Date";
     }
-  } else if (typeMappings.bigIntTypes.includes(type)) {
+  } else if (typeMappings.bigIntTypes.includes(dataType)) {
     if (isZodDestination) {
       baseType = "z.string()";
     } else if (isKyselyDestination) {
@@ -364,7 +383,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     } else {
       baseType = "string";
     }
-  } else if (typeMappings.decimalTypes.includes(type)) {
+  } else if (typeMappings.decimalTypes.includes(dataType)) {
     if (isZodDestination) {
       baseType = "z.string()";
       if (op !== "selectable") {
@@ -378,13 +397,13 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     } else {
       baseType = "string";
     }
-  } else if (typeMappings.numberTypes.includes(type)) {
+  } else if (typeMappings.numberTypes.includes(dataType)) {
     if (isZodDestination) {
       baseType = "z.number()";
     } else {
       baseType = "number";
     }
-  } else if (typeMappings.booleanTypes.includes(type)) {
+  } else if (typeMappings.booleanTypes.includes(dataType)) {
     if (isZodDestination) {
       const useBooleanType = destination.useBooleanType;
       if (useBooleanType) {
@@ -395,7 +414,7 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     } else {
       baseType = "boolean";
     }
-  } else if (typeMappings.stringTypes.includes(type)) {
+  } else if (typeMappings.stringTypes.includes(dataType)) {
     if (isZodDestination) {
       const useTrim = destination.useTrim;
       const requiredString = destination.requiredString;
@@ -413,11 +432,11 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
     const nullableMethod = nullishOption && op !== "selectable" ? "nullish" : "nullable";
     if ((op === "table" || op === "insertable" || op === "updateable") && hasDefaultValue && Default !== null && !isGenerated) {
       let defaultValueFormatted = Default;
-      if (typeMappings.stringTypes.includes(type) || typeMappings.dateTypes.includes(type)) {
+      if (typeMappings.stringTypes.includes(dataType) || typeMappings.dateTypes.includes(dataType)) {
         defaultValueFormatted = `'${Default}'`;
-      } else if (typeMappings.booleanTypes.includes(type)) {
+      } else if (typeMappings.booleanTypes.includes(dataType)) {
         defaultValueFormatted = Default.toLowerCase() === "true" ? "true" : "false";
-      } else if (typeMappings.numberTypes.includes(type)) {
+      } else if (typeMappings.numberTypes.includes(dataType)) {
         defaultValueFormatted = Default;
       } else {
         defaultValueFormatted = `'${Default}'`;
@@ -432,9 +451,9 @@ function generateStandardType(op, desc, config, destination, typeMappings) {
         return `${baseType}.default(${defaultValueFormatted})`;
       }
     }
-    const isDateField = typeMappings.dateTypes.includes(type);
+    const isDateField = typeMappings.dateTypes.includes(dataType);
     const shouldDateBeOptional = isDateField && (hasDefaultValue || isGenerated) && (op === "table" || op === "selectable");
-    const isIdField = typeMappings.numberTypes.includes(type) || typeMappings.bigIntTypes.includes(type) || typeMappings.stringTypes.includes(type);
+    const isIdField = typeMappings.numberTypes.includes(dataType) || typeMappings.bigIntTypes.includes(dataType) || typeMappings.stringTypes.includes(dataType);
     const shouldIdBeOptional = isIdField && isGenerated && (op === "table" || op === "selectable");
     if (shouldBeNullable && shouldBeOptional) {
       return `${baseType}.${nullableMethod}()`;
@@ -495,7 +514,7 @@ function generateViewContent({
 `;
     for (const desc of describes) {
       const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-      const fieldType = getType("selectable", desc, config, destination);
+      const fieldType = getType("selectable", desc, config, destination, view);
       content += `  ${fieldName}: ${fieldType};
 `;
     }
@@ -512,7 +531,7 @@ function generateViewContent({
 `;
     for (const desc of describes) {
       const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-      const fieldType = getType("selectable", desc, config, destination);
+      const fieldType = getType("selectable", desc, config, destination, view);
       content += `  ${fieldName}: ${fieldType};
 `;
     }
@@ -530,7 +549,7 @@ function generateViewContent({
 `;
     for (const desc of describes) {
       const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-      const fieldType = getType("selectable", desc, config, destination);
+      const fieldType = getType("selectable", desc, config, destination, view);
       content += `  ${fieldName}: ${fieldType},
 `;
     }
@@ -598,7 +617,7 @@ function generateTypeScriptContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("table", desc, config, destination);
+    const fieldType = getType("table", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType};
 `;
   }
@@ -607,7 +626,7 @@ function generateTypeScriptContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("insertable", desc, config, destination);
+    const fieldType = getType("insertable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType};
 `;
   }
@@ -616,7 +635,7 @@ function generateTypeScriptContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("updateable", desc, config, destination);
+    const fieldType = getType("updateable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType};
 `;
   }
@@ -625,7 +644,7 @@ function generateTypeScriptContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("selectable", desc, config, destination);
+    const fieldType = getType("selectable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType};
 `;
   }
@@ -651,7 +670,7 @@ function generateKyselyContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    let fieldType = getType("table", desc, config, destination);
+    let fieldType = getType("table", desc, config, destination, table);
     const hasMagicComment = config.magicComments && (desc.Comment.includes("@kysely(") || desc.Comment.includes("@ts("));
     if (!hasMagicComment) {
       const isAutoIncrement = desc.Extra.toLowerCase().includes("auto_increment");
@@ -695,7 +714,7 @@ function generateZodContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("table", desc, config, destination);
+    const fieldType = getType("table", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType},
 `;
   }
@@ -708,7 +727,7 @@ function generateZodContent({
       continue;
     }
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("insertable", desc, config, destination);
+    const fieldType = getType("insertable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType},
 `;
   }
@@ -721,7 +740,7 @@ function generateZodContent({
       continue;
     }
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("updateable", desc, config, destination);
+    const fieldType = getType("updateable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType},
 `;
   }
@@ -730,7 +749,7 @@ function generateZodContent({
 `;
   for (const desc of describes) {
     const fieldName = isCamelCase ? camelCase(desc.Field) : desc.Field;
-    const fieldType = getType("selectable", desc, config, destination);
+    const fieldType = getType("selectable", desc, config, destination, table);
     content += `  ${fieldName}: ${fieldType},
 `;
   }
@@ -796,7 +815,7 @@ async function extractTables(db, config) {
         FROM information_schema.tables
         WHERE table_schema = ? AND table_type = 'BASE TABLE'
       `, [origin.database]);
-      return mysqlTables[0].filter((row) => !hasTableIgnoreDirective(row.table_comment || "")).map((row) => row.table_name);
+      return mysqlTables[0].filter((row) => !hasTableIgnoreDirective(row.TABLE_COMMENT || row.table_comment || "")).map((row) => row.TABLE_NAME || row.table_name).filter((name) => typeof name === "string" && name.length > 0);
     case "postgres":
       const schema = origin.schema || "public";
       const postgresTables = await db.raw(`
@@ -825,7 +844,7 @@ async function extractViews(db, config) {
         FROM information_schema.tables
         WHERE table_schema = ? AND table_type = 'VIEW'
       `, [origin.database]);
-      return mysqlViews[0].filter((row) => !hasTableIgnoreDirective(row.table_comment || "")).map((row) => row.table_name);
+      return mysqlViews[0].filter((row) => !hasTableIgnoreDirective(row.TABLE_COMMENT || row.table_comment || "")).map((row) => row.TABLE_NAME || row.table_name).filter((name) => typeof name === "string" && name.length > 0);
     case "postgres":
       const schema = origin.schema || "public";
       const postgresViews = await db.raw(`
@@ -855,6 +874,7 @@ async function extractColumnDescriptions(db, config, tableName) {
           column_default as \`Default\`,
           extra as \`Extra\`,
           is_nullable as \`Null\`,
+          data_type as \`DataType\`,
           column_type as \`Type\`,
           column_comment as \`Comment\`
         FROM information_schema.columns
@@ -866,6 +886,7 @@ async function extractColumnDescriptions(db, config, tableName) {
         Default: row.Default,
         Extra: row.Extra || "",
         Null: row.Null,
+        DataType: row.DataType,
         Type: row.Type,
         Comment: row.Comment || ""
       }));
@@ -939,6 +960,9 @@ function extractPrismaEntities(config) {
         if (e.type === "attribute") {
           return false;
         }
+        if (!e.name || typeof e.name !== "string") {
+          return false;
+        }
         if ("attributes" in e && e.attributes) {
           const hasIgnore = e.attributes.some((attr) => attr.name === "ignore");
           if (hasIgnore) {
@@ -963,7 +987,7 @@ function extractPrismaEntities(config) {
           }
         }
         return e.name;
-      });
+      }).filter((value) => typeof value === "string" && value !== "undefined");
       enumDeclarations[enumName] = filteredEnumValues;
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mutano",
   "type": "module",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "Converts Prisma/MySQL/PostgreSQL/SQLite schemas to Zod/TS/Kysely interfaces",
   "author": "Alisson Cavalcante Agiani <thelinuxlich@gmail.com>",
   "license": "MIT",
@@ -16,22 +16,22 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@mrleebo/prisma-ast": "^0.13.0",
+    "@mrleebo/prisma-ast": "^0.13.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/pg": "^8.15.5",
+    "@types/pg": "^8.16.0",
     "@types/pluralize": "^0.0.33",
-    "camelcase": "^8.0.0",
-    "fs-extra": "^11.3.2",
+    "camelcase": "^9.0.0",
+    "fs-extra": "^11.3.3",
     "knex": "^3.1.0",
-    "mysql2": "^3.14.4",
-    "pg": "^8.16.3",
+    "mysql2": "^3.16.3",
+    "pg": "^8.18.0",
     "pluralize": "^8.0.0",
     "sqlite3": "^5.1.7"
   },
   "devDependencies": {
-    "@electric-sql/pglite": "^0.3.8",
-    "pkgroll": "^2.15.4",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
+    "@electric-sql/pglite": "^0.3.15",
+    "pkgroll": "^2.23.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   }
 }