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

package/AbstractSqlPlatform.d.ts

@@ -1,7 +1,7 @@
 import type { Constructor, EntityManager, EntityRepository, IDatabaseDriver, MikroORM } from '@mikro-orm/core';
 import { Platform } from '@mikro-orm/core';
 import type { SchemaHelper } from './schema';
-import { SchemaGenerator } from './schema';
+import { SqlSchemaGenerator } from './schema';
 export declare abstract class AbstractSqlPlatform extends Platform {
     protected readonly schemaHelper?: SchemaHelper;
     usesPivotTable(): boolean;
@@ -10,9 +10,7 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     getSchemaHelper(): SchemaHelper | undefined;
     /** @inheritDoc */
     lookupExtensions(orm: MikroORM): void;
-    getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SchemaGenerator;
-    getEntityGenerator(em: EntityManager): any;
-    getMigrator(em: EntityManager): any;
+    getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SqlSchemaGenerator;
     quoteValue(value: any): string;
     formatQuery(sql: string, params: readonly any[]): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string;

package/AbstractSqlPlatform.js

@@ -20,24 +20,11 @@ class AbstractSqlPlatform extends core_1.Platform {
     }
     /** @inheritDoc */
     lookupExtensions(orm) {
-        schema_1.SchemaGenerator.register(orm);
+        schema_1.SqlSchemaGenerator.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.SqlSchemaGenerator(em ?? driver);
     }
     quoteValue(value) {
         if (this.isRaw(value)) {

package/index.mjs

@@ -23,4 +23,5 @@ export const SchemaGenerator = mod.SchemaGenerator;
 export const SchemaHelper = mod.SchemaHelper;
 export const SqlEntityManager = mod.SqlEntityManager;
 export const SqlEntityRepository = mod.SqlEntityRepository;
+export const SqlSchemaGenerator = mod.SqlSchemaGenerator;
 export const knex = mod.knex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.5",
+  "version": "6.0.0-dev.7",
   "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.7"
   }
 }

package/schema/{SchemaGenerator.d.ts → SqlSchemaGenerator.d.ts}

@@ -1,12 +1,9 @@
-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';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
-/**
- * Should be renamed to `SqlSchemaGenerator` in v6
- */
-export declare class SchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDriver> {
+export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDriver> implements ISchemaGenerator {
     private readonly helper;
     private readonly options;
     protected lastEnsuredDatabase?: string;
@@ -101,3 +98,4 @@ export declare class SchemaGenerator extends AbstractSchemaGenerator<AbstractSql
     private dump;
     private get knex();
 }
+export { SqlSchemaGenerator as SchemaGenerator };

package/schema/{SchemaGenerator.js → SqlSchemaGenerator.js}

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemaGenerator = void 0;
+exports.SchemaGenerator = exports.SqlSchemaGenerator = void 0;
 const core_1 = require("@mikro-orm/core");
 const DatabaseSchema_1 = require("./DatabaseSchema");
 const SchemaComparator_1 = require("./SchemaComparator");
-/**
- * Should be renamed to `SqlSchemaGenerator` in v6
- */
-class SchemaGenerator extends core_1.AbstractSchemaGenerator {
+class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     constructor() {
         super(...arguments);
         this.helper = this.platform.getSchemaHelper();
         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 SqlSchemaGenerator(orm.em));
     }
     /** @deprecated use `dropSchema` and `createSchema` commands respectively */
     async generate() {
@@ -487,4 +484,5 @@ class SchemaGenerator extends core_1.AbstractSchemaGenerator {
         return this.connection.getKnex();
     }
 }
-exports.SchemaGenerator = SchemaGenerator;
+exports.SqlSchemaGenerator = SqlSchemaGenerator;
+exports.SchemaGenerator = SqlSchemaGenerator;

package/schema/index.d.ts

@@ -1,5 +1,5 @@
 export * from './DatabaseSchema';
 export * from './DatabaseTable';
-export * from './SchemaGenerator';
+export * from './SqlSchemaGenerator';
 export * from './SchemaHelper';
 export * from './SchemaComparator';

package/schema/index.js

@@ -16,6 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./DatabaseSchema"), exports);
 __exportStar(require("./DatabaseTable"), exports);
-__exportStar(require("./SchemaGenerator"), exports);
+__exportStar(require("./SqlSchemaGenerator"), exports);
 __exportStar(require("./SchemaHelper"), exports);
 __exportStar(require("./SchemaComparator"), exports);