@mikro-orm/cli 7.0.0-dev.9 → 7.0.0-dev.91

package/CLIConfigurator.d.ts

@@ -2,20 +2,20 @@ import { type CommandModule } from 'yargs';
 /**
  * @internal
  */
-export type BaseArgs = Awaited<ReturnType<typeof CLIConfigurator['createBasicConfig']>['argv']>;
+export type BaseArgs = Awaited<ReturnType<typeof createBasicConfig>['argv']>;
 /**
  * @internal
  */
 export interface BaseCommand<CommandArgs extends BaseArgs = BaseArgs> extends CommandModule<BaseArgs, CommandArgs> {
 }
-/**
- * @internal
- */
-export declare class CLIConfigurator {
-    private static createBasicConfig;
-    static configure(): Promise<import("yargs").Argv<{
-        config: string[] | undefined;
-    } & {
-        contextName: string;
-    }>>;
-}
+declare function createBasicConfig(): import("yargs").Argv<{
+    config: string[] | undefined;
+} & {
+    contextName: string;
+}>;
+export declare function configure(): Promise<import("yargs").Argv<{
+    config: string[] | undefined;
+} & {
+    contextName: string;
+}>>;
+export {};

package/CLIConfigurator.js

@@ -1,4 +1,5 @@
-import { ConfigurationLoader, Utils } from '@mikro-orm/core';
+import { Utils } from '@mikro-orm/core';
+import { fs } from '@mikro-orm/core/fs-utils';
 import yargs from 'yargs';
 import { ClearCacheCommand } from './commands/ClearCacheCommand.js';
 import { CreateDatabaseCommand } from './commands/CreateDatabaseCommand.js';
@@ -10,65 +11,61 @@ import { GenerateEntitiesCommand } from './commands/GenerateEntitiesCommand.js';
 import { ImportCommand } from './commands/ImportCommand.js';
 import { MigrationCommandFactory } from './commands/MigrationCommandFactory.js';
 import { SchemaCommandFactory } from './commands/SchemaCommandFactory.js';
