@zuzjs/orm 0.3.6 → 0.3.7

package/dist/drivers/mysql/index.js

@@ -327,7 +327,7 @@ class MySqlDriver {
         // 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(`, `)} }`);
+        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/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.6",
+    "version": "0.3.7",
     "keywords": [
         "orm",
         "zuz",