feat: refactor

Refactor

Signed-off-by: Yaapa Hage <[email protected]>

packages/typeorm/src/decorators/typeorm.decorator.ts → packages/typeorm/src/decorators.ts

@@ -5,7 +5,7 @@
 
 import {Context, inject, Injection, ResolutionSession} from '@loopback/core';
 import {QueryRunner} from 'typeorm';
-import {TypeOrmBindings} from '../keys';
+import {TypeOrmBindings} from './keys';
 
 export namespace typeorm {
   export function connection(connectionName?: string) {
@@ -62,6 +62,6 @@ export namespace typeorm {
  * @param connectionName - Optional connection name
  */
 async function getConnection(ctx: Context, connectionName?: string) {
-  const connections = await ctx.get(TypeOrmBindings.CONNECTIONS);
-  return connections.manager.get(connectionName);
+  const manager = await ctx.get(TypeOrmBindings.MANAGER);
+  return manager.get(connectionName);
 }

packages/typeorm/src/index.ts

@@ -5,8 +5,6 @@
 
 export * from './decorators';
 export * from './keys';
-export * from './mixins';
-export * from './services';
-export * from './typeorm.component';
+export * from './mixin';
 export * from './types';
 export * from './utils';

packages/typeorm/src/keys.ts

@@ -5,24 +5,12 @@
 
 import {BindingKey} from '@loopback/core';
 import {ConnectionManager} from 'typeorm';
-import {TypeOrmConnections} from './services';
-import {TypeOrmComponent} from './typeorm.component';
 
 /**
  * Binding keys used by this component.
  */
 export namespace TypeOrmBindings {
-  export const COMPONENT = BindingKey.create<TypeOrmComponent>(
-    'components.TypeOrmComponent',
-  );
-
-  export const CONNECTIONS = BindingKey.create<TypeOrmConnections>(
-    'services.TypeOrmConnections',
-  );
-
   export const MANAGER = BindingKey.create<ConnectionManager>(
     'services.TypeOrmConnectionManager',
   );
 }
-
-export const CONNECTION_OPTIONS_EXTENSION_POINT = 'typeorm.connectionOptions';

packages/typeorm/src/mixins/typeorm.mixin.ts → packages/typeorm/src/mixin.ts

@@ -3,10 +3,17 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Application, MixinTarget} from '@loopback/core';
+import {
+  Application,
+  BindingScope,
+  inject,
+  lifeCycleObserver,
+  LifeCycleObserver,
+  MixinTarget,
+} from '@loopback/core';
 import debugFactory from 'debug';
 import {ConnectionManager, ConnectionOptions} from 'typeorm';
-import {TypeOrmBindings} from '../keys';
+import {TypeOrmBindings} from './keys';
 
 const debug = debugFactory('loopback:typeorm:mixin');
 
@@ -19,6 +26,7 @@ export function TypeOrmMixin<T extends MixinTarget<Application>>(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(...args: any[]) {
       super(...args);
+      this.lifeCycleObserver(StartStop);
       this.connectionManager = new ConnectionManager();
       const binding = this.bind(TypeOrmBindings.MANAGER).to(
         this.connectionManager,
@@ -37,6 +45,7 @@ export function TypeOrmMixin<T extends MixinTarget<Application>>(
 
     async migrateSchema(): Promise<void> {
       // TODO: implement using TypeORM
+      throw new Error('TypeORM migration not implemented.');
     }
   };
 }
@@ -46,3 +55,21 @@ export interface ApplicationUsingTypeOrm extends Application {
   connection(options: ConnectionOptions): void;
   migrateSchema(): Promise<void>;
 }
+
+@lifeCycleObserver('datasource', {
+  scope: BindingScope.SINGLETON,
+})
+export class StartStop implements LifeCycleObserver {
+  constructor(
+    @inject(TypeOrmBindings.MANAGER)
+    private manager: ConnectionManager,
+  ) {}
+
+  async start() {
+    Promise.all(this.manager.connections.map(c => c.connect()));
+  }
+
+  async stop() {
+    Promise.all(this.manager.connections.map(c => c.close()));
+  }
+}

tsconfig.json

@@ -180,9 +180,6 @@
     },
     {
       "path": "packages/typeorm/tsconfig.json"
-    },
-    {
-      "path": "sandbox/appa/tsconfig.json"
     }
   ],
   "files": []