@zuzjs/orm 0.3.5 → 0.3.6

package/dist/drivers/mysql/index.js

@@ -163,13 +163,15 @@ class MySqlDriver {
             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)
+                    targetEntity: (0, index_js_1.toPascalCase)(tableName),
                 });
             }
         }
@@ -269,17 +271,18 @@ class MySqlDriver {
             const inverse = inverseRelations[String(tableName)] || [];
             for (const rel of inverse) {
                 const propName = rel.targetTable.endsWith('s') ? rel.targetTable : `${rel.targetTable}s`;
-                // Avoid duplicate
-                if (entityCode.some(line => line.includes(`@${propName}`)))
+                if (entityCode.some(line => line.includes(` ${propName}!:`)))
                     continue;
                 const importLine = `import { ${rel.targetEntity} } from "./${rel.targetTable}";`;
-                if (!imports.includes(importLine)) {
+                if (!imports.includes(importLine))
                     imports.push(importLine);
-                }
                 if (!_imports.includes('OneToMany'))
                     _imports.push('OneToMany');
-                entityCode.push(`\t@OneToMany(() => ${rel.targetEntity}, r => r.${rel.fkColumn})`);
+                // 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)
@@ -321,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/package.json

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