@mikro-orm/cli 7.0.0-dev.77 → 7.0.0-dev.79

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';
@@ -36,7 +37,7 @@ function createBasicConfig() {
         .strict();
 }
 export async function configure() {
-    await ConfigurationLoader.checkPackageVersion();
+    await fs.checkPackageVersion();
     const settings = await CLIHelper.getSettings();
     const version = Utils.getORMVersion();
     if (settings.preferTs !== false) {

package/CLIHelper.d.ts

@@ -1,4 +1,4 @@
-import { type EntityManagerType, type EntityManager, MikroORM, 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
  */
@@ -7,7 +7,7 @@ export declare class CLIHelper {
      * 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 ConfigurationLoader.getConfigPaths}.
+     * @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>>;

package/CLIHelper.js

@@ -1,7 +1,8 @@
 import { extname, join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import yargs from 'yargs';
-import { colors, ConfigurationLoader, MikroORM, Utils, Configuration, lookupExtensions, } from '@mikro-orm/core';
+import { colors, Configuration, loadEnvironmentVars, lookupExtensions, MikroORM, Utils, } from '@mikro-orm/core';
+import { fs } from '@mikro-orm/core/fs-utils';
 /**
  * @internal
  */
@@ -10,12 +11,12 @@ export class CLIHelper {
      * 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 ConfigurationLoader.getConfigPaths}.
+     * @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 = await ConfigurationLoader.getORMPackages();
+        const deps = await 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!');
         }
@@ -125,7 +126,7 @@ export class CLIHelper {
         console.log(text);
     }
     static async getSettings() {
-        const config = await ConfigurationLoader.getPackageConfig();
+        const config = await 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;
@@ -149,8 +150,8 @@ export class CLIHelper {
             paths.push('./src/mikro-orm.config.ts');
             paths.push('./mikro-orm.config.ts');
         }
-        const distDir = Utils.pathExists(process.cwd() + '/dist');
-        const buildDir = Utils.pathExists(process.cwd() + '/build');
+        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`);
@@ -162,7 +163,7 @@ export class CLIHelper {
         for (let path of paths) {
             path = Utils.absolutePath(path);
             path = Utils.normalizePath(path);
-            if (Utils.pathExists(path)) {
+            if (fs.pathExists(path)) {
                 const config = await Utils.dynamicImport(path);
                 /* v8 ignore next */
                 return [path, await (config.default ?? config)];
@@ -171,7 +172,7 @@ export class CLIHelper {
         return [];
     }
     static async loadEnvironmentVars() {
-        const ret = ConfigurationLoader.loadEnvironmentVars();
+        const ret = loadEnvironmentVars();
         /* v8 ignore next */
         switch (process.env.MIKRO_ORM_TYPE) {
             case 'mongo':
@@ -203,7 +204,7 @@ export class CLIHelper {
         CLIHelper.dump(' - dependencies:');
         CLIHelper.dump(`   - mikro-orm ${colors.green(version)}`);
         CLIHelper.dump(`   - node ${colors.green(process.versions.node)}`);
-        if (Utils.pathExists(process.cwd() + '/package.json')) {
+        if (fs.pathExists(process.cwd() + '/package.json')) {
             /* v8 ignore if */
             if (process.versions.bun) {
                 CLIHelper.dump(`   - typescript via bun`);
@@ -220,7 +221,7 @@ export class CLIHelper {
     static async getModuleVersion(name) {
         try {
             const path = `${this.resolveModulePath(name)}/package.json`;
-            const pkg = Utils.readJSONSync(path);
+            const pkg = fs.readJSONSync(path);
             return colors.green(pkg.version);
         }
         catch {
@@ -303,7 +304,7 @@ export class CLIHelper {
         return false;
     }
     static async isESM() {
-        const config = await ConfigurationLoader.getPackageConfig();
+        const config = await fs.getPackageConfig();
         const type = config?.type ?? '';
         return type === 'module';
     }

package/commands/DebugCommand.js

@@ -1,4 +1,5 @@
 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';
@@ -68,7 +69,7 @@ export class DebugCommand {
         for (let path of paths) {
             path = Utils.absolutePath(path, baseDir);
             path = Utils.normalizePath(path);
-            if (Utils.pathExists(path)) {
+            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';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/cli",
   "type": "module",
-  "version": "7.0.0-dev.77",
+  "version": "7.0.0-dev.79",
   "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.77",
-    "@mikro-orm/knex": "7.0.0-dev.77",
-    "mikro-orm": "7.0.0-dev.77",
+    "@mikro-orm/core": "7.0.0-dev.79",
+    "@mikro-orm/knex": "7.0.0-dev.79",
+    "mikro-orm": "7.0.0-dev.79",
     "yargs": "17.7.2"
   },
   "devDependencies": {