@mikro-orm/cli 7.0.0-rc.2 → 7.0.0-rc.3

package/CLIHelper.js

@@ -25,8 +25,9 @@ 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'));
+            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);
@@ -92,10 +93,12 @@ export class CLIHelper {
             return;
         }
         /* v8 ignore next */
-        globalThis.dynamicImportProvider = options.dynamicImportProvider ??= id => {
-            id = fileURLToPath(id);
-            return createRequire(process.cwd())(id);
-        };
+        options.dynamicImportProvider ??=
+            globalThis.dynamicImportProvider ??
+                ((id) => {
+                    return createRequire(process.cwd())(fileURLToPath(id));
+                });
+        globalThis.dynamicImportProvider = options.dynamicImportProvider;
     }
     static async getORM(contextName, configPaths, opts = {}) {
         const options = await this.getConfiguration(contextName, configPaths, opts);
@@ -143,10 +146,12 @@ export class CLIHelper {
         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.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;
+        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;
         }
@@ -167,7 +172,7 @@ export class CLIHelper {
         const distDir = fs.pathExists(process.cwd() + '/dist');
         const buildDir = fs.pathExists(process.cwd() + '/build');
         /* v8 ignore next */
-        const path = distDir ? 'dist' : (buildDir ? 'build' : 'src');
+        const path = distDir ? 'dist' : buildDir ? 'build' : 'src';
         paths.push(`./${path}/mikro-orm.config.js`);
         paths.push('./mikro-orm.config.js');
         /* v8 ignore next */
@@ -270,10 +275,18 @@ export class CLIHelper {
         });
         let ret = '';
         ret += colors.grey('┌' + lengths.map(length => '─'.repeat(length)).join('┬') + '┐\n');
-        ret += colors.grey('│') + lengths.map((length, idx) => ' ' + colors.red(options.columns[idx]) + ' '.repeat(length - options.columns[idx].length - 1)).join(colors.grey('│')) + colors.grey('│\n');
+        ret +=
+            colors.grey('│') +
+                lengths
+                    .map((length, idx) => ' ' + colors.red(options.columns[idx]) + ' '.repeat(length - options.columns[idx].length - 1))
+                    .join(colors.grey('│')) +
+                colors.grey('│\n');
         ret += colors.grey('├' + lengths.map(length => '─'.repeat(length)).join('┼') + '┤\n');
         options.rows.forEach(row => {
-            ret += colors.grey('│') + lengths.map((length, idx) => ' ' + row[idx] + ' '.repeat(length - row[idx].length - 1)).join(colors.grey('│')) + colors.grey('│\n');
+            ret +=
+                colors.grey('│') +
+                    lengths.map((length, idx) => ' ' + row[idx] + ' '.repeat(length - row[idx].length - 1)).join(colors.grey('│')) +
+                    colors.grey('│\n');
         });
         ret += colors.grey('└' + lengths.map(length => '─'.repeat(length)).join('┴') + '┘');
         CLIHelper.dump(ret);
@@ -292,13 +305,14 @@ export class CLIHelper {
         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 setEsmImportProvider = () => {
+            return (globalThis.dynamicImportProvider = (id) => import(id).then(mod => mod?.default ?? mod));
+        };
         const loaders = {
             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: { cjs: 'jiti/register', cb: () => {
-                    return globalThis.dynamicImportProvider = (id) => import(id).then(mod => mod?.default ?? mod);
-                } },
-            tsimp: { cjs: 'tsimp/import' },
+            jiti: { cjs: 'jiti/register', cb: setEsmImportProvider },
+            tsimp: { cjs: 'tsimp/import', cb: setEsmImportProvider },
         };
         for (const loader of Utils.keys(loaders)) {
             if (explicitLoader !== 'auto' && loader !== explicitLoader) {

package/commands/CompileCommand.js

@@ -1,6 +1,6 @@
 import { writeFileSync, mkdirSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
-import { MetadataDiscovery, MetadataStorage, Utils, EntityComparator, ObjectHydrator, colors } from '@mikro-orm/core';
+import { MetadataDiscovery, MetadataStorage, Utils, EntityComparator, ObjectHydrator, colors, } from '@mikro-orm/core';
 import { fs } from '@mikro-orm/core/fs-utils';
 import { CLIHelper } from '../CLIHelper.js';
 export class CompileCommand {

package/commands/DebugCommand.js

@@ -15,7 +15,7 @@ export class DebugCommand {
             const loader = process.env.MIKRO_ORM_CLI_TS_LOADER ?? 'auto';
             CLIHelper.dump(' - TypeScript support ' + colors.green(`enabled (${loader})`));
         }
-        const configPaths = args.config ?? await 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)}`);

package/commands/MigrationCommandFactory.js

@@ -11,6 +11,7 @@ export class MigrationCommandFactory {
         fresh: 'Clear the database and rerun all migrations',
     };
     static create(command) {
+        // oxfmt-ignore
         return {
             command: `migration:${command}`,
             describe: MigrationCommandFactory.DESCRIPTIONS[command],
@@ -154,6 +155,7 @@ export class MigrationCommandFactory {
                 CLIHelper.dump(ret.diff.down.map(sql => '  ' + sql).join('\n'), config);
             }
             else {
+                /* v8 ignore next */
                 CLIHelper.dump(colors.yellow(`(${config.getDriver().constructor.name} does not support automatic down migrations)`));
             }
         }
@@ -185,7 +187,7 @@ export class MigrationCommandFactory {
             return { migrations: flags.only.split(/[, ]+/) };
         }
         const ret = {};
-        ['from', 'to'].filter(k => flags[k]).forEach(k => ret[k] = flags[k] === '0' ? 0 : flags[k]);
+        ['from', 'to'].filter(k => flags[k]).forEach(k => (ret[k] = flags[k] === '0' ? 0 : flags[k]));
         return ret;
     }
     static getUpDownSuccessMessage(method, options) {

package/package.json

@@ -1,47 +1,47 @@
 {
   "name": "@mikro-orm/cli",
-  "type": "module",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.3",
   "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",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
   "bin": {
     "mikro-orm": "./cli"
   },
-  "engines": {
-    "node": ">= 22.17.0"
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "yarn compile && yarn copy",
@@ -49,12 +49,12 @@
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@mikro-orm/core": "7.0.0-rc.2",
-    "mikro-orm": "7.0.0-rc.2",
+    "@mikro-orm/core": "7.0.0-rc.3",
+    "mikro-orm": "7.0.0-rc.3",
     "yargs": "17.7.2"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }