Fix circular dependencies in migrator

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> {