@mikro-orm/cli 7.1.0-dev.5 → 7.1.0-dev.50

package/CLIConfigurator.js

@@ -73,5 +73,6 @@ export async function configure() {
         .command(MigrationCommandFactory.create('fresh'))
         .command(MigrationCommandFactory.create('log'))
         .command(MigrationCommandFactory.create('unlog'))
+        .command(MigrationCommandFactory.create('rollup'))
         .command(new DebugCommand());
 }

package/CLIHelper.js

@@ -24,7 +24,6 @@ export class CLIHelper {
         }
         contextName ??= process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default';
         const env = await this.loadEnvironmentVars();
-        await loadOptionalDependencies(options);
         // oxfmt-ignore
         const configFinder = (cfg) => {
             return typeof cfg === 'object' && cfg !== null && ('contextName' in cfg ? cfg.contextName === contextName : contextName === 'default');
@@ -35,7 +34,9 @@ export class CLIHelper {
         const result = await this.getConfigFile(paths);
         if (!result[0]) {
             if (Utils.hasObjectKeys(env)) {
-                return new Configuration(Utils.mergeConfig({ contextName }, options.preferEnvVars ? options : env, options.preferEnvVars ? env : options));
+                const merged = Utils.mergeConfig({ contextName }, options.preferEnvVars ? options : env, options.preferEnvVars ? env : options);
+                await loadOptionalDependencies(merged);
+                return new Configuration(merged);
             }
             throw new Error(`MikroORM config file not found in ['${paths.join(`', '`)}']`);
         }
@@ -209,6 +210,15 @@ export class CLIHelper {
             case 'postgresql':
                 ret.driver ??= await import('@mikro-orm/postgresql').then(m => m.PostgreSqlDriver);
                 break;
+            case 'pglite': {
+                // Variable specifier (instead of a literal) keeps `@electric-sql/pglite`'s
+                // d.ts — which references DOM/Emscripten ambient globals not in our TS
+                // lib — out of the CLI's compile graph. Safe here: the CLI is a Node
+                // binary, not bundled into end-user apps.
+                const name = '@mikro-orm/pglite';
+                ret.driver ??= (await import(name)).PgliteDriver;
+                break;
+            }
             case 'sqlite':
                 ret.driver ??= await import('@mikro-orm/sqlite').then(m => m.SqliteDriver);
                 break;

package/README.md

@@ -2,7 +2,7 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases.
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL (including CockroachDB and PGlite), SQLite (including libSQL), MSSQL and Oracle databases.
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
@@ -19,6 +19,7 @@ Install a driver package for your database:
 
 ```sh
 npm install @mikro-orm/postgresql   # PostgreSQL
+npm install @mikro-orm/pglite       # PGlite (embedded PostgreSQL in WASM)
 npm install @mikro-orm/mysql        # MySQL
 npm install @mikro-orm/mariadb      # MariaDB
 npm install @mikro-orm/sqlite       # SQLite

package/commands/DiscoveryExportCommand.js

@@ -1,10 +1,11 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
-import { basename, dirname, join, relative, resolve } from 'node:path';
+import { basename, dirname, join, resolve } from 'node:path';
 import { colors, EntitySchema, MetadataStorage } from '@mikro-orm/core';
 import { fs } from '@mikro-orm/core/fs-utils';
 import { CLIHelper } from '../CLIHelper.js';
 const driverPackageMap = {
     PostgreSqlDriver: '@mikro-orm/postgresql',
+    PgliteDriver: '@mikro-orm/pglite',
     MySqlDriver: '@mikro-orm/mysql',
     MariaDbDriver: '@mikro-orm/mariadb',
     SqliteDriver: '@mikro-orm/sqlite',
@@ -176,10 +177,8 @@ export class DiscoveryExportCommand {
         }
         // Generate import lines
         for (const [filePath, items] of byFile) {
-            let rel = relative(outDir, filePath);
-            if (!rel.startsWith('.')) {
-                rel = './' + rel;
-            }
+            // `fs.relativePath` ensures POSIX separators (node:path.relative returns backslashes on Windows)
+            let rel = fs.relativePath(filePath, outDir);
             // Remove .ts extension and optionally add .js for ESM
             rel = rel.replace(/\.[cm]?[jt]s$/, '');
             if (esm) {
@@ -195,11 +194,12 @@ export class DiscoveryExportCommand {
                 lines.push(`import { ${names} } from '${rel}';`);
             }
         }
-        const isMongo = driverPackage === '@mikro-orm/mongodb';
-        // Type imports (Kysely types are not available for MongoDB)
-        if (!isMongo) {
-            lines.push(`import type { EntitySchemaWithMeta, InferKyselyDB, InferClassEntityDB } from '${driverPackage}';`);
-        }
+        // Bring in the driver's `EntityManager` class as a runtime value, not just
+        // a type — DI containers (NestJS, etc.) read it via `design:paramtypes`
+        // reflect-metadata, so the consumer needs the actual class reference, not
+        // an erased type alias. Aliasing keeps the local name free for our own
+        // `EntityManager` re-export.
+        lines.push(`import { EntityManager as DriverEntityManager } from '${driverPackage}';`);
         lines.push('');
         // entities array
         lines.push('export const entities = [');
@@ -207,12 +207,20 @@ export class DiscoveryExportCommand {
             lines.push(`  ${item.exportName},`);
         }
         lines.push('] as const;');
-        // Database type (Kysely is SQL-only, skip for MongoDB)
-        if (!isMongo) {
-            lines.push('');
-            lines.push('export type Database = InferKyselyDB<Extract<(typeof entities)[number], EntitySchemaWithMeta>>');
-            lines.push('  & InferClassEntityDB<(typeof entities)[number]>;');
-        }
+        lines.push('');
+        // The entity tuple type — usable in `MikroORM<Driver, EM, Database>`,
+        // for typed repository helpers, and anywhere entity classes/schemas are
+        // accepted as a tuple.
+        lines.push('export type Database = typeof entities;');
+        lines.push('');
+        // Typed `EntityManager` for DI / NestJS contexts. Declaration merging
+        // lets us export the same name twice: the `type` carries the entity
+        // tuple via the `'~entities'` graft (so `em.getKysely(opts)` keeps full
+        // inference), and the `const` is the driver's actual EM class — so
+        // `constructor(em: EntityManager) {}` resolves through Nest's container
+        // just like importing the class straight from the driver package.
+        lines.push("export type EntityManager = DriverEntityManager & { '~entities': Database };");
+        lines.push('export const EntityManager = DriverEntityManager;');
         lines.push('');
         return lines.join('\n');
     }

package/commands/MigrationCommandFactory.d.ts

@@ -11,6 +11,7 @@ export declare class MigrationCommandFactory {
         fresh: string;
         log: string;
         unlog: string;
+        rollup: string;
     };
     static create<const T extends MigratorMethod>(command: T): {
         command: string;
@@ -24,6 +25,7 @@ export declare class MigrationCommandFactory {
             fresh: string;
             log: string;
             unlog: string;
+            rollup: string;
         }[T];
         builder: (args: Argv<BaseArgs>) => Argv<MigrationOptionsMap[T]>;
         handler: (args: ArgumentsCamelCase<MigrationOptionsMap[T]>) => Promise<void>;
@@ -41,6 +43,7 @@ export declare class MigrationCommandFactory {
     private static handleCheckCommand;
     private static handleFreshCommand;
     private static handleLogUnlogCommand;
+    private static handleRollupCommand;
     private static getUpDownOptions;
     private static getUpDownSuccessMessage;
 }
@@ -48,6 +51,7 @@ type CliUpDownOptions = BaseArgs & {
     to?: string | number;
     from?: string | number;
     only?: string;
+    schema?: string;
 };
 type MigratorFreshOptions = BaseArgs & {
     dropDb?: boolean;
@@ -73,6 +77,7 @@ type MigrationOptionsMap = {
     fresh: MigratorFreshOptions;
     log: MigratorLogUnlogOptions;
     unlog: MigratorLogUnlogOptions;
+    rollup: BaseArgs;
 };
 type MigratorMethod = keyof MigrationOptionsMap;
 type Opts = BaseArgs & MigratorCreateOptions & CliUpDownOptions & MigratorFreshOptions & MigratorLogUnlogOptions;

package/commands/MigrationCommandFactory.js

@@ -11,6 +11,7 @@ export class MigrationCommandFactory {
         fresh: 'Clear the database and rerun all migrations',
         log: 'Mark a migration as executed without running it',
         unlog: 'Remove a migration from the executed list without reverting it',
+        rollup: 'Combine multiple migrations into a single migration',
     };
     static create(command) {
         // oxfmt-ignore
@@ -61,6 +62,11 @@ export class MigrationCommandFactory {
             type: 'string',
             desc: 'Migrate only specified versions',
         });
+        args.option('s', {
+            alias: 'schema',
+            type: 'string',
+            desc: 'Target schema to run the migration against (PostgreSQL, MySQL, Oracle)',
+        });
         return args;
     }
     static configureCreateCommand(args) {
@@ -119,6 +125,9 @@ export class MigrationCommandFactory {
             case 'unlog':
                 await this.handleLogUnlogCommand(args, orm.migrator, method);
                 break;
+            case 'rollup':
+                await this.handleRollupCommand(orm.migrator);
+                break;
         }
         await orm.close(true);
     }
@@ -206,12 +215,16 @@ export class MigrationCommandFactory {
         const action = method === 'log' ? 'logged' : 'unlogged';
         CLIHelper.dump(colors.green(`Successfully ${action} migration '${args.name}'`));
     }
+    static async handleRollupCommand(migrator) {
+        const ret = await migrator.rollup();
+        CLIHelper.dump(colors.green(`${ret.fileName} successfully created (rollup)`));
+    }
     static getUpDownOptions(flags) {
-        if (!flags.to && !flags.from && flags.only) {
-            return { migrations: flags.only.split(/[, ]+/) };
-        }
-        const ret = {};
+        const ret = !flags.to && !flags.from && flags.only ? { migrations: flags.only.split(/[, ]+/) } : {};
         ['from', 'to'].filter(k => flags[k]).forEach(k => (ret[k] = flags[k] === '0' ? 0 : flags[k]));
+        if (flags.schema) {
+            ret.schema = flags.schema;
+        }
         return ret;
     }
     static getUpDownSuccessMessage(method, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/cli",
-  "version": "7.1.0-dev.5",
+  "version": "7.1.0-dev.50",
   "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.",
   "keywords": [
     "data-mapper",
@@ -50,8 +50,8 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/core": "7.1.0-dev.5",
-    "mikro-orm": "7.1.0-dev.5",
+    "@mikro-orm/core": "7.1.0-dev.50",
+    "mikro-orm": "7.1.0-dev.50",
     "yargs": "17.7.2"
   },
   "engines": {