@zuzjs/orm 0.1.4 → 0.1.6

package/dist/drivers/mysql/index.js

@@ -140,30 +140,41 @@ class MySqlDriver {
         console.log(picocolors_1.default.cyan(`○ ${tables.length} Tables Found.`));
         const tableNames = tables.map((row) => Object.values(row)[0]);
         console.log(picocolors_1.default.yellow(`○ Generating Models...`));
+        // Fetch foreign keys
+        const foreignKeys = {};
         for (const tableName of tableNames) {
+            const [fkResults] = await this.pool.execute(`SELECT COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME 
+                FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE 
+                WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND REFERENCED_TABLE_NAME IS NOT NULL`, [this.conn.database, tableName]);
+            foreignKeys[tableName] = fkResults;
+        }
+        for (const tableName of tableNames) {
+            const imports = [];
+            const _imports = [`Entity`, `BaseEntity`];
             // Get table structure
-            const [columns] = await self.pool.execute(`DESCRIBE ${tableName}`);
-            const entityCode = [
-                `/**`,
-                `* AutoGenerated by @zuzjs/orm.`,
-                `* @ ${new Date().toString().split(` GMT`)[0].trim()}`,
-                `*/`,
-                `import { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity } from "@zuzjs/orm";\n`,
-                `@Entity({ name: "${tableName}" })`,
-                `export class ${(0, index_js_1.toPascalCase)(tableName)} extends BaseEntity {\n`
-            ];
+            // const [columns]: [any[], any] = await self.pool!.execute(`DESCRIBE ${tableName}`);
+            const [columns] = await this.pool.execute(`SELECT COLUMN_NAME as \`Field\`, COLUMN_TYPE as \`Type\`, COLUMN_KEY as \`Key\`, IS_NULLABLE as \`Null\`, COLUMN_DEFAULT as \`Default\`, EXTRA as \`Extra\`, COLUMN_COMMENT as \`Comment\`
+                 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? ORDER BY ORDINAL_POSITION ASC`, [this.conn.database, tableName]);
+            const entityCode = [];
             let hasPrimary = false;
             for (const column of columns) {
-                // const { Field, Type, Key } = column;
-                const { Field, Type, Key, Null, Default, Extra } = column;
+                // console.log(tableName, column)
+                const { Field, Type, Key, Null, Default, Extra, Comment } = column;
                 const { tsType, columnType, length } = this.mapColumns(Type);
                 // Handle primary key
                 if (Key === "PRI") {
-                    entityCode.push(Extra.includes("auto_increment") ? `\t@PrimaryGeneratedColumn()` : `\t@PrimaryColumn()`);
+                    const _priColumn = Extra.includes("auto_increment") ? `PrimaryGeneratedColumn` : `PrimaryColumn`;
+                    if (!_imports.includes(_priColumn))
+                        _imports.push(_priColumn);
+                    entityCode.push(`\t@${_priColumn}()`);
                     hasPrimary = true;
                 }
                 else {
+                    // const hasForeignKey = foreignKeys[tableName as string].find((fk) => fk.COLUMN_NAME === Field);
+                    // let columnDecorator = hasForeignKey ? `\t@JoinColumn({ type: "${columnType}"` : `\t@Column({ type: "${columnType}"`;
                     let columnDecorator = `\t@Column({ type: "${columnType}"`;
+                    if (!_imports.includes(`Column`))
+                        _imports.push(`Column`);
                     if (length)
                         columnDecorator += `, length: ${length}`;
                     if (Null === "YES")
@@ -173,14 +184,42 @@ class MySqlDriver {
                     columnDecorator += ` })`;
                     entityCode.push(columnDecorator);
                 }
+                if (Comment && Comment.length > 0) {
+                    entityCode.push(`\t/** @comment ${Comment} */`);
+                }
                 entityCode.push(`\t${Field}!: ${tsType};\n`);
             }
-            entityCode.push(`}`);
+            // Add foreign key relationships
+            if (foreignKeys[tableName]) {
+                for (const fk of foreignKeys[tableName] || []) {
+                    const relatedEntity = (0, index_js_1.toPascalCase)(fk.REFERENCED_TABLE_NAME);
+                    entityCode.push(`\t@OneToOne(() => ${relatedEntity})`);
+                    entityCode.push(`\t@JoinColumn({ name: "${fk.COLUMN_NAME}" })`);
+                    entityCode.push(`\tfk${relatedEntity}!: ${relatedEntity};\n`);
+                    imports.push(`import { ${relatedEntity} } from "./${fk.REFERENCED_TABLE_NAME}";`);
+                    if (!_imports.includes(`OneToOne`))
+                        _imports.push(`OneToOne`);
+                    if (!_imports.includes(`JoinColumn`))
+                        _imports.push(`JoinColumn`);
+                }
+            }
+            const Code = [
+                `/**`,
+                `* AutoGenerated by @zuzjs/orm.`,
+                `* @ ${new Date().toString().split(` GMT`)[0].trim()}`,
+                `*/`,
+                `import { ${_imports.join(`, `)} } from "@zuzjs/orm";`,
+                imports.length > 0 ? imports.join(`\n`) : ``,
+                `${imports.length > 0 ? `\n` : ``}@Entity({ name: "${tableName}" })`,
+                `export class ${(0, index_js_1.toPascalCase)(tableName)} extends BaseEntity {\n`,
+                ...entityCode,
+                `}`
+            ];
             if (!hasPrimary) {
                 console.log(picocolors_1.default.bgRed(picocolors_1.default.whiteBright(` WARNING `)), picocolors_1.default.yellow(`○ "${tableName}" does not have a primary column. Primary column is required.`));
             }
             // Write entity file
-            fs_1.default.writeFileSync(path_1.default.join(this.dist, `${tableName}.ts`), entityCode.join(`\n`));
+            fs_1.default.writeFileSync(path_1.default.join(this.dist, `${tableName}.ts`), Code.join(`\n`));
         }
         await self.pool.end();
         console.log(picocolors_1.default.green(`✓ ${tables.length} Tables Processed.`));

package/dist/drivers/queryBuilder.d.ts

@@ -1,4 +1,4 @@
-import { Repository, ObjectLiteral, FindOptionsWhere } from "typeorm";
+import { Repository, ObjectLiteral } from "typeorm";
 import { QueryAction } from "../types";
 import { QueryResult } from "mysql2";
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
@@ -22,6 +22,12 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @returns The current instance of ZormQueryBuilder.
      */
     with(data: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T[]>): this;
+    /**
+     * Sets the values for an insert or update query.
+     * @param data - The data to be inserted or updated.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    withData(data: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T[]>): this;
     /**
      * Specifies the fields to be selected in a select query.
      * @param fields - The fields to be selected.
@@ -40,7 +46,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @param condition - The condition to be added.
      * @returns The current instance of ZormQueryBuilder.
      */
-    or(condition: FindOptionsWhere<T>): this;
+    or(condition: Partial<Record<keyof T, any>>): this;
     /**
      * Adds an ORDER BY clause to the query.
      * @param field - The field to order by.
@@ -65,7 +71,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @param relations - The relations to be included.
      * @returns The current instance of ZormQueryBuilder.
      */
-    relations(relations: string[]): this;
+    withRelation(rel: string, ...more: string[]): this;
     /**
      * Adds an INNER JOIN clause to the query.
      * @param relation - The relation to join.

package/dist/drivers/queryBuilder.js

@@ -77,6 +77,15 @@ class ZormQueryBuilder extends Promise {
         this.queryValues = data;
         return this;
     }
+    /**
+     * Sets the values for an insert or update query.
+     * @param data - The data to be inserted or updated.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    withData(data) {
+        this.queryValues = data;
+        return this;
+    }
     /**
      * Specifies the fields to be selected in a select query.
      * @param fields - The fields to be selected.
@@ -88,20 +97,21 @@ class ZormQueryBuilder extends Promise {
         return this;
     }
     applyCondition(qb, condition, type) {
-        Object.entries(condition).forEach(([key, value]) => {
+        Object.entries(condition).forEach(([key, value], index) => {
+            const paramKey = `${key}Param${index}_${this.whereCount}`; // Unique parameter name
             if (typeof value === "string") {
                 const match = value.match(/^(!=|>=|<=|>|<|=)\s*(.+)$/); // Improved regex
                 if (match) {
                     const [, operator, rawValue] = match;
                     const sqlOperator = operator; // Directly use the matched operator
-                    const paramKey = `${key}Param`; // Unique parameter name
                     const parsedValue = !isNaN(Number(rawValue)) ? Number(rawValue) : rawValue.trim(); // Convert to number if possible
                     qb[type](`${qb.alias}.${key} ${sqlOperator} :${paramKey}`, { [paramKey]: parsedValue });
                     return;
                 }
             }
             // Default case (normal equality condition)
-            qb[type](`${this.entityAlias}.${key} = :${key}`, { [key]: value });
+            qb[type](`${this.entityAlias}.${key} = :${paramKey}`, { [paramKey]: value });
+            this.whereCount++;
         });
     }
     /**
@@ -112,7 +122,6 @@ class ZormQueryBuilder extends Promise {
     where(condition) {
         const qb = this.queryBuilder;
         this.applyCondition(qb, condition, `andWhere`);
-        this.whereCount++;
         return this;
     }
     /**
@@ -158,8 +167,8 @@ class ZormQueryBuilder extends Promise {
      * @param relations - The relations to be included.
      * @returns The current instance of ZormQueryBuilder.
      */
-    relations(relations) {
-        relations.forEach(relation => this.queryBuilder.leftJoinAndSelect(`${this.entityAlias}.${relation}`, relation));
+    withRelation(rel, ...more) {
+        [rel, ...more].forEach(relation => this.queryBuilder.leftJoinAndSelect(`${this.entityAlias}.${relation}`, relation));
         return this;
     }
     /**
@@ -276,7 +285,6 @@ class ZormQueryBuilder extends Promise {
                 case "create":
                     this._create();
                     const _create = await this.queryBuilder.execute();
-                    // console.log(_create)
                     return {
                         created: true,
                         id: _create.raw.insertId,

package/dist/types.d.ts

@@ -48,4 +48,4 @@ export type DeleteQueryResult = {
     count: number;
     error?: QueryError;
 };
-export { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+export { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity, OneToOne, JoinColumn, } from "typeorm";

package/dist/types.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntity = exports.Column = exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.Entity = void 0;
+exports.JoinColumn = exports.OneToOne = exports.BaseEntity = exports.Column = exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.Entity = void 0;
 var typeorm_1 = require("typeorm");
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return typeorm_1.Entity; } });
 Object.defineProperty(exports, "PrimaryColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryColumn; } });
 Object.defineProperty(exports, "PrimaryGeneratedColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryGeneratedColumn; } });
 Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return typeorm_1.Column; } });
 Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return typeorm_1.BaseEntity; } });
+Object.defineProperty(exports, "OneToOne", { enumerable: true, get: function () { return typeorm_1.OneToOne; } });
+Object.defineProperty(exports, "JoinColumn", { enumerable: true, get: function () { return typeorm_1.JoinColumn; } });

package/package.json

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