@hazeljs/typeorm 0.2.0-beta.57 → 0.2.0-beta.59

package/dist/typeorm.service.d.ts

@@ -12,9 +12,33 @@ export interface TypeOrmServiceOptions {
 }
 export declare class TypeOrmService {
     private _dataSource;
+    /**
+     * Resolves when the DataSource is fully initialised. Started eagerly in the
+     * constructor so that by the time the first HTTP request arrives the
+     * connection is already established — no manual `onModuleInit` call needed.
+     */
+    private _ready;
     constructor(options?: TypeOrmServiceOptions);
     get dataSource(): DataSource;
     getRepository<T extends ObjectLiteral>(entity: EntityTarget<T>): Repository<T>;
+    /**
+     * Returns a promise that resolves once the DataSource is initialised.
+     * Useful in `main.ts` when you want to block the server start until the
+     * database is ready (optional but recommended for production).
+     *
+     * @example
+     * ```ts
+     * // Optional — guarantees DB is up before first request
+     * await app.getContainer().resolve(TypeOrmService).ready();
+     * await app.listen(3000);
+     * ```
+     */
+    ready(): Promise<void>;
+    /**
+     * Awaits the DataSource initialisation. Idempotent — safe to call multiple
+     * times. Kept for compatibility with frameworks that call `onModuleInit`
+     * on lifecycle-aware services.
+     */
     onModuleInit(): Promise<void>;
     onModuleDestroy(): Promise<void>;
 }

package/dist/typeorm.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm.service.d.ts","sourceRoot":"","sources":["../src/typeorm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjG,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,qBACa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAa;gBAEpB,OAAO,CAAC,EAAE,qBAAqB;IAqB3C,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,aAAa,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAIxE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAY7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAWvC"}
+{"version":3,"file":"typeorm.service.d.ts","sourceRoot":"","sources":["../src/typeorm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjG,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,qBACa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAa;IAChC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAgB;gBAElB,OAAO,CAAC,EAAE,qBAAqB;IAmC3C,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,aAAa,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAI9E;;;;;;;;;;;OAWG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAWvC"}

package/dist/typeorm.service.js

@@ -36,6 +36,19 @@ let TypeOrmService = class TypeOrmService {
                 logging: false,
             });
         }
