@zuzjs/orm 0.2.4 → 0.2.6

package/dist/drivers/mysql/index.d.ts

@@ -32,6 +32,7 @@ export declare class MySqlDriver implements ModelGenerator {
         tsType: string;
         columnType: string;
         length?: number;
+        enumValues?: string[];
     };
     formatDefault(value: any, tsType: string): string | number;
     generate(): Promise<void>;

package/dist/drivers/mysql/index.js

@@ -103,8 +103,8 @@ class MySqlDriver {
             "tinyint": { tsType: "boolean", columnType: "tinyint" },
             "smallint": { tsType: "number", columnType: "smallint" },
             "mediumint": { tsType: "number", columnType: "mediumint" },
-            "bigint": { tsType: "string", columnType: "bigint" }, // bigint is safer as string
-            "decimal": { tsType: "string", columnType: "decimal" },
+            "bigint": { tsType: "number", columnType: "bigint" }, // bigint is safer as string
+            "decimal": { tsType: "number", columnType: "decimal" },
             "float": { tsType: "number", columnType: "float" },
             "double": { tsType: "number", columnType: "double" },
             "varchar": { tsType: "string", columnType: "varchar", length: 255 },
@@ -117,6 +117,13 @@ class MySqlDriver {
             "time": { tsType: "string", columnType: "time" },
             "json": { tsType: "any", columnType: "json" },
         };
+        const enumMatch = sqlType.match(/^enum\((.*)\)$/i);
+        if (enumMatch) {
+            const enumValues = enumMatch[1]
+                .split(",")
+                .map((val) => val.trim().replace(/^'|'$/g, "")); // Remove single quotes
+            return { tsType: `"${enumValues.join('" | "')}"`, columnType: "enum", enumValues };
+        }
         const match = sqlType.match(/^(\w+)(?:\((\d+)\))?/);
         if (!match)
             return { tsType: "any", columnType: "varchar", length: 255 };
@@ -150,6 +157,7 @@ class MySqlDriver {
             foreignKeys[tableName] = fkResults;
         }
         for (const tableName of tableNames) {
+            const enums = [];
             const imports = [];
             const _imports = [`Entity`, `BaseEntity`];
             // Get table structure
@@ -160,7 +168,13 @@ class MySqlDriver {
             for (const column of columns) {
                 // console.log(tableName, column)
                 const { Field, Type, Key, Null, Default, Extra, Comment } = column;
-                const { tsType, columnType, length } = this.mapColumns(Type);
+                const { tsType, columnType, length, enumValues } = this.mapColumns(Type);
+                let enumName = null;
+                if (columnType === "enum" && enumValues) {
+                    enumName = (0, index_js_1.toPascalCase)(Field);
+                    enums.push(`export enum ${enumName} { ${enumValues.map(v => `${(0, index_js_1.toPascalCase)(v)} = "${v}"`).join(", ")} }`);
+                    // entityCode.push(`\t@Column({ type: "enum", enum: ${enumName} })\n`);
+                }
                 // Handle primary key
                 if (Key === "PRI") {
                     const _priColumn = Extra.includes("auto_increment") ? `PrimaryGeneratedColumn` : `PrimaryColumn`;
@@ -179,6 +193,8 @@ class MySqlDriver {
                         columnDecorator += `, length: ${length}`;
                     if (Null === "YES")
                         columnDecorator += `, nullable: true`;
+                    if (enumName)
+                        columnDecorator += `, enum: ${enumName}`;
                     if (Default !== null)
                         columnDecorator += `, default: ${this.formatDefault(Default, tsType)}`;
                     columnDecorator += ` })`;
@@ -187,7 +203,7 @@ class MySqlDriver {
                 if (Comment && Comment.length > 0) {
                     entityCode.push(`\t/** @comment ${Comment} */`);
                 }
-                entityCode.push(`\t${Field}!: ${Key == `PRI` && numberTypes.includes(Type) ? `number` : numberTypes.includes(Type) ? `number` : tsType};\n`);
+                entityCode.push(`\t${Field}!: ${enumName ? enumName : Key == `PRI` && numberTypes.includes(Type) ? `number` : numberTypes.includes(Type) ? `number` : tsType};\n`);
             }
             // Add foreign key relationships
             if (foreignKeys[tableName]) {
@@ -210,7 +226,8 @@ class MySqlDriver {
                 `*/`,
                 `import { ${_imports.join(`, `)} } from "@zuzjs/orm";`,
                 imports.length > 0 ? imports.join(`\n`) : ``,
-                `${imports.length > 0 ? `\n` : ``}@Entity({ name: "${tableName}" })`,
+                enums.length > 0 ? enums.join(`\n`) : ``,
+                `${enums.length > 0 || imports.length > 0 ? `\n` : ``}@Entity({ name: "${tableName}" })`,
                 `export class ${(0, index_js_1.toPascalCase)(tableName)} extends BaseEntity {\n`,
                 ...entityCode,
                 `}`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zuzjs/orm",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "keywords": [
         "orm",
         "zuz",