@mikro-orm/knex 6.0.0-dev.5 → 6.0.0-dev.6

package/AbstractSqlPlatform.d.ts

@@ -11,8 +11,6 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     /** @inheritDoc */
     lookupExtensions(orm: MikroORM): void;
     getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SchemaGenerator;
-    getEntityGenerator(em: EntityManager): any;
-    getMigrator(em: EntityManager): any;
     quoteValue(value: any): string;
     formatQuery(sql: string, params: readonly any[]): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string;

package/AbstractSqlPlatform.js

@@ -22,22 +22,9 @@ class AbstractSqlPlatform extends core_1.Platform {
     lookupExtensions(orm) {
         schema_1.SchemaGenerator.register(orm);
     }
-    // TODO remove in v6 (https://github.com/mikro-orm/mikro-orm/issues/3743)
+    /* istanbul ignore next: kept for type inference only */
     getSchemaGenerator(driver, em) {
-        /* istanbul ignore next */
-        return this.config.getCachedService(schema_1.SchemaGenerator, em ?? driver); // cast as `any` to get around circular dependencies
-    }
-    // TODO remove in v6 (https://github.com/mikro-orm/mikro-orm/issues/3743)
-    getEntityGenerator(em) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const { EntityGenerator } = require('@mikro-orm/entity-generator');
-        return this.config.getCachedService(EntityGenerator, em);
-    }
-    // TODO remove in v6 (https://github.com/mikro-orm/mikro-orm/issues/3743)
-    getMigrator(em) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const { Migrator } = require('@mikro-orm/migrations');
-        return this.config.getCachedService(Migrator, em);
+        return new schema_1.SchemaGenerator(em ?? driver);
     }
     quoteValue(value) {
         if (this.isRaw(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.5",
+  "version": "6.0.0-dev.6",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,40 +66,6 @@
     "@mikro-orm/core": "^5.5.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.5",
-    "@mikro-orm/entity-generator": "~6.0.0-dev.5",
-    "@mikro-orm/migrations": "~6.0.0-dev.5",
-    "better-sqlite3": "^8.0.0",
-    "mssql": "^7.0.0",
-    "mysql": "^2.18.1",
-    "mysql2": "^2.1.0",
-    "pg": "^8.0.3",
-    "sqlite3": "^5.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@mikro-orm/entity-generator": {
-      "optional": true
-    },
-    "@mikro-orm/migrations": {
-      "optional": true
-    },
-    "better-sqlite3": {
-      "optional": true
-    },
-    "mssql": {
-      "optional": true
-    },
-    "mysql": {
-      "optional": true
-    },
-    "mysql2": {
-      "optional": true
-    },
-    "pg": {
-      "optional": true
-    },
-    "sqlite3": {
-      "optional": true
-    }
+    "@mikro-orm/core": "~6.0.0-dev.6"
   }
 }

package/schema/SchemaGenerator.d.ts

@@ -1,4 +1,4 @@
-import type { MikroORM } from '@mikro-orm/core';
+import type { MikroORM, ISchemaGenerator } from '@mikro-orm/core';
 import { AbstractSchemaGenerator } from '@mikro-orm/core';
 import type { SchemaDifference } from '../typings';
 import { DatabaseSchema } from './DatabaseSchema';
@@ -6,7 +6,7 @@ import type { AbstractSqlDriver } from '../AbstractSqlDriver';
 /**
  * Should be renamed to `SqlSchemaGenerator` in v6
  */
-export declare class SchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDriver> {
+export declare class SchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDriver> implements ISchemaGenerator {
     private readonly helper;
     private readonly options;
     protected lastEnsuredDatabase?: string;

package/schema/SchemaGenerator.js

@@ -14,7 +14,7 @@ class SchemaGenerator extends core_1.AbstractSchemaGenerator {
         this.options = this.config.get('schemaGenerator');
     }
     static register(orm) {
-        orm.config.registerExtension('@mikro-orm/schema-generator', new SchemaGenerator(orm.em));
+        orm.config.registerExtension('@mikro-orm/schema-generator', () => new SchemaGenerator(orm.em));
     }
     /** @deprecated use `dropSchema` and `createSchema` commands respectively */
     async generate() {