+        // Kick off the connection immediately. Errors are surfaced via ready() /
+        // onModuleInit() and on the first query attempt.
+        this._ready = this._dataSource.isInitialized
+            ? Promise.resolve()
+            : this._dataSource
+                .initialize()
+                .then(() => {
+                core_2.default.info('TypeORM connected to database');
+            })
+                .catch((err) => {
+                core_2.default.error('Failed to connect to database:', err);
+                throw err;
+            });
     }
     get dataSource() {
         return this._dataSource;
@@ -43,17 +56,28 @@ let TypeOrmService = class TypeOrmService {
     getRepository(entity) {
         return this._dataSource.getRepository(entity);
     }
+    /**
+     * Returns a promise that resolves once the DataSource is initialised.
+     * Useful in `main.ts` when you want to block the server start until the
+     * database is ready (optional but recommended for production).
+     *
+     * @example
+     * ```ts
+     * // Optional — guarantees DB is up before first request
+     * await app.getContainer().resolve(TypeOrmService).ready();
+     * await app.listen(3000);
+     * ```
+     */
+    ready() {
+        return this._ready;
+    }
+    /**
+     * Awaits the DataSource initialisation. Idempotent — safe to call multiple
+     * times. Kept for compatibility with frameworks that call `onModuleInit`
+     * on lifecycle-aware services.
+     */
     async onModuleInit() {
-        try {
-            if (!this._dataSource.isInitialized) {
-                await this._dataSource.initialize();
-            }
-            core_2.default.info('TypeORM connected to database');
-        }
-        catch (error) {
-            core_2.default.error('Failed to connect to database:', error);
-            throw error;
-        }
+        await this._ready;
     }
     async onModuleDestroy() {
         try {

package/dist/typeorm.service.test.js

@@ -3,35 +3,66 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const typeorm_service_1 = require("./typeorm.service");
 describe('TypeOrmService', () => {
     describe('with provided DataSource', () => {
-        it('should use provided DataSource and initialize/destroy', async () => {
+        it('auto-initialises the DataSource on construction', async () => {
             const mockDs = {
                 isInitialized: false,
-                initialize: async () => {
-                    mockDs.isInitialized = true;
-                },
-                destroy: async () => {
-                    mockDs.isInitialized = false;
-                },
+                initialize: jest.fn(async function () {
+                    this.isInitialized = true;
+                }),
+                destroy: jest.fn(async function () {
+                    this.isInitialized = false;
+                }),
                 getRepository: jest.fn(() => ({ find: jest.fn() })),
             };
             const dataSource = mockDs;
             const service = new typeorm_service_1.TypeOrmService({ dataSource });
-            expect(service.dataSource).toBe(dataSource);
-            await service.onModuleInit();
+            // ready() / onModuleInit() both resolve once initialization completes
+            await service.ready();
+            expect(mockDs.initialize).toHaveBeenCalledTimes(1);
             expect(dataSource.isInitialized).toBe(true);
+            // onModuleInit() is idempotent — does not re-initialize
+            await service.onModuleInit();
+            expect(mockDs.initialize).toHaveBeenCalledTimes(1);
+        });
+        it('skips re-initialization when DataSource is already initialized', async () => {
+            const mockDs = {
+                isInitialized: true,
+                initialize: jest.fn(),
+                destroy: jest.fn(async function () {
+                    this.isInitialized = false;
+                }),
+                getRepository: jest.fn(() => ({})),
+            };
+            const dataSource = mockDs;
+            const service = new typeorm_service_1.TypeOrmService({ dataSource });
+            await service.ready();
+            expect(mockDs.initialize).not.toHaveBeenCalled();
+        });
+        it('destroys the DataSource on onModuleDestroy', async () => {
+            const mockDs = {
+                isInitialized: true,
+                initialize: jest.fn(),
+                destroy: jest.fn(async function () {
+                    this.isInitialized = false;
+                }),
+                getRepository: jest.fn(() => ({})),
+            };
+            const dataSource = mockDs;
+            const service = new typeorm_service_1.TypeOrmService({ dataSource });
             await service.onModuleDestroy();
+            expect(mockDs.destroy).toHaveBeenCalledTimes(1);
             expect(dataSource.isInitialized).toBe(false);
         });
-        it('should expose getRepository', () => {
+        it('exposes getRepository', async () => {
             const mockRepo = { find: jest.fn(), findOne: jest.fn() };
             const dataSource = {
                 isInitialized: true,
                 getRepository: jest.fn(() => mockRepo),
             };
             const service = new typeorm_service_1.TypeOrmService({ dataSource });
+            await service.ready();
             const repo = service.getRepository('dummy');
             expect(repo).toBe(mockRepo);
-            expect(typeof repo.find).toBe('function');
         });
     });
     describe('without options or dataSource', () => {
@@ -39,7 +70,7 @@ describe('TypeOrmService', () => {
         afterEach(() => {
             process.env.DATABASE_URL = origEnv;
         });
-        it('should throw when DATABASE_URL is not set', () => {
+        it('throws when DATABASE_URL is not set', () => {
             delete process.env.DATABASE_URL;
             expect(() => new typeorm_service_1.TypeOrmService()).toThrow(/DATABASE_URL|options|dataSource/);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hazeljs/typeorm",
-  "version": "0.2.0-beta.57",
+  "version": "0.2.0-beta.59",
   "description": "TypeORM integration for HazelJS framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -49,5 +49,5 @@
   "peerDependencies": {
     "@hazeljs/core": ">=0.2.0-beta.0"
   },
-  "gitHead": "98c84683e8f487c660e344c2beda3a8dcaaff07f"
+  "gitHead": "f6d8ee8162a40e2298ccce46d843269838bbe6ff"
 }