refactor: typescript

packages/core/src/index.ts

@@ -2,7 +2,7 @@
 export {
   Constructor, Dictionary, PrimaryKeyType, Primary, IPrimaryKey, FilterQuery, IWrappedEntity, EntityName, EntityData, Highlighter,
   AnyEntity, EntityProperty, EntityMetadata, QBFilterQuery, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection,
-  GetRepository, EntityRepositoryType, MigrationObject,
+  GetRepository, EntityRepositoryType, MigrationObject, Migration,
 } from './typings';
 export * from './enums';
 export * from './exceptions';

packages/migrations/src/Migration.ts

@@ -1,7 +1,7 @@
-import { Configuration } from '@mikro-orm/core';
+import { Configuration, Migration as CoreMigration } from '@mikro-orm/core';
 import { AbstractSqlDriver } from '@mikro-orm/knex';
 
-export abstract class Migration {
+export abstract class Migration implements CoreMigration {
 
   private readonly queries: string[] = [];
 

packages/migrations/src/Migrator.ts

@@ -1,5 +1,4 @@
-// @ts-ignore
-import umzug, { Umzug, migrationsList } from 'umzug';
+import umzug, { Umzug, migrationsList, MigrationDefinitionWithName, MigrationOptions, Migration as UmzugMigration } from 'umzug';
 import { Utils, Constructor, MigrationObject } from '@mikro-orm/core';
 import { SchemaGenerator, EntityManager } from '@mikro-orm/knex';
 import { Migration } from './Migration';
@@ -19,7 +18,7 @@ export class Migrator {
   private readonly storage = new MigrationStorage(this.driver, this.options);
 
   constructor(private readonly em: EntityManager) {
-    let migrations = {
+    let migrations: MigrationOptions | UmzugMigration[] = {
       path: Utils.absolutePath(this.options.path!, this.config.get('baseDir')),
       pattern: this.options.pattern,
       customResolver: (file: string) => this.resolve(file),
@@ -31,7 +30,7 @@ export class Migrator {
           this.initialize(
             migration.class as unknown as Constructor<Migration>,
             migration.name
-          )
+          ) as MigrationDefinitionWithName
         )
       );
     }
@@ -148,7 +147,6 @@ export class Migrator {
 
 }
 
-export type UmzugMigration = { path?: string; file: string };
 export type MigrateOptions = { from?: string | number; to?: string | number; migrations?: string[] };
 export type MigrationResult = { fileName: string; code: string; diff: string[] };
 export type MigrationRow = { name: string; executed_at: Date };

packages/migrations/src/custom.d.ts

@@ -0,0 +1,11 @@
+import { Migration } from 'umzug';
+
+declare module 'umzug' {
+  interface MigrationDefinitionWithName extends Migration {
+    name: string;
+  }
+
+  interface UmzugStatic {
+    migrationsList(migrations: MigrationDefinitionWithName[], parameters?: any[]): Migration[];
+  }
+}