@zuzjs/orm 0.3.4 → 0.3.6

package/dist/drivers/mysql/index.js

@@ -156,6 +156,51 @@ class MySqlDriver {
                 WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND REFERENCED_TABLE_NAME IS NOT NULL`, [this.conn.database, tableName]);
             foreignKeys[tableName] = fkResults;
         }
+        // Track inverse relations: { tableName: { fkColumn: targetTable } }
+        const inverseRelations = {};
+        // Populate inverse map
+        for (const [tableName, fks] of Object.entries(foreignKeys)) {
+            for (const fk of fks) {
+                const targetTable = fk.REFERENCED_TABLE_NAME;
+                const fkColumn = fk.COLUMN_NAME;
+                const fkPropName = `fk${(0, index_js_1.toPascalCase)(targetTable)}`;
+                if (!inverseRelations[targetTable]) {
+                    inverseRelations[targetTable] = [];
+                }
+                inverseRelations[targetTable].push({
+                    fkColumn,
+                    fkPropName,
+                    targetTable: tableName,
+                    targetEntity: (0, index_js_1.toPascalCase)(tableName),
+                });
+            }
+        }
+        // Detect 2 Column Junction Tables for ManyToMany
+        const junctionTables = {};
+        for (const tableName of tableNames) {
+            const [cols] = await this.pool.execute(`SELECT COLUMN_NAME, COLUMN_KEY, EXTRA FROM INFORMATION_SCHEMA.COLUMNS 
+                 WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?`, [this.conn.database, tableName]);
+            const fks = foreignKeys[String(tableName)] || [];
+            if (fks.length !== 2)
+                continue;
+            // Must have exactly 2 columns
+            if (cols.length !== 2)
+                continue;
+            // Both columns must be primary key
+            if (cols.filter(c => c.COLUMN_KEY !== 'PRI').length > 0)
+                continue;
+            const [left, right] = fks;
+            const [t1, t2] = [left.REFERENCED_TABLE_NAME, right.REFERENCED_TABLE_NAME].sort();
+            const key = `${t1}_${t2}`;
+            if (!junctionTables[key]) {
+                junctionTables[key] = {
+                    left: t1,
+                    right: t2,
+                    leftCol: left.COLUMN_NAME,
+                    rightCol: right.COLUMN_NAME
+                };
+            }
+        }
         for (const tableName of tableNames) {
             const enums = [];
             const imports = [];
@@ -222,6 +267,44 @@ class MySqlDriver {
                     }
                 }
             }
+            // Add OneToMany Relations
+            const inverse = inverseRelations[String(tableName)] || [];
+            for (const rel of inverse) {
+                const propName = rel.targetTable.endsWith('s') ? rel.targetTable : `${rel.targetTable}s`;
+                if (entityCode.some(line => line.includes(` ${propName}!:`)))
+                    continue;
+                const importLine = `import { ${rel.targetEntity} } from "./${rel.targetTable}";`;
+                if (!imports.includes(importLine))
+                    imports.push(importLine);
+                if (!_imports.includes('OneToMany'))
+                    _imports.push('OneToMany');
+                // CORRECT: Inverse is fk + referenced table (e.g. fkUsers)
+                entityCode.push(`\t@OneToMany(() => ${rel.targetEntity}, r => r.${rel.fkPropName})`);
+                entityCode.push(`\tfk${(0, index_js_1.toPascalCase)(propName)}!: ${rel.targetEntity}[];\n`);
+                // entityCode.push(`\t@OneToMany(() => ${targetEntity}, r => r.${rel.fkColumn})`);
+                // entityCode.push(`\tfk${toPascalCase(propName)}!: ${targetEntity}[];\n`);
+            }
+            // Add Many-to-Many Relations
+            const junctions = Object.values(junctionTables)
+                .filter(j => j.left === tableName || j.right === tableName);
+            for (const j of junctions) {
+                const targetTable = j.left === tableName ? j.right : j.left;
+                const targetEntity = (0, index_js_1.toPascalCase)(targetTable);
+                const propName = targetTable.endsWith('s') ? targetTable : `${targetTable}s`;
+                if (entityCode.some(line => line.includes(`@${propName}`)))
+                    continue;
+                const importLine = `import { ${targetEntity} } from "./${targetTable}";`;
+                if (!imports.includes(importLine)) {
+                    imports.push(importLine);
+                }
+                if (!_imports.includes('ManyToMany'))
+                    _imports.push('ManyToMany');
+                if (!_imports.includes('JoinTable'))
+                    _imports.push('JoinTable');
+                entityCode.push(`\t@ManyToMany(() => ${targetEntity})`);
+                entityCode.push(`\t@JoinTable()`);
+                entityCode.push(`\tom${propName}!: ${targetEntity}[];\n`);
+            }
             const Code = [
                 `/**`,
                 `* AutoGenerated by @zuzjs/orm.`,
@@ -241,6 +324,11 @@ class MySqlDriver {
             // Write entity file
             fs_1.default.writeFileSync(path_1.default.join(this.dist, `${tableName}.ts`), Code.join(`\n`));
         }
+        // Write entry file i.e index.ts
+        const entry = tableNames
+            .map(tableName => `import { ${(0, index_js_1.toPascalCase)(tableName)} } from "./${tableName}";`);
+        entry.push(`import Zorm from "@zuzjs/orm";`, `import de from "dotenv";`, `de.config()`, `const zorm = Zorm.get(process.env.DATABASE_URL!);`, `zorm.connect([${tableNames.map(t => (0, index_js_1.toPascalCase)(t)).join(`, `)}]);`, `export default zorm`, `export { ${tableNames.map(t => (0, index_js_1.toPascalCase)(t)).join(`, `)} }`);
+        fs_1.default.writeFileSync(path_1.default.join(this.dist, `index.ts`), entry.join(`\n`));
         await self.pool.end();
         console.log(picocolors_1.default.green(`✓ ${tables.length} Tables Processed.`));
     }

package/dist/drivers/queryBuilder.d.ts

@@ -13,6 +13,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
     private whereCount;
     private isActiveRecord;
     private activeRecord;
+    private joinedAliases;
     constructor(repository: Repository<T>, _action: QueryAction, _usePromise?: boolean);
     _create(): this;
     upsert(): this;

package/dist/drivers/queryBuilder.js

@@ -16,6 +16,8 @@ class ZormQueryBuilder extends Promise {
     whereCount = 0;
     isActiveRecord = false;
     activeRecord;
+    joinedAliases = {};
+    // private currentWhereLogic: 'AND' | 'OR' = 'AND';
     constructor(repository, _action, _usePromise) {
         super(() => { }); // Required for extending Promise
         this.repository = repository;
@@ -146,7 +148,7 @@ class ZormQueryBuilder extends Promise {
                 const match = value.match(/^(!=|>=|<=|>|<|=)\s*(.+)$/); // Improved regex
                 if (match) {
                     const [, operator, rawValue] = match;
-                    const sqlOperator = operator; // Directly use the matched operator
+                    sqlOperator = operator; // Directly use the matched operator
                     const parsedValue = !isNaN(Number(rawValue)) ? Number(rawValue) : rawValue.trim(); // Convert to number if possible
                     qb[type](`${qb.alias}.${key} ${sqlOperator} :${paramKey}`, { [paramKey]: parsedValue });
                     return;
@@ -273,6 +275,7 @@ class ZormQueryBuilder extends Promise {
         else {
             this.queryBuilder.innerJoin(`${this.entityAlias}.${relation}`, alias);
         }
+        this.joinedAliases[alias] = relation;
         return this;
     }
     /**
@@ -289,6 +292,7 @@ class ZormQueryBuilder extends Promise {
         else {
             this.queryBuilder.leftJoin(`${this.entityAlias}.${relation}`, alias);
         }
+        this.joinedAliases[alias] = relation;
         return this;
     }
     /**

package/dist/types.d.ts

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

package/dist/types.js

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

package/package.json

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