@mikro-orm/core 7.0.0-dev.68 → 7.0.0-dev.69

package/EntityManager.d.ts

@@ -9,7 +9,7 @@ import { EntityLoader, type EntityLoaderOptions } from './entity/EntityLoader.js
 import { Reference } from './entity/Reference.js';
 import { UnitOfWork } from './unit-of-work/UnitOfWork.js';
 import type { CountOptions, DeleteOptions, FilterOptions, FindAllOptions, FindByCursorOptions, FindOneOptions, FindOneOrFailOptions, FindOptions, GetReferenceOptions, IDatabaseDriver, LockOptions, NativeInsertUpdateOptions, StreamOptions, UpdateOptions, UpsertManyOptions, UpsertOptions } from './drivers/IDatabaseDriver.js';
-import type { AnyEntity, AnyString, ArrayElement, AutoPath, ConnectionType, Dictionary, EntityData, EntityDictionary, EntityDTO, EntityMetadata, EntityName, FilterDef, FilterQuery, FromEntityType, GetRepository, IHydrator, IsSubset, Loaded, MergeLoaded, MergeSelected, NoInfer, ObjectQuery, Primary, Ref, RequiredEntityData, UnboxArray } from './typings.js';
+import type { AnyString, ArrayElement, AutoPath, ConnectionType, Dictionary, EntityData, EntityDictionary, EntityDTO, EntityMetadata, EntityName, FilterDef, FilterQuery, FromEntityType, GetRepository, IHydrator, IsSubset, Loaded, MergeLoaded, MergeSelected, NoInfer, ObjectQuery, Primary, Ref, RequiredEntityData, UnboxArray } from './typings.js';
 import { FlushMode, LockMode, PopulatePath, type TransactionOptions } from './enums.js';
 import type { MetadataStorage } from './metadata/MetadataStorage.js';
 import type { Transaction } from './connections/Connection.js';
@@ -418,11 +418,6 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * The entity will be entered into the database at or before transaction commit or as a result of the flush operation.
      */
     persist<Entity extends object>(entity: Entity | Reference<Entity> | Iterable<Entity | Reference<Entity>>): this;
-    /**
-     * Persists your entity immediately, flushing all not yet persisted changes to the database too.
-     * Equivalent to `em.persist(e).flush()`.
-     */
-    persistAndFlush(entity: AnyEntity | Reference<AnyEntity> | Iterable<AnyEntity | Reference<AnyEntity>>): Promise<void>;
     /**
      * Marks entity for removal.
      * A removed entity will be removed from the database at or before transaction commit or as a result of the flush operation.
@@ -430,11 +425,6 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * To remove entities by condition, use `em.nativeDelete()`.
      */
     remove<Entity extends object>(entity: Entity | Reference<Entity> | Iterable<Entity | Reference<Entity>>): this;
-    /**
-     * Removes an entity instance immediately, flushing all not yet persisted changes to the database too.
-     * Equivalent to `em.remove(e).flush()`
-     */
-    removeAndFlush(entity: AnyEntity | Reference<AnyEntity> | Iterable<AnyEntity | Reference<AnyEntity>>): Promise<void>;
     /**
      * Flushes all changes to objects that have been queued up to now to the database.
      * This effectively synchronizes the in-memory state of managed objects with the database.

package/EntityManager.js

@@ -1378,13 +1378,6 @@ export class EntityManager {
         }
         return this;
     }
-    /**
-     * Persists your entity immediately, flushing all not yet persisted changes to the database too.
-     * Equivalent to `em.persist(e).flush()`.
-     */
-    async persistAndFlush(entity) {
-        await this.persist(entity).flush();
-    }
     /**
      * Marks entity for removal.
      * A removed entity will be removed from the database at or before transaction commit or as a result of the flush operation.
@@ -1408,13 +1401,6 @@ export class EntityManager {
         }
         return em;
     }
-    /**
-     * Removes an entity instance immediately, flushing all not yet persisted changes to the database too.
-     * Equivalent to `em.remove(e).flush()`
-     */
-    async removeAndFlush(entity) {
-        await this.remove(entity).flush();
-    }
     /**
      * Flushes all changes to objects that have been queued up to now to the database.
      * This effectively synchronizes the in-memory state of managed objects with the database.

package/MikroORM.d.ts

@@ -71,33 +71,17 @@ export declare class MikroORM<Driver extends IDatabaseDriver = IDatabaseDriver,
     /**
      * Gets the SchemaGenerator.
      */
-    getSchemaGenerator(): ReturnType<ReturnType<Driver['getPlatform']>['getSchemaGenerator']>;
-    /**
-     * Gets the EntityGenerator.
-     */
-    getEntityGenerator<T extends IEntityGenerator = IEntityGenerator>(): T;
-    /**
-     * Gets the Migrator.
-     */
-    getMigrator<T extends IMigrator = IMigrator>(): T;
+    get schema(): ReturnType<ReturnType<Driver['getPlatform']>['getSchemaGenerator']>;
     /**
      * Gets the SeedManager
      */
