@zuzjs/orm 0.3.5 → 0.3.7

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 zormEntities = [${tableNames.map(t => (0, index_js_1.toPascalCase)(t)).join(`, `)}];`, `const zorm = Zorm.get(`, `\tprocess.env.DATABASE_URL!,`, `\tzormEntities`, `);`, `zorm.connect(zormEntities);`, `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/index.d.ts

@@ -26,6 +26,7 @@ declare class Zorm {
      * @private
      */
     private usePromise;
+    private _init;
     /**
      * Private constructor to enforce singleton pattern.
      * @param {string} connectionString - The database connection string.
@@ -41,13 +42,15 @@ declare class Zorm {
      * @param {boolean} [usePromise] - Whether to use Promises for queries.
      * @returns {Zorm} The singleton instance of Zorm.
      */
-    static get(connectionString: string, entitiesPath?: string | null, usePromise?: boolean): Zorm;
+    static get(connectionString: string, entities?: MixedList<string | Function | EntitySchema<any>>, entitiesPath?: string | null, usePromise?: boolean): Zorm;
     /**
      * Connects to the database and initializes entities.
      * @param {MixedList<string | Function | EntitySchema<any>>} entities - List of entity schemas.
      * @returns {Promise<void>} Resolves when the connection is initialized.
      */
-    connect(entities: MixedList<string | Function | EntitySchema<any>>): Promise<void>;
+    connect(entities?: MixedList<string | Function | EntitySchema<any>>): Promise<void>;
+    whenReady<T = this>(): T;
+    private wrapQueryBuilder;
     /**
      * Returns the appropriate QueryBuilder based on the database type.
      * @param {EntityTarget<T>} entity - The entity target.

package/dist/index.js

@@ -48,6 +48,7 @@ class Zorm {
      * @private
      */
     usePromise = false;
+    _init;
     /**
      * Private constructor to enforce singleton pattern.
      * @param {string} connectionString - The database connection string.
@@ -55,7 +56,7 @@ class Zorm {
      * @param {boolean} [usePromise] - Whether to use Promises for queries.
      * @private
      */
-    constructor(connectionString, entitiesPath, usePromise) {
+    constructor(connectionString, entities, entitiesPath, usePromise) {
         const _dist = entitiesPath || path_1.default.join(`src`, `zorm`);
         const dist = path_1.default.join(process.cwd(), _dist);
         const _checkDist = (0, index_js_1.checkDirectory)(dist, false);
@@ -73,8 +74,10 @@ class Zorm {
                 password: conn.password,
                 host: conn.host,
                 port: Number(conn.port),
-                database: conn.database
+                database: conn.database,
+                entities: entities || []
             });
+            this._init = this.dataSource.initialize.bind(this.dataSource);
         }
         else {
             console.log(`Only MySQL is supported for now`);
@@ -88,9 +91,9 @@ class Zorm {
      * @param {boolean} [usePromise] - Whether to use Promises for queries.
      * @returns {Zorm} The singleton instance of Zorm.
      */
-    static get(connectionString, entitiesPath, usePromise) {
+    static get(connectionString, entities, entitiesPath, usePromise) {
         if (!Zorm.instance) {
-            Zorm.instance = new Zorm(connectionString, entitiesPath, usePromise);
+            Zorm.instance = new Zorm(connectionString, entities, entitiesPath, usePromise);
         }
         return Zorm.instance;
     }
@@ -102,8 +105,10 @@ class Zorm {
     async connect(entities) {
         if (!this.initialized) {
             try {
-                this.dataSource.setOptions({ entities });
-                await this.dataSource.initialize();
+                if (entities && !this.dataSource.options.entities?.length) {
+                    this.dataSource.setOptions({ entities });
+                }
+                await this._init();
                 this.initialized = true;
                 console.log(picocolors_1.default.green("○ Zorm is connected"));
             }
@@ -112,6 +117,50 @@ class Zorm {
             }
         }
     }
+    whenReady() {
+        if (this.initialized)
+            return this;
+        const handler = {
+            get: (target, prop) => {
+                if (prop === 'then')
+                    return undefined;
+                const value = target[prop];
+                if (typeof value === 'function') {
+                    return (...args) => {
+                        const result = value.apply(target, args);
+                        if (result && result.constructor.name === 'ZormQueryBuilder') {
+                            return this.wrapQueryBuilder(result);
+                        }
+                        this._init().then(() => result);
+                    };
+                }
+                return value;
+            }
+        };
+        return new Proxy(this, handler);
+    }
+    wrapQueryBuilder(qb) {
+        const handler = {
+            get: (target, prop) => {
+                if (prop === 'then')
+                    return undefined;
+                const value = target[prop];
+                if (typeof value === 'function') {
+                    return (...args) => {
+                        const result = value.apply(target, args);
+                        // Chain: if returns new QB, wrap it
+                        if (result && result.constructor.name === 'ZormQueryBuilder') {
+                            return this.wrapQueryBuilder(result);
+                        }
+                        // Final: return Promise
+                        return this._init().then(() => result);
+                    };
+                }
+                return value;
+            }
+        };
+        return new Proxy(qb, handler);
+    }
     /**
      * Returns the appropriate QueryBuilder based on the database type.
      * @param {EntityTarget<T>} entity - The entity target.

package/package.json

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