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

package/CLIHelper.d.ts

@@ -11,6 +11,7 @@ export declare class CLIHelper {
      * @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 commonJSCompat(options: Partial<Options>): void;
     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>;

package/CLIHelper.js

@@ -1,5 +1,6 @@
 import { extname, join } from 'node:path';
-import { pathToFileURL } from 'node:url';
+import { createRequire } from 'node:module';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import yargs from 'yargs';
 import { colors, Configuration, loadEnvironmentVars, lookupExtensions, MikroORM, Utils, } from '@mikro-orm/core';
 import { fs } from '@mikro-orm/core/fs-utils';
@@ -15,6 +16,7 @@ export class CLIHelper {
      * @param options Additional options to augment the final configuration with.
      */
     static async getConfiguration(contextName, paths, options = {}) {
+        this.commonJSCompat(options);
         paths ??= await this.getConfigPaths();
         const deps = fs.getORMPackages();
         if (!deps.has('@mikro-orm/cli') && !process.env.MIKRO_ORM_ALLOW_GLOBAL_CLI) {
@@ -84,6 +86,16 @@ export class CLIHelper {
         await lookupExtensions(tmp);
         return new Configuration(Utils.mergeConfig({}, esmConfigOptions, tmp, options, env));
     }
+    static commonJSCompat(options) {
+        if (this.isESM()) {
+            return;
+        }
+        /* v8 ignore next */
+        options.dynamicImportProvider ??= id => {
+            id = fileURLToPath(id);
+            return createRequire(process.cwd())(id);
+        };
+    }
     static async getORM(contextName, configPaths, opts = {}) {
         const options = await this.getConfiguration(contextName, configPaths, opts);
         const settings = this.getSettings();
@@ -280,16 +292,19 @@ export class CLIHelper {
         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' },
+            swc: { esm: '@swc-node/register/esm-register', cjs: '@swc-node/register' },
+            tsx: { esm: 'tsx/esm/api', cjs: 'tsx/cjs/api', cb: (tsx) => tsx.register({ tsconfig: configPath }) },
+            jiti: { esm: 'jiti/register', cjs: 'jiti/register', cb: () => Utils.dynamicImportProvider = id => import(id).then(mod => mod?.default ?? mod) },
+            tsimp: { esm: 'tsimp/import', cjs: 'tsimp/import' },
         };
         for (const loader of Utils.keys(loaders)) {
             if (explicitLoader !== 'auto' && loader !== explicitLoader) {
                 continue;
             }
-            const { module, cb } = loaders[loader];
+            const { esm, cjs, cb } = loaders[loader];
+            const isEsm = this.isESM();
+            /* v8 ignore next */
+            const module = isEsm ? esm : cjs;
             const mod = await Utils.tryImport({ module });
             if (mod) {
                 cb?.(mod);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/cli",
   "type": "module",
-  "version": "7.0.0-dev.91",
+  "version": "7.0.0-dev.92",
   "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",
@@ -53,9 +53,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/core": "7.0.0-dev.91",
-    "@mikro-orm/knex": "7.0.0-dev.91",
-    "mikro-orm": "7.0.0-dev.91",
+    "@mikro-orm/core": "7.0.0-dev.92",
+    "@mikro-orm/knex": "7.0.0-dev.92",
+    "mikro-orm": "7.0.0-dev.92",
     "yargs": "17.7.2"
   },
   "devDependencies": {