Fix circular dependencies in migrator

src/orm/directive/CreateMigrationDirective.ts

@@ -2,11 +2,13 @@ import {Directive, OptionDefinition} from '../../cli'
 import {Injectable} from '../../di'
 import {stringToPascal} from '../../util'
 import {templateMigration} from '../template/migration'
+import {CLIDirective} from '../../cli/decorators'
 
 /**
  * CLI directive that creates migration classes from template.
  */
 @Injectable()
+@CLIDirective()
 export class CreateMigrationDirective extends Directive {
     getDescription(): string {
         return 'create a new migration'

src/orm/directive/MigrateDirective.ts

@@ -1,18 +1,20 @@
 import {Directive, OptionDefinition} from '../../cli'
 import {Container, Inject, Injectable} from '../../di'
 import {EventBus} from '../../event/EventBus'
-import {Migrator} from '../migrations/Migrator'
 import {Migrations} from '../services/Migrations'
-// import {ApplyingMigrationEvent} from '../migrations/events/ApplyingMigrationEvent'
-// import {AppliedMigrationEvent} from '../migrations/events/AppliedMigrationEvent'
+import {Migrator} from '../migrations/Migrator'
+import {ApplyingMigrationEvent} from '../migrations/events/ApplyingMigrationEvent'
+import {AppliedMigrationEvent} from '../migrations/events/AppliedMigrationEvent'
 import {EventSubscription} from '../../event/types'
 import {NothingToMigrateError} from '../migrations/NothingToMigrateError'
+import {CLIDirective} from '../../cli/decorators'
 
 /**
  * CLI directive that applies migrations using the default Migrator.
  * @fixme Support dry run mode
  */
 @Injectable()
+@CLIDirective()
 export class MigrateDirective extends Directive {
     @Inject()
     protected readonly bus!: EventBus
@@ -100,13 +102,13 @@ export class MigrateDirective extends Directive {
      * @protected
      */
     protected async registerListeners(): Promise<void> {
-        // this.subscriptions.push(await this.bus.subscribe(ApplyingMigrationEvent, event => {
-        //     this.info(`Applying migration ${event.migration.identifier}...`)
-        // }))
-        //
-        // this.subscriptions.push(await this.bus.subscribe(AppliedMigrationEvent, event => {
-        //     this.success(`Applied migration: ${event.migration.identifier}`)
-        // }))
+        this.subscriptions.push(await this.bus.subscribe(ApplyingMigrationEvent, event => {
+            this.info(`Applying migration ${event.migration.identifier}...`)
+        }))
+
+        this.subscriptions.push(await this.bus.subscribe(AppliedMigrationEvent, event => {
+            this.success(`Applied migration: ${event.migration.identifier}`)
+        }))
     }
 
     /** Remove event bus listeners before finish. */

src/orm/directive/RollbackDirective.ts

@@ -3,16 +3,18 @@ import {Container, Inject, Injectable} from '../../di'
 import {EventBus} from '../../event/EventBus'
 import {Migrator} from '../migrations/Migrator'
 import {Migrations} from '../services/Migrations'
-// import {RollingBackMigrationEvent} from '../migrations/events/RollingBackMigrationEvent'
-// import {RolledBackMigrationEvent} from '../migrations/events/RolledBackMigrationEvent'
+import {RollingBackMigrationEvent} from '../migrations/events/RollingBackMigrationEvent'
+import {RolledBackMigrationEvent} from '../migrations/events/RolledBackMigrationEvent'
 import {EventSubscription} from '../../event/types'
 import {NothingToMigrateError} from '../migrations/NothingToMigrateError'
+import {CLIDirective} from '../../cli/decorators'
 
 /**
  * CLI directive that undoes applied migrations using the default Migrator.
  * @fixme Support dry run mode
  */
 @Injectable()
+@CLIDirective()
 export class RollbackDirective extends Directive {
     @Inject()
     protected readonly bus!: EventBus
@@ -85,13 +87,13 @@ export class RollbackDirective extends Directive {
      * @protected
      */
     protected async registerListeners(): Promise<void> {
-        // this.subscriptions.push(await this.bus.subscribe(RollingBackMigrationEvent, event => {
-        //     this.info(`Rolling-back migration ${event.migration.identifier}...`)
-        // }))
-        //
-        // this.subscriptions.push(await this.bus.subscribe(RolledBackMigrationEvent, event => {
-        //     this.success(`Rolled-back migration: ${event.migration.identifier}`)
-        // }))
+        this.subscriptions.push(await this.bus.subscribe(RollingBackMigrationEvent, event => {
+            this.info(`Rolling-back migration ${event.migration.identifier}...`)
+        }))
+
+        this.subscriptions.push(await this.bus.subscribe(RolledBackMigrationEvent, event => {
+            this.success(`Rolled-back migration: ${event.migration.identifier}`)
+        }))
     }
 
     /** Remove event bus listeners before finish. */

src/orm/index.ts

@@ -30,6 +30,8 @@ export * from './schema/TableBuilder'
 export * from './schema/Schema'
 export * from './schema/PostgresSchema'
 
+export * from './services/Migrations'
+export * from './migrations/Migrator'
 export * from './migrations/NothingToMigrateError'
 export * from './migrations/events/MigrationEvent'
 export * from './migrations/events/ApplyingMigrationEvent'
@@ -37,13 +39,11 @@ export * from './migrations/events/AppliedMigrationEvent'
 export * from './migrations/events/RollingBackMigrationEvent'
 export * from './migrations/events/RolledBackMigrationEvent'
 export * from './migrations/Migration'
-export * from './migrations/Migrator'
 export * from './migrations/MigratorFactory'
 export * from './migrations/DatabaseMigrator'
 
 export * from './services/Database'
 export * from './services/Models'
-export * from './services/Migrations'
 
 export * from './directive/CreateMigrationDirective'
 export * from './directive/MigrateDirective'

src/orm/migrations/Migrator.ts

@@ -3,10 +3,10 @@ import {Awaitable, collect, ErrorWithContext} from '../../util'
 import {Migration} from './Migration'
 import {Migrations} from '../services/Migrations'
 import {EventBus} from '../../event/EventBus'
-// import {ApplyingMigrationEvent} from './events/ApplyingMigrationEvent'
-// import {AppliedMigrationEvent} from './events/AppliedMigrationEvent'
-// import {RollingBackMigrationEvent} from './events/RollingBackMigrationEvent'
-// import {RolledBackMigrationEvent} from './events/RolledBackMigrationEvent'
+import {ApplyingMigrationEvent} from './events/ApplyingMigrationEvent'
+import {AppliedMigrationEvent} from './events/AppliedMigrationEvent'
+import {RollingBackMigrationEvent} from './events/RollingBackMigrationEvent'
+import {RolledBackMigrationEvent} from './events/RolledBackMigrationEvent'
 import {NothingToMigrateError} from './NothingToMigrateError'
 
 /**
@@ -14,7 +14,7 @@ import {NothingToMigrateError} from './NothingToMigrateError'
  */
 @Injectable()
 export abstract class Migrator {
-    @Inject()
+    @Inject(Migrations, { debug: true })
     protected readonly migrations!: Migrations
 
     @Inject()
@@ -259,8 +259,8 @@ export abstract class Migrator {
      * @protected
      */
     protected async applying(migration: Migration): Promise<void> {
-        // const event = <ApplyingMigrationEvent> this.injector.make(ApplyingMigrationEvent, migration)
-        // await this.bus.dispatch(event)
+        const event = <ApplyingMigrationEvent> this.injector.make(ApplyingMigrationEvent, migration)
+        await this.bus.dispatch(event)
     }
 
     /**
@@ -269,8 +269,8 @@ export abstract class Migrator {
      * @protected
      */
     protected async applied(migration: Migration): Promise<void> {
-        // const event = <AppliedMigrationEvent> this.injector.make(AppliedMigrationEvent, migration)
-        // await this.bus.dispatch(event)
+        const event = <AppliedMigrationEvent> this.injector.make(AppliedMigrationEvent, migration)
+        await this.bus.dispatch(event)
     }
 
     /**
@@ -279,8 +279,8 @@ export abstract class Migrator {
      * @protected
      */
     protected async rollingBack(migration: Migration): Promise<void> {
-        // const event = <RollingBackMigrationEvent> this.injector.make(RollingBackMigrationEvent, migration)
-        // await this.bus.dispatch(event)
+        const event = <RollingBackMigrationEvent> this.injector.make(RollingBackMigrationEvent, migration)
+        await this.bus.dispatch(event)
     }
 
     /**
@@ -289,7 +289,7 @@ export abstract class Migrator {
      * @protected
      */
     protected async rolledBack(migration: Migration): Promise<void> {
-        // const event = <RolledBackMigrationEvent> this.injector.make(RolledBackMigrationEvent, migration)
-        // await this.bus.dispatch(event)
+        const event = <RolledBackMigrationEvent> this.injector.make(RolledBackMigrationEvent, migration)
+        await this.bus.dispatch(event)
     }
 }

src/orm/migrations/MigratorFactory.ts

@@ -4,7 +4,7 @@ import {
     PropertyDependency,
     isInstantiable,
     DEPENDENCY_KEYS_METADATA_KEY,
-    DEPENDENCY_KEYS_PROPERTY_METADATA_KEY, Instantiable, Injectable, Inject,
+    DEPENDENCY_KEYS_PROPERTY_METADATA_KEY, Instantiable, Injectable, Inject, FactoryProducer,
 } from '../../di'
 import {Collection, ErrorWithContext} from '../../util'
 import {Logging} from '../../service/Logging'
@@ -17,6 +17,7 @@ import {DatabaseMigrator} from './DatabaseMigrator'
  * and produces an instance of the configured session driver implementation.
  */
 @Injectable()
+@FactoryProducer()
 export class MigratorFactory extends AbstractFactory<Migrator> {
     @Inject()
     protected readonly logging!: Logging

src/orm/services/Migrations.ts

@@ -2,22 +2,15 @@ import {Inject, Singleton} from '../../di'
 import {CanonicalInstantiable} from '../../service/CanonicalInstantiable'
 import {Migration} from '../migrations/Migration'
 import {CanonicalDefinition, CanonicalResolver} from '../../service/Canonical'
-import {Migrator} from '../migrations/Migrator'
 import {UniversalPath} from '../../util'
 import {lib} from '../../lib'
 import {CommandLine} from '../../cli'
-import {MigrateDirective} from '../directive/MigrateDirective'
-import {RollbackDirective} from '../directive/RollbackDirective'
-import {CreateMigrationDirective} from '../directive/CreateMigrationDirective'
-import {MigratorFactory} from '../migrations/MigratorFactory'
 
 /**
  * Service unit that loads and instantiates migration classes.
  */
 @Singleton()
 export class Migrations extends CanonicalInstantiable<Migration> {
-    protected migrator!: Migrator
-
     @Inject()
     protected readonly cli!: CommandLine
 
@@ -34,22 +27,10 @@ export class Migrations extends CanonicalInstantiable<Migration> {
             this.logging.debug(`Base migration path does not exist, or has no files: ${this.path}`)
         }
 
-        // Register the migrator factory
-        this.container().registerFactory(
-            this.container().make<MigratorFactory>(MigratorFactory),
-        )
-
-        this.migrator = this.container().make(Migrator)
-
         // Register the migrations for @extollo/lib
         const basePath = lib().concat('migrations')
         const resolver = await this.buildMigrationNamespaceResolver('@extollo', basePath)
         this.registerNamespace('@extollo', resolver)
-
-        // Register the migrate CLI directives
-        this.cli.registerDirective(MigrateDirective)
-        this.cli.registerDirective(RollbackDirective)
-        this.cli.registerDirective(CreateMigrationDirective)
     }
 
     async initCanonicalItem(definition: CanonicalDefinition): Promise<Migration> {