-    getSeeder<T extends ISeedManager = ISeedManager>(): T;
-    /**
-     * Shortcut for `orm.getSchemaGenerator()`
-     */
-    get schema(): ReturnType<ReturnType<Driver["getPlatform"]>["getSchemaGenerator"]>;
-    /**
-     * Shortcut for `orm.getSeeder()`
-     */
     get seeder(): ISeedManager;
     /**
-     * Shortcut for `orm.getMigrator()`
+     * Gets the Migrator.
      */
     get migrator(): IMigrator;
     /**
-     * Shortcut for `orm.getEntityGenerator()`
+     * Gets the EntityGenerator.
      */
     get entityGenerator(): IEntityGenerator;
 }

package/MikroORM.js

@@ -134,54 +134,25 @@ export class MikroORM {
     /**
      * Gets the SchemaGenerator.
      */
-    getSchemaGenerator() {
-        const extension = this.config.getExtension('@mikro-orm/schema-generator');
-        if (extension) {
-            return extension;
-        }
-        /* v8 ignore next 2 */
-        throw new Error(`SchemaGenerator extension not registered.`);
-    }
-    /**
-     * Gets the EntityGenerator.
-     */
-    getEntityGenerator() {
-        return this.driver.getPlatform().getExtension('EntityGenerator', '@mikro-orm/entity-generator', '@mikro-orm/entity-generator', this.em);
-    }
-    /**
-     * Gets the Migrator.
-     */
-    getMigrator() {
-        return this.driver.getPlatform().getExtension('Migrator', '@mikro-orm/migrator', '@mikro-orm/migrations', this.em);
-    }
-    /**
-     * Gets the SeedManager
-     */
-    getSeeder() {
-        return this.driver.getPlatform().getExtension('SeedManager', '@mikro-orm/seeder', '@mikro-orm/seeder', this.em);
-    }
-    /**
-     * Shortcut for `orm.getSchemaGenerator()`
-     */
     get schema() {
-        return this.getSchemaGenerator();
+        return this.config.getExtension('@mikro-orm/schema-generator');
     }
     /**
-     * Shortcut for `orm.getSeeder()`
+     * Gets the SeedManager
      */
     get seeder() {
-        return this.getSeeder();
+        return this.driver.getPlatform().getExtension('SeedManager', '@mikro-orm/seeder', '@mikro-orm/seeder', this.em);
     }
     /**
-     * Shortcut for `orm.getMigrator()`
+     * Gets the Migrator.
      */
     get migrator() {
-        return this.getMigrator();
+        return this.driver.getPlatform().getExtension('Migrator', '@mikro-orm/migrator', '@mikro-orm/migrations', this.em);
     }
     /**
-     * Shortcut for `orm.getEntityGenerator()`
+     * Gets the EntityGenerator.
      */
     get entityGenerator() {
-        return this.getEntityGenerator();
+        return this.driver.getPlatform().getExtension('EntityGenerator', '@mikro-orm/entity-generator', '@mikro-orm/entity-generator', this.em);
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.68",
+  "version": "7.0.0-dev.69",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -51,9 +51,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "mikro-orm": "7.0.0-dev.68"
-  },
   "peerDependencies": {
     "dataloader": "2.2.3"
   },

package/typings.d.ts

@@ -544,25 +544,25 @@ export interface RefreshDatabaseOptions extends CreateSchemaOptions {
     createSchema?: boolean;
 }
 export interface ISchemaGenerator {
-    createSchema(options?: CreateSchemaOptions): Promise<void>;
-    ensureDatabase(options?: EnsureDatabaseOptions): Promise<boolean>;
+    create(options?: CreateSchemaOptions): Promise<void>;
+    update(options?: UpdateSchemaOptions): Promise<void>;
+    drop(options?: DropSchemaOptions): Promise<void>;
+    refresh(options?: RefreshDatabaseOptions): Promise<void>;
+    clear(options?: ClearDatabaseOptions): Promise<void>;
+    execute(sql: string, options?: {
+        wrap?: boolean;
+    }): Promise<void>;
     getCreateSchemaSQL(options?: CreateSchemaOptions): Promise<string>;
-    dropSchema(options?: DropSchemaOptions): Promise<void>;
     getDropSchemaSQL(options?: Omit<DropSchemaOptions, 'dropDb'>): Promise<string>;
-    updateSchema(options?: UpdateSchemaOptions): Promise<void>;
     getUpdateSchemaSQL(options?: UpdateSchemaOptions): Promise<string>;
     getUpdateSchemaMigrationSQL(options?: UpdateSchemaOptions): Promise<{
         up: string;
         down: string;
     }>;
+    ensureDatabase(options?: EnsureDatabaseOptions): Promise<boolean>;
     createDatabase(name?: string): Promise<void>;
     dropDatabase(name?: string): Promise<void>;
-    execute(sql: string, options?: {
-        wrap?: boolean;
-    }): Promise<void>;
     ensureIndexes(): Promise<void>;
-    refreshDatabase(options?: RefreshDatabaseOptions): Promise<void>;
-    clearDatabase(options?: ClearDatabaseOptions): Promise<void>;
 }
 export type ImportsResolver = (alias: string, basePath: string, extension: '.js' | '', originFileName: string) => {
     path: string;
@@ -642,26 +642,26 @@ export interface IMigrator {
     /**
      * Checks current schema for changes, generates new migration if there are any.
      */
-    createMigration(path?: string, blank?: boolean, initial?: boolean, name?: string): Promise<MigrationResult>;
+    create(path?: string, blank?: boolean, initial?: boolean, name?: string): Promise<MigrationResult>;
     /**
      * Checks current schema for changes.
      */
-    checkMigrationNeeded(): Promise<boolean>;
+    checkSchema(): Promise<boolean>;
     /**
      * Creates initial migration. This generates the schema based on metadata, and checks whether all the tables
      * are already present. If yes, it will also automatically log the migration as executed.
      * Initial migration can be created only if the schema is already aligned with the metadata, or when no schema
      * is present - in such case regular migration would have the same effect.
      */
-    createInitialMigration(path?: string): Promise<MigrationResult>;
+    createInitial(path?: string): Promise<MigrationResult>;
     /**
      * Returns list of already executed migrations.
      */
-    getExecutedMigrations(): Promise<MigrationRow[]>;
+    getExecuted(): Promise<MigrationRow[]>;
     /**
      * Returns list of pending (not yet executed) migrations found in the migration directory.
      */
-    getPendingMigrations(): Promise<UmzugMigration[]>;
+    getPending(): Promise<UmzugMigration[]>;
     /**
      * Executes specified migrations. Without parameter it will migrate up to the latest version.
      */
@@ -838,7 +838,7 @@ export interface ISeedManager {
     seed(...classNames: Constructor<Seeder>[]): Promise<void>;
     /** @internal */
     seedString(...classNames: string[]): Promise<void>;
-    createSeeder(className: string): Promise<string>;
+    create(className: string): Promise<string>;
 }
 export interface Seeder<T extends Dictionary = Dictionary> {
     run(em: EntityManager, context?: T): void | Promise<void>;

package/utils/AbstractSchemaGenerator.d.ts

@@ -10,18 +10,18 @@ export declare abstract class AbstractSchemaGenerator<D extends IDatabaseDriver>
     protected readonly platform: ReturnType<D['getPlatform']>;
     protected readonly connection: ReturnType<D['getConnection']>;
     constructor(em: D | D[typeof EntityManagerType]);
-    createSchema(options?: CreateSchemaOptions): Promise<void>;
+    create(options?: CreateSchemaOptions): Promise<void>;
     /**
      * Returns true if the database was created.
      */
     ensureDatabase(options?: EnsureDatabaseOptions): Promise<boolean>;
-    refreshDatabase(options?: RefreshDatabaseOptions): Promise<void>;
-    clearDatabase(options?: ClearDatabaseOptions): Promise<void>;
+    refresh(options?: RefreshDatabaseOptions): Promise<void>;
+    clear(options?: ClearDatabaseOptions): Promise<void>;
     protected clearIdentityMap(): void;
     getCreateSchemaSQL(options?: CreateSchemaOptions): Promise<string>;
-    dropSchema(options?: DropSchemaOptions): Promise<void>;
+    drop(options?: DropSchemaOptions): Promise<void>;
     getDropSchemaSQL(options?: Omit<DropSchemaOptions, 'dropDb'>): Promise<string>;
-    updateSchema(options?: UpdateSchemaOptions): Promise<void>;
+    update(options?: UpdateSchemaOptions): Promise<void>;
     getUpdateSchemaSQL(options?: UpdateSchemaOptions): Promise<string>;
     getUpdateSchemaMigrationSQL(options?: UpdateSchemaOptions): Promise<{
         up: string;

package/utils/AbstractSchemaGenerator.js

@@ -15,7 +15,7 @@ export class AbstractSchemaGenerator {
         this.platform = this.driver.getPlatform();
         this.connection = this.driver.getConnection();
     }
-    async createSchema(options) {
+    async create(options) {
         this.notImplemented();
     }
     /**
@@ -24,7 +24,7 @@ export class AbstractSchemaGenerator {
     async ensureDatabase(options) {
         this.notImplemented();
     }
-    async refreshDatabase(options) {
+    async refresh(options) {
         if (options?.dropDb) {
             const name = this.config.get('dbName');
             await this.dropDatabase(name);
@@ -32,13 +32,13 @@ export class AbstractSchemaGenerator {
         }
         else {
             await this.ensureDatabase();
-            await this.dropSchema(options);
+            await this.drop(options);
         }
         if (options?.createSchema !== false) {
-            await this.createSchema(options);
+            await this.create(options);
         }
     }
-    async clearDatabase(options) {
+    async clear(options) {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
             await this.driver.nativeDelete(meta.className, {}, options);
         }
@@ -59,13 +59,13 @@ export class AbstractSchemaGenerator {
     async getCreateSchemaSQL(options) {
         this.notImplemented();
     }
-    async dropSchema(options) {
+    async drop(options) {
         this.notImplemented();
     }
     async getDropSchemaSQL(options) {
         this.notImplemented();
     }
-    async updateSchema(options) {
+    async update(options) {
         this.notImplemented();
     }
     async getUpdateSchemaSQL(options) {