-/**
- * @internal
- */
-export class CLIConfigurator {
-    static createBasicConfig() {
-        return yargs()
-            .scriptName('mikro-orm')
-            .usage('Usage: $0 <command> [options]')
-            .example('$0 debug', 'Show debugging information')
-            .example('$0 schema:update --run', 'Runs schema synchronization')
-            .option('config', {
-            type: 'string',
-            array: true,
-            desc: `Set path to the ORM configuration file`,
-        })
-            .option('contextName', {
-            alias: 'context',
-            type: 'string',
-            desc: 'Set name of config to load out of the ORM configuration file. Used when config file exports an array or a function',
-            default: process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default',
-        })
-            .alias('v', 'version')
-            .alias('h', 'help')
-            .recommendCommands()
-            .showHelpOnFail(true)
-            .demandCommand(1, '')
-            .strict();
-    }
-    static async configure() {
-        ConfigurationLoader.checkPackageVersion();
-        const settings = ConfigurationLoader.getSettings();
-        const version = Utils.getORMVersion();
-        if (settings.preferTs !== false) {
-            const preferTs = await ConfigurationLoader.registerTypeScriptSupport(settings.tsConfigPath);
-            /* v8 ignore next 3 */
-            if (!preferTs) {
-                process.env.MIKRO_ORM_CLI_PREFER_TS ??= '0';
-            }
+import { CLIHelper } from './CLIHelper.js';
+function createBasicConfig() {
+    return yargs()
+        .scriptName('mikro-orm')
+        .usage('Usage: $0 <command> [options]')
+        .example('$0 debug', 'Show debugging information')
+        .example('$0 schema:update --run', 'Runs schema synchronization')
+        .option('config', {
+        type: 'string',
+        array: true,
+        desc: `Set path to the ORM configuration file`,
+    })
+        .option('contextName', {
+        alias: 'context',
+        type: 'string',
+        desc: 'Set name of config to load out of the ORM configuration file. Used when config file exports an array or a function',
+        default: process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default',
+    })
+        .alias('v', 'version')
+        .alias('h', 'help')
+        .recommendCommands()
+        .showHelpOnFail(true)
+        .demandCommand(1, '')
+        .strict();
+}
+export async function configure() {
+    fs.checkPackageVersion();
+    const settings = CLIHelper.getSettings();
+    const version = Utils.getORMVersion();
+    if (settings.preferTs !== false) {
+        const preferTs = await CLIHelper.registerTypeScriptSupport(settings.tsConfigPath, settings.tsLoader);
+        /* v8 ignore next */
+        if (!preferTs) {
+            process.env.MIKRO_ORM_CLI_PREFER_TS ??= '0';
         }
-        return CLIConfigurator.createBasicConfig()
-            .version(version)
-            .command(new ClearCacheCommand())
-            .command(new GenerateCacheCommand())
-            .command(new GenerateEntitiesCommand())
-            .command(new CreateDatabaseCommand())
-            .command(new ImportCommand())
-            .command(new DatabaseSeedCommand())
-            .command(new CreateSeederCommand())
-            .command(SchemaCommandFactory.create('create'))
-            .command(SchemaCommandFactory.create('drop'))
-            .command(SchemaCommandFactory.create('update'))
-            .command(SchemaCommandFactory.create('fresh'))
-            .command(MigrationCommandFactory.create('create'))
-            .command(MigrationCommandFactory.create('up'))
-            .command(MigrationCommandFactory.create('down'))
-            .command(MigrationCommandFactory.create('list'))
-            .command(MigrationCommandFactory.create('check'))
-            .command(MigrationCommandFactory.create('pending'))
-            .command(MigrationCommandFactory.create('fresh'))
-            .command(new DebugCommand());
     }
+    return createBasicConfig()
+        .version(version)
+        .command(new ClearCacheCommand())
+        .command(new GenerateCacheCommand())
+        .command(new GenerateEntitiesCommand())
+        .command(new CreateDatabaseCommand())
+        .command(new ImportCommand())
+        .command(new DatabaseSeedCommand())
+        .command(new CreateSeederCommand())
+        .command(SchemaCommandFactory.create('create'))
+        .command(SchemaCommandFactory.create('drop'))
+        .command(SchemaCommandFactory.create('update'))
+        .command(SchemaCommandFactory.create('fresh'))
+        .command(MigrationCommandFactory.create('create'))
+        .command(MigrationCommandFactory.create('up'))
+        .command(MigrationCommandFactory.create('down'))
+        .command(MigrationCommandFactory.create('list'))
+        .command(MigrationCommandFactory.create('check'))
+        .command(MigrationCommandFactory.create('pending'))
+        .command(MigrationCommandFactory.create('fresh'))
+        .command(new DebugCommand());
 }

package/CLIHelper.d.ts

@@ -1,22 +1,51 @@
-import { MikroORM, type Configuration, type IDatabaseDriver, type Options } from '@mikro-orm/core';
+import { Configuration, type EntityManager, type EntityManagerType, type IDatabaseDriver, MikroORM, type Options } from '@mikro-orm/core';
 /**
  * @internal
  */
 export declare class CLIHelper {
-    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver>(contextName?: string, configPaths?: string[], options?: Partial<Options<D>>): Promise<Configuration<D>>;
+    /**
+     * Gets a named configuration
+     *
+     * @param contextName Load a config with the given `contextName` value. Used when config file exports array or factory function. Setting it to "default" matches also config objects without `contextName` set.
+     * @param paths Array of possible paths for a configuration file. Files will be checked in order, and the first existing one will be used. Defaults to the output of {@link fs.getConfigPaths}.
+     * @param options Additional options to augment the final configuration with.
+     */
+    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager<D> = D[typeof EntityManagerType] & EntityManager<D>>(contextName?: string, paths?: string[], options?: Partial<Options<D>>): Promise<Configuration<D, EM>>;
     static getORM<D extends IDatabaseDriver = IDatabaseDriver>(contextName?: string, configPaths?: string[], opts?: Partial<Options<D>>): Promise<MikroORM<D>>;
     static isDBConnected(config: Configuration, reason?: false): Promise<boolean>;
     static isDBConnected(config: Configuration, reason: true): Promise<true | string>;
-    static getNodeVersion(): string;
     static getDriverDependencies(config: Configuration): string[];
     static dump(text: string, config?: Configuration): void;
-    static getConfigPaths(): string[];
-    static dumpDependencies(): Promise<void>;
-    static getModuleVersion(name: string): Promise<string>;
+    static getSettings(): Settings;
+    static getConfigPaths(): Promise<string[]>;
+    private static getConfigFile;
+    private static loadEnvironmentVars;
+    static dumpDependencies(): void;
+    static getModuleVersion(name: string): string;
+    /**
+     * Resolve path to a module.
+     * @param id The module to require
+     * @param [from] Location to start the node resolution
+     */
+    private static resolveModulePath;
     static dumpTable(options: {
         columns: string[];
         rows: string[][];
         empty: string;
     }): void;
+    /**
+     * Tries to register TS support in the following order: swc, tsx, jiti, tsimp
+     * Use `MIKRO_ORM_CLI_TS_LOADER` env var to set the loader explicitly.
+     * This method is used only in CLI context.
+     */
+    static registerTypeScriptSupport(configPath?: string, tsLoader?: 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto'): Promise<boolean>;
+    static isESM(): boolean;
     static showHelp(): void;
 }
+export interface Settings {
+    verbose?: boolean;
+    preferTs?: boolean;
+    tsLoader?: 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto';
+    tsConfigPath?: string;
+    configPaths?: string[];
+}

package/CLIHelper.js

@@ -1,27 +1,95 @@
+import { extname, join } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import yargs from 'yargs';
-import { colors, ConfigurationLoader, MikroORM, Utils } from '@mikro-orm/core';
+import { colors, Configuration, loadEnvironmentVars, lookupExtensions, MikroORM, Utils, } from '@mikro-orm/core';
+import { fs } from '@mikro-orm/core/fs-utils';
 /**
  * @internal
  */
 export class CLIHelper {
-    static async getConfiguration(contextName, configPaths, options = {}) {
-        const deps = ConfigurationLoader.getORMPackages();
+    /**
+     * Gets a named configuration
+     *
+     * @param contextName Load a config with the given `contextName` value. Used when config file exports array or factory function. Setting it to "default" matches also config objects without `contextName` set.
+     * @param paths Array of possible paths for a configuration file. Files will be checked in order, and the first existing one will be used. Defaults to the output of {@link fs.getConfigPaths}.
+     * @param options Additional options to augment the final configuration with.
+     */
+    static async getConfiguration(contextName, paths, options = {}) {
+        paths ??= await this.getConfigPaths();
+        const deps = fs.getORMPackages();
         if (!deps.has('@mikro-orm/cli') && !process.env.MIKRO_ORM_ALLOW_GLOBAL_CLI) {
             throw new Error('@mikro-orm/cli needs to be installed as a local dependency!');
         }
-        ConfigurationLoader.commonJSCompat(options);
-        ConfigurationLoader.registerDotenv(options);
-        configPaths ??= ConfigurationLoader.getConfigPaths();
         contextName ??= process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default';
-        return ConfigurationLoader.getConfiguration(contextName, configPaths, options);
+        const env = await this.loadEnvironmentVars();
+        await lookupExtensions(options);
+        const configFinder = (cfg) => {
+            return typeof cfg === 'object' && cfg !== null && ('contextName' in cfg ? cfg.contextName === contextName : (contextName === 'default'));
+        };
+        const isValidConfigFactoryResult = (cfg) => {
+            return typeof cfg === 'object' && cfg !== null && (!('contextName' in cfg) || cfg.contextName === contextName);
+        };
+        const result = await this.getConfigFile(paths);
+        if (!result[0]) {
+            if (Utils.hasObjectKeys(env)) {
+                return new Configuration(Utils.mergeConfig({ contextName }, options, env));
+            }
+            throw new Error(`MikroORM config file not found in ['${paths.join(`', '`)}']`);
+        }
+        const path = result[0];
+        let tmp = result[1];
+        if (Array.isArray(tmp)) {
+            const tmpFirstIndex = tmp.findIndex(configFinder);
+            if (tmpFirstIndex === -1) {
+                // Static config not found. Try factory functions
+                let configCandidate;
+                for (let i = 0, l = tmp.length; i < l; ++i) {
+                    const f = tmp[i];
+                    if (typeof f !== 'function') {
+                        continue;
+                    }
+                    configCandidate = await f(contextName);
+                    if (!isValidConfigFactoryResult(configCandidate)) {
+                        continue;
+                    }
+                    tmp = configCandidate;
+                    break;
+                }
+                if (Array.isArray(tmp)) {
+                    throw new Error(`MikroORM config '${contextName}' was not found within the config file '${path}'. Either add a config with this name to the array, or add a function that when given this name will return a configuration object without a name, or with name set to this name.`);
+                }
+            }
+            else {
+                const tmpLastIndex = tmp.findLastIndex(configFinder);
+                if (tmpLastIndex !== tmpFirstIndex) {
+                    throw new Error(`MikroORM config '${contextName}' is not unique within the array exported by '${path}' (first occurrence index: ${tmpFirstIndex}; last occurrence index: ${tmpLastIndex})`);
+                }
+                tmp = tmp[tmpFirstIndex];
+            }
+        }
+        else {
+            if (tmp instanceof Function) {
+                tmp = await tmp(contextName);
+                if (!isValidConfigFactoryResult(tmp)) {
+                    throw new Error(`MikroORM config '${contextName}' was not what the function exported from '${path}' provided. Ensure it returns a config object with no name, or name matching the requested one.`);
+                }
+            }
+            else {
+                if (!configFinder(tmp)) {
+                    throw new Error(`MikroORM config '${contextName}' was not what the default export from '${path}' provided.`);
+                }
+            }
+        }
+        const esmConfigOptions = this.isESM() ? { entityGenerator: { esmImport: true } } : {};
+        await lookupExtensions(tmp);
+        return new Configuration(Utils.mergeConfig({}, esmConfigOptions, tmp, options, env));
     }
     static async getORM(contextName, configPaths, opts = {}) {
-        const options = await CLIHelper.getConfiguration(contextName, configPaths, opts);
-        const settings = ConfigurationLoader.getSettings();
+        const options = await this.getConfiguration(contextName, configPaths, opts);
+        const settings = this.getSettings();
         options.set('allowGlobalContext', true);
         options.set('debug', !!settings.verbose);
         options.getLogger().setDebugMode(!!settings.verbose);
-        options.set('connect', false);
         if (settings.preferTs !== false) {
             options.set('preferTs', true);
         }
@@ -43,9 +111,6 @@ export class CLIHelper {
             return false;
         }
     }
-    static getNodeVersion() {
-        return process.versions.node;
-    }
     static getDriverDependencies(config) {
         try {
             return config.getDriver().getDependencies();
@@ -61,21 +126,92 @@ export class CLIHelper {
         // eslint-disable-next-line no-console
         console.log(text);
     }
-    static getConfigPaths() {
-        return ConfigurationLoader.getConfigPaths();
+    static getSettings() {
+        const config = fs.getPackageConfig();
+        const settings = { ...config['mikro-orm'] };
+        const bool = (v) => ['true', 't', '1'].includes(v.toLowerCase());
+        settings.preferTs = process.env.MIKRO_ORM_CLI_PREFER_TS != null ? bool(process.env.MIKRO_ORM_CLI_PREFER_TS) : settings.preferTs;
+        settings.tsLoader = process.env.MIKRO_ORM_CLI_TS_LOADER ?? settings.tsLoader;
+        settings.tsConfigPath = process.env.MIKRO_ORM_CLI_TS_CONFIG_PATH ?? settings.tsConfigPath;
+        settings.verbose = process.env.MIKRO_ORM_CLI_VERBOSE != null ? bool(process.env.MIKRO_ORM_CLI_VERBOSE) : settings.verbose;
+        if (process.env.MIKRO_ORM_CLI_CONFIG?.endsWith('.ts')) {
+            settings.preferTs = true;
+        }
+        return settings;
+    }
+    static async getConfigPaths() {
+        const settings = this.getSettings();
+        const typeScriptSupport = settings.preferTs ?? Utils.detectTypeScriptSupport();
+        const paths = [];
+        if (process.env.MIKRO_ORM_CLI_CONFIG) {
+            paths.push(process.env.MIKRO_ORM_CLI_CONFIG);
+        }
+        paths.push(...(settings.configPaths || []));
+        if (typeScriptSupport) {
+            paths.push('./src/mikro-orm.config.ts');
+            paths.push('./mikro-orm.config.ts');
+        }
+        const distDir = fs.pathExists(process.cwd() + '/dist');
+        const buildDir = fs.pathExists(process.cwd() + '/build');
+        /* v8 ignore next */
+        const path = distDir ? 'dist' : (buildDir ? 'build' : 'src');
+        paths.push(`./${path}/mikro-orm.config.js`);
+        paths.push('./mikro-orm.config.js');
+        /* v8 ignore next */
+        return Utils.unique(paths).filter(p => !p.match(/\.[mc]?ts$/) || typeScriptSupport);
+    }
+    static async getConfigFile(paths) {
+        for (let path of paths) {
+            path = Utils.absolutePath(path);
+            path = Utils.normalizePath(path);
+            if (fs.pathExists(path)) {
+                const config = await Utils.dynamicImport(path);
+                /* v8 ignore next */
+                return [path, await (config.default ?? config)];
+            }
+        }
+        return [];
+    }
+    static async loadEnvironmentVars() {
+        const ret = loadEnvironmentVars();
+        /* v8 ignore next */
+        switch (process.env.MIKRO_ORM_TYPE) {
+            case 'mongo':
+                ret.driver ??= await import('@mikro-orm/sqlite').then(m => m.SqliteDriver);
+                break;
+            case 'mysql':
+                ret.driver ??= await import('@mikro-orm/mysql').then(m => m.MySqlDriver);
+                break;
+            case 'mssql':
+                ret.driver ??= await import('@mikro-orm/mssql').then(m => m.MsSqlDriver);
+                break;
+            case 'mariadb':
+                ret.driver ??= await import('@mikro-orm/mariadb').then(m => m.MariaDbDriver);
+                break;
+            case 'postgresql':
+                ret.driver ??= await import('@mikro-orm/postgresql').then(m => m.PostgreSqlDriver);
+                break;
+            case 'sqlite':
+                ret.driver ??= await import('@mikro-orm/sqlite').then(m => m.SqliteDriver);
+                break;
+            case 'libsql':
+                ret.driver ??= await import('@mikro-orm/libsql').then(m => m.LibSqlDriver);
+                break;
+        }
+        return ret;
     }
-    static async dumpDependencies() {
+    static dumpDependencies() {
         const version = Utils.getORMVersion();
         CLIHelper.dump(' - dependencies:');
         CLIHelper.dump(`   - mikro-orm ${colors.green(version)}`);
-        CLIHelper.dump(`   - node ${colors.green(CLIHelper.getNodeVersion())}`);
-        if (Utils.pathExistsSync(process.cwd() + '/package.json')) {
-            /* v8 ignore next 3 */
+        CLIHelper.dump(`   - node ${colors.green(process.versions.node)}`);
+        if (fs.pathExists(process.cwd() + '/package.json')) {
+            /* v8 ignore if */
             if (process.versions.bun) {
                 CLIHelper.dump(`   - typescript via bun`);
             }
             else {
-                CLIHelper.dump(`   - typescript ${await CLIHelper.getModuleVersion('typescript')}`);
+                CLIHelper.dump(`   - typescript ${CLIHelper.getModuleVersion('typescript')}`);
             }
             CLIHelper.dump(' - package.json ' + colors.green('found'));
         }
@@ -83,15 +219,31 @@ export class CLIHelper {
             CLIHelper.dump(' - package.json ' + colors.red('not found'));
         }
     }
-    static async getModuleVersion(name) {
+    static getModuleVersion(name) {
         try {
-            const pkg = Utils.requireFrom(`${name}/package.json`);
+            const path = `${this.resolveModulePath(name)}/package.json`;
+            const pkg = fs.readJSONSync(path);
             return colors.green(pkg.version);
         }
         catch {
             return '';
         }
     }
+    /**
+     * Resolve path to a module.
+     * @param id The module to require
+     * @param [from] Location to start the node resolution
+     */
+    static resolveModulePath(id, from = process.cwd()) {
+        if (!extname(from)) {
+            from = join(from, '__fake.js');
+        }
+        const path = Utils.normalizePath(import.meta.resolve(id, pathToFileURL(from)));
+        const parts = path.split('/');
+        const idx = parts.lastIndexOf(id) + 1;
+        parts.splice(idx, parts.length - idx);
+        return parts.join('/');
+    }
     static dumpTable(options) {
         if (options.rows.length === 0) {
             return CLIHelper.dump(options.empty);
@@ -113,7 +265,48 @@ export class CLIHelper {
         ret += colors.grey('└' + lengths.map(length => '─'.repeat(length)).join('┴') + '┘');
         CLIHelper.dump(ret);
     }
-    /* v8 ignore next 3 */
+    /**
+     * Tries to register TS support in the following order: swc, tsx, jiti, tsimp
+     * Use `MIKRO_ORM_CLI_TS_LOADER` env var to set the loader explicitly.
+     * This method is used only in CLI context.
+     */
+    static async registerTypeScriptSupport(configPath = 'tsconfig.json', tsLoader) {
+        /* v8 ignore if */
+        if (process.versions.bun) {
+            return true;
+        }
+        process.env.SWC_NODE_PROJECT ??= configPath;
+        process.env.TSIMP_PROJECT ??= configPath;
+        process.env.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS ??= '1';
+        const explicitLoader = tsLoader ?? process.env.MIKRO_ORM_CLI_TS_LOADER ?? 'auto';
+        const loaders = {
+            swc: { module: '@swc-node/register/esm-register' },
+            tsx: { module: 'tsx/esm/api', cb: (tsx) => tsx.register({ tsconfig: configPath }) },
+            jiti: { module: 'jiti/register', cb: () => Utils.dynamicImportProvider = id => import(id).then(mod => mod?.default ?? mod) },
+            tsimp: { module: 'tsimp/import' },
+        };
+        for (const loader of Utils.keys(loaders)) {
+            if (explicitLoader !== 'auto' && loader !== explicitLoader) {
+                continue;
+            }
+            const { module, cb } = loaders[loader];
+            const mod = await Utils.tryImport({ module });
+            if (mod) {
+                cb?.(mod);
+                process.env.MIKRO_ORM_CLI_TS_LOADER = loader;
+                return true;
+            }
+        }
+        // eslint-disable-next-line no-console
+        console.warn('Neither `swc`, `tsx`, `jiti` nor `tsimp` found in the project dependencies, support for working with TypeScript files might not work. To use `swc`, you need to install both `@swc-node/register` and `@swc/core`.');
+        return false;
+    }
+    static isESM() {
+        const config = fs.getPackageConfig();
+        const type = config?.type ?? '';
+        return type === 'module';
+    }
+    /* v8 ignore next */
     static showHelp() {
         yargs(process.argv.slice(2)).showHelp();
     }

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
@@ -382,6 +381,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/cli

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { CLIHelper } from './CLIHelper.js';
-import { CLIConfigurator } from './CLIConfigurator.js';
-const argv = await CLIConfigurator.configure();
+import { configure } from './CLIConfigurator.js';
+const argv = await configure();
 const args = await argv.parse(process.argv.slice(2));
 if (args._.length === 0) {
     CLIHelper.showHelp();

package/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { CLIHelper } from './CLIHelper.js';
-import { CLIConfigurator } from './CLIConfigurator.js';
-const argv = await CLIConfigurator.configure();
+import { configure } from './CLIConfigurator.js';
+const argv = await configure();
 const args = await argv.parse(process.argv.slice(2));
 if (args._.length === 0) {
     CLIHelper.showHelp();

package/commands/CreateDatabaseCommand.js

@@ -7,8 +7,7 @@ export class CreateDatabaseCommand {
      */
     async handler(args) {
         const orm = await CLIHelper.getORM(args.contextName, args.config);
-        const schemaGenerator = orm.getSchemaGenerator();
-        await schemaGenerator.ensureDatabase();
+        await orm.schema.ensureDatabase();
         await orm.close(true);
     }
 }

package/commands/CreateSeederCommand.js

@@ -16,8 +16,7 @@ export class CreateSeederCommand {
     async handler(args) {
         const className = CreateSeederCommand.getSeederClassName(args.seeder);
         const orm = await CLIHelper.getORM(args.contextName, args.config);
-        const seeder = orm.getSeeder();
-        const path = await seeder.createSeeder(className);
+        const path = await orm.seeder.create(className);
         CLIHelper.dump(colors.green(`Seeder ${args.seeder} successfully created at ${path}`));
         await orm.close(true);
     }

package/commands/DatabaseSeedCommand.js

@@ -17,7 +17,7 @@ export class DatabaseSeedCommand {
     async handler(args) {
         const orm = await CLIHelper.getORM(args.contextName, args.config);
         const className = args.class ?? orm.config.get('seeder').defaultSeeder;
-        await orm.getSeeder().seedString(className);
+        await orm.seeder.seedString(className);
         CLIHelper.dump(colors.green(`Seeder ${className} successfully executed`));
         await orm.close(true);
     }

package/commands/DebugCommand.js

@@ -1,4 +1,5 @@
-import { ConfigurationLoader, Utils, colors } from '@mikro-orm/core';
+import { colors, Utils } from '@mikro-orm/core';
+import { fs } from '@mikro-orm/core/fs-utils';
 import { CLIHelper } from '../CLIHelper.js';
 export class DebugCommand {
     command = 'debug';
@@ -8,12 +9,13 @@ export class DebugCommand {
      */
     async handler(args) {
         CLIHelper.dump(`Current ${colors.cyan('MikroORM')} CLI configuration`);
-        await CLIHelper.dumpDependencies();
-        const settings = ConfigurationLoader.getSettings();
+        CLIHelper.dumpDependencies();
+        const settings = CLIHelper.getSettings();
         if (!process.versions.bun && settings.preferTs !== false) {
-            CLIHelper.dump(' - TypeScript support ' + colors.green('enabled'));
+            const loader = process.env.MIKRO_ORM_CLI_TS_LOADER ?? 'auto';
+            CLIHelper.dump(' - TypeScript support ' + colors.green(`enabled (${loader})`));
         }
-        const configPaths = args.config ?? CLIHelper.getConfigPaths();
+        const configPaths = args.config ?? await CLIHelper.getConfigPaths();
         CLIHelper.dump(' - searched config paths:');
         await DebugCommand.checkPaths(configPaths, 'yellow');
         CLIHelper.dump(` - searched for config name: ${colors.green(args.contextName)}`);
@@ -23,7 +25,7 @@ export class DebugCommand {
             const drivers = CLIHelper.getDriverDependencies(config);
             CLIHelper.dump(' - driver dependencies:');
             for (const driver of drivers) {
-                CLIHelper.dump(`   - ${driver} ${await CLIHelper.getModuleVersion(driver)}`);
+                CLIHelper.dump(`   - ${driver} ${CLIHelper.getModuleVersion(driver)}`);
             }
             const isConnected = await CLIHelper.isDBConnected(config, true);
             if (isConnected === true) {
@@ -39,8 +41,8 @@ export class DebugCommand {
             }
             const entities = config.get('entities', []);
             if (entities.length > 0) {
-                const refs = entities.filter(p => !Utils.isString(p));
-                const paths = entities.filter(p => Utils.isString(p));
+                const refs = entities.filter(p => typeof p !== 'string');
+                const paths = entities.filter(p => typeof p === 'string');
                 const will = !config.get('preferTs') ? 'will' : 'could';
                 CLIHelper.dump(` - ${will} use \`entities\` array (contains ${refs.length} references and ${paths.length} paths)`);
                 if (paths.length > 0) {
@@ -49,8 +51,8 @@ export class DebugCommand {
             }
             const entitiesTs = config.get('entitiesTs', []);
             if (entitiesTs.length > 0) {
-                const refs = entitiesTs.filter(p => !Utils.isString(p));
-                const paths = entitiesTs.filter(p => Utils.isString(p));
+                const refs = entitiesTs.filter(p => typeof p !== 'string');
+                const paths = entitiesTs.filter(p => typeof p === 'string');
                 /* v8 ignore next */
                 const will = config.get('preferTs') ? 'will' : 'could';
                 CLIHelper.dump(` - ${will} use \`entitiesTs\` array (contains ${refs.length} references and ${paths.length} paths)`);
@@ -67,8 +69,7 @@ export class DebugCommand {
         for (let path of paths) {
             path = Utils.absolutePath(path, baseDir);
             path = Utils.normalizePath(path);
-            const found = await Utils.pathExists(path);
-            if (found) {
+            if (fs.pathExists(path)) {
                 CLIHelper.dump(`   - ${path} (${colors.green('found')})`);
             }
             else {

package/commands/GenerateCacheCommand.js

@@ -1,4 +1,5 @@
-import { MetadataDiscovery, MetadataStorage, colors, FileCacheAdapter } from '@mikro-orm/core';
+import { MetadataDiscovery, MetadataStorage, colors } from '@mikro-orm/core';
+import { FileCacheAdapter } from '@mikro-orm/core/fs-utils';
 import { CLIHelper } from '../CLIHelper.js';
 export class GenerateCacheCommand {
     command = 'cache:generate';
@@ -25,7 +26,7 @@ export class GenerateCacheCommand {
         await config.getMetadataCacheAdapter().clear();
         config.set('logger', CLIHelper.dump.bind(null));
         config.set('debug', true);
-        const discovery = new MetadataDiscovery(MetadataStorage.init(), config.getDriver().getPlatform(), config);
+        const discovery = new MetadataDiscovery(new MetadataStorage(), config.getDriver().getPlatform(), config);
         await discovery.discover(args.ts ?? false);
         const combined = args.combined && config.get('metadataCache').combined;
         CLIHelper.dump(colors.green(`${combined ? 'Combined ' : ''}${args.ts ? 'TS' : 'JS'} metadata cache was successfully generated${combined ? ' to ' + combined : ''}`));

package/commands/MigrationCommandFactory.js

@@ -1,4 +1,4 @@
-import { Utils, colors } from '@mikro-orm/core';
+import { colors, Utils, } from '@mikro-orm/core';
 import { CLIHelper } from '../CLIHelper.js';
 export class MigrationCommandFactory {
     static DESCRIPTIONS = {
@@ -80,26 +80,25 @@ export class MigrationCommandFactory {
         // to be able to run have a master transaction, but run marked migrations outside of it, we need a second connection
         const options = { pool: { min: 1, max: 2 } };
         const orm = await CLIHelper.getORM(args.contextName, args.config, options);
-        const migrator = orm.getMigrator();
         switch (method) {
             case 'create':
-                await this.handleCreateCommand(migrator, args, orm.config);
+                await this.handleCreateCommand(orm.migrator, args, orm.config);
                 break;
             case 'check':
-                await this.handleCheckCommand(migrator, orm);
+                await this.handleCheckCommand(orm.migrator, orm);
                 break;
             case 'list':
-                await this.handleListCommand(migrator);
+                await this.handleListCommand(orm.migrator);
                 break;
             case 'pending':
-                await this.handlePendingCommand(migrator);
+                await this.handlePendingCommand(orm.migrator);
                 break;
             case 'up':
             case 'down':
-                await this.handleUpDownCommand(args, migrator, method);
+                await this.handleUpDownCommand(args, orm.migrator, method);
                 break;
             case 'fresh':
-                await this.handleFreshCommand(args, migrator, orm);
+                await this.handleFreshCommand(args, orm.migrator, orm);
         }
         await orm.close(true);
     }
@@ -121,7 +120,7 @@ export class MigrationCommandFactory {
         CLIHelper.dump(colors.green(message));
     }
     static async handlePendingCommand(migrator) {
-        const pending = await migrator.getPendingMigrations();
+        const pending = await migrator.getPending();
         CLIHelper.dumpTable({
             columns: ['Name'],
             rows: pending.map(row => [row.name]),
@@ -129,7 +128,7 @@ export class MigrationCommandFactory {
         });
     }
     static async handleListCommand(migrator) {
-        const executed = await migrator.getExecutedMigrations();
+        const executed = await migrator.getExecuted();
         CLIHelper.dumpTable({
             columns: ['Name', 'Executed at'],
             rows: executed.map(row => {
@@ -141,7 +140,7 @@ export class MigrationCommandFactory {
         });
     }
     static async handleCreateCommand(migrator, args, config) {
-        const ret = await migrator.createMigration(args.path, args.blank, args.initial, args.name);
+        const ret = await migrator.create(args.path, args.blank, args.initial, args.name);
         if (ret.diff.up.length === 0) {
             return CLIHelper.dump(colors.green(`No changes required, schema is up-to-date`));
         }
@@ -149,7 +148,7 @@ export class MigrationCommandFactory {
             CLIHelper.dump(colors.green('Creating migration with following queries:'));
             CLIHelper.dump(colors.green('up:'));
             CLIHelper.dump(ret.diff.up.map(sql => '  ' + sql).join('\n'), config);
-            /* v8 ignore next 3 */
+            /* v8 ignore if */
             if (config.getDriver().getPlatform().supportsDownMigrations()) {
                 CLIHelper.dump(colors.green('down:'));
                 CLIHelper.dump(ret.diff.down.map(sql => '  ' + sql).join('\n'), config);
@@ -161,7 +160,7 @@ export class MigrationCommandFactory {
         CLIHelper.dump(colors.green(`${ret.fileName} successfully created`));
     }
     static async handleCheckCommand(migrator, orm) {
-        if (!(await migrator.checkMigrationNeeded())) {
+        if (!(await migrator.checkSchema())) {
             return CLIHelper.dump(colors.green(`No changes required, schema is up-to-date`));
         }
         await orm.close(true);
@@ -169,17 +168,15 @@ export class MigrationCommandFactory {
         process.exit(1);
     }
     static async handleFreshCommand(args, migrator, orm) {
-        const generator = orm.getSchemaGenerator();
-        await generator.dropSchema({ dropMigrationsTable: true, dropDb: args.dropDb });
+        await orm.schema.drop({ dropMigrationsTable: true, dropDb: args.dropDb });
         CLIHelper.dump(colors.green('Dropped schema successfully'));
         const opts = MigrationCommandFactory.getUpDownOptions(args);
         await migrator.up(opts);
         const message = this.getUpDownSuccessMessage('up', opts);
         CLIHelper.dump(colors.green(message));
         if (args.seed !== undefined) {
-            const seeder = orm.getSeeder();
             const seederClass = args.seed || orm.config.get('seeder').defaultSeeder;
-            await seeder.seedString(seederClass);
+            await orm.seeder.seedString(seederClass);
             CLIHelper.dump(colors.green(`Database seeded successfully with seeder class ${seederClass}`));
         }
     }
@@ -203,10 +200,10 @@ export class MigrationCommandFactory {
         if (method === 'up' && Utils.isEmpty(options)) {
             return msg + ' to the latest version';
         }
-        if (Utils.isString(options.to)) {
+        if (typeof options.to === 'string') {
             return msg + ' to version ' + options.to;
         }
-        if (options.migrations && options.migrations.length === 1) {
+        if (options.migrations?.length === 1) {
             return msg + ' to version ' + options.migrations[0];
         }
         return msg;

package/commands/SchemaCommandFactory.js

@@ -80,12 +80,11 @@ export class SchemaCommandFactory {
             return CLIHelper.showHelp();
         }
         const orm = await CLIHelper.getORM(args.contextName, args.config);
-        const generator = orm.getSchemaGenerator();
         const params = { wrap: args.fkChecks == null ? undefined : !args.fkChecks, ...args };
         if (args.dump) {
             const m = `get${method.substr(0, 1).toUpperCase()}${method.substr(1)}SchemaSQL`;
-            const dump = await generator[m](params);
-            /* v8 ignore next 3 */
+            const dump = await orm.schema[m](params);
+            /* v8 ignore if */
             if (dump) {
                 CLIHelper.dump(dump, orm.config);
                 successMessage = '';
@@ -95,16 +94,13 @@ export class SchemaCommandFactory {
             }
         }
         else if (method === 'fresh') {
-            await generator.dropSchema(params);
-            await generator.createSchema(params);
+            await orm.schema.refresh(params);
         }
         else {
-            const m = method + 'Schema';
-            await generator[m](params);
+            await orm.schema[method](params);
         }
         if (typeof args.seed !== 'undefined') {
-            const seeder = orm.getSeeder();
-            await seeder.seedString(args.seed || orm.config.get('seeder').defaultSeeder);
+            await orm.seeder.seedString(args.seed || orm.config.get('seeder').defaultSeeder);
         }
         CLIHelper.dump(colors.green(successMessage));
         await orm.close(true);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/cli",
   "type": "module",
-  "version": "7.0.0-dev.9",
+  "version": "7.0.0-dev.91",
   "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",
@@ -41,7 +41,7 @@
     "mikro-orm": "./cli"
   },
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy",
@@ -53,13 +53,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/core": "7.0.0-dev.9",
-    "@mikro-orm/knex": "7.0.0-dev.9",
+    "@mikro-orm/core": "7.0.0-dev.91",
+    "@mikro-orm/knex": "7.0.0-dev.91",
+    "mikro-orm": "7.0.0-dev.91",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@mikro-orm/entity-generator": "^6.4.13",
-    "@mikro-orm/migrations": "^6.4.13",
-    "@mikro-orm/seeder": "^6.4.13"
+    "@mikro-orm/entity-generator": "^6.6.2",
+    "@mikro-orm/migrations": "^6.6.2",
+    "@mikro-orm/seeder": "^6.6.2"
   }
 }