mutano 2.6.2 → 2.6.4

package/dist/main.d.ts

@@ -13,7 +13,7 @@ export interface GenerateContentParams {
     defaultZodHeader: string;
 }
 export declare function generateContent({ table, describes, config, destination, isCamelCase, enumDeclarations, defaultZodHeader, }: GenerateContentParams): string;
-export declare const defaultKyselyHeader = "import { Generated, ColumnType, Selectable, Insertable, Updateable } from 'kysely';\n\n";
+export declare const defaultKyselyHeader = "import { ColumnType, Selectable, Insertable, Updateable } from 'kysely';\n\n";
 export declare const defaultZodHeader = "import { z } from 'zod';\n\n";
 export declare function generate(config: Config): Promise<Record<string, string>>;
 type MySQLValidTypes = 'date' | 'datetime' | 'timestamp' | 'time' | 'year' | 'char' | 'varchar' | 'tinytext' | 'text' | 'mediumtext' | 'longtext' | 'json' | 'decimal' | 'tinyint' | 'smallint' | 'mediumint' | 'int' | 'bigint' | 'float' | 'double' | 'enum';

package/dist/main.js

@@ -396,7 +396,7 @@ export interface ${camelCase(table, { pascalCase: true })} {`;
             kyselyType = `Generated<${kyselyType}>`;
           }
         } else if (isJsonField) {
-          kyselyType = "Json";
+          kyselyType = isNullable ? "Json | null" : "Json";
         } else {
           if (isNullable && !isJsonField) {
             if (!kyselyType.includes("| null")) {
@@ -573,7 +573,7 @@ export type Selectable${camelCase(`${table}Type`, {
   }
   return content;
 }
-const defaultKyselyHeader = "import { Generated, ColumnType, Selectable, Insertable, Updateable } from 'kysely';\n\n";
+const defaultKyselyHeader = "import { ColumnType, Selectable, Insertable, Updateable } from 'kysely';\n\n";
 const defaultZodHeader = "import { z } from 'zod';\n\n";
 async function generate(config) {
   let tables = [];
@@ -873,6 +873,10 @@ export type JsonPrimitive = boolean | number | string | null;
 
 export type JsonValue = JsonArray | JsonObject | JsonPrimitive;
 
+export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
+  ? ColumnType<S, I | undefined, U>
+  : ColumnType<T, T | undefined, T>
+
 export type Decimal = ColumnType<string, number | string, number | string>
 
 export type BigInt = ColumnType<string, number | string, number | string>

package/package.json

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