@mikro-orm/core 6.3.14-dev.56 → 6.3.14-dev.58

package/MikroORM.d.ts

@@ -44,8 +44,10 @@ export declare class MikroORM<D extends IDatabaseDriver = IDatabaseDriver, EM ex
      * Checks whether the database connection is active, returns .
      */
     checkConnection(): Promise<{
-        ok: boolean;
-        reason?: string;
+        ok: true;
+    } | {
+        ok: false;
+        reason: string;
         error?: Error;
     }>;
     /**

package/MikroORM.js

@@ -29,7 +29,12 @@ class MikroORM {
         const coreVersion = await utils_1.ConfigurationLoader.checkPackageVersion();
         const env = utils_1.ConfigurationLoader.loadEnvironmentVars();
         if (!options) {
-            options = (await utils_1.ConfigurationLoader.getConfiguration()).getAll();
+            const configPathFromArg = utils_1.ConfigurationLoader.configPathsFromArg();
+            const config = (await utils_1.ConfigurationLoader.getConfiguration(configPathFromArg ?? utils_1.ConfigurationLoader.getConfigPaths()));
+            options = config.getAll();
+            if (configPathFromArg) {
+                config.getLogger().warn('deprecated', 'Path for config file was inferred from the command line arguments. Instead, you should set the MIKRO_ORM_CLI_CONFIG environment variable to specify the path, or if you really must use the command line arguments, import the config manually based on them, and pass it to init.', { label: 'D0001' });
+            }
         }
         options = utils_1.Utils.mergeConfig(options, env);
         await utils_1.ConfigurationLoader.commonJSCompat(options);

package/connections/Connection.d.ts

@@ -26,8 +26,10 @@ export declare abstract class Connection {
      * Are we connected to the database
      */
     abstract checkConnection(): Promise<{
-        ok: boolean;
-        reason?: string;
+        ok: true;
+    } | {
+        ok: false;
+        reason: string;
         error?: Error;
     }>;
     /**

package/logging/DefaultLogger.js

@@ -60,6 +60,12 @@ class DefaultLogger {
             return context.enabled;
         }
         const debugMode = context?.debugMode ?? this.debugMode;
+        if (namespace === 'deprecated') {
+            const { ignoreDeprecations = false } = this.options;
+            return Array.isArray(ignoreDeprecations)
+                ? !ignoreDeprecations.includes(context?.label ?? '')
+                : !ignoreDeprecations;
+        }
         return !!debugMode && (!Array.isArray(debugMode) || debugMode.includes(namespace));
     }
     /**

package/logging/Logger.d.ts

@@ -22,7 +22,7 @@ export interface Logger {
     setDebugMode(debugMode: boolean | LoggerNamespace[]): void;
     isEnabled(namespace: LoggerNamespace, context?: LogContext): boolean;
 }
-export type LoggerNamespace = 'query' | 'query-params' | 'schema' | 'discovery' | 'info';
+export type LoggerNamespace = 'query' | 'query-params' | 'schema' | 'discovery' | 'info' | 'deprecated';
 export interface LogContext extends Dictionary {
     query?: string;
     label?: string;
@@ -41,6 +41,7 @@ export interface LogContext extends Dictionary {
 export interface LoggerOptions {
     writer: (message: string) => void;
     debugMode?: boolean | LoggerNamespace[];
+    ignoreDeprecations?: boolean | string[];
     highlighter?: Highlighter;
     usesReplicas?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.56",
+  "version": "6.3.14-dev.58",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.56",
+    "mikro-orm": "6.3.14-dev.58",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/Configuration.d.ts

@@ -79,6 +79,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
         ensureIndexes: false;
         batchSize: number;
         debug: false;
+        ignoreDeprecations: false;
         verbose: false;
         driverOptions: {};
         migrations: {
@@ -367,6 +368,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     findOneOrFailHandler: (entityName: string, where: Dictionary | IPrimaryKey) => Error;
     findExactlyOneOrFailHandler: (entityName: string, where: Dictionary | IPrimaryKey) => Error;
     debug: boolean | LoggerNamespace[];
+    ignoreDeprecations: boolean | string[];
     highlighter: Highlighter;
     tsNode?: boolean;
     baseDir: string;

package/utils/Configuration.js

@@ -73,6 +73,7 @@ class Configuration {
         ensureIndexes: false,
         batchSize: 300,
         debug: false,
+        ignoreDeprecations: false,
         verbose: false,
         driverOptions: {},
         migrations: {
@@ -150,6 +151,7 @@ class Configuration {
         this.options.loggerFactory ??= logging_1.DefaultLogger.create;
         this.logger = this.options.loggerFactory({
             debugMode: this.options.debug,
+            ignoreDeprecations: this.options.ignoreDeprecations,
             usesReplicas: (this.options.replicas?.length ?? 0) > 0,
             highlighter: this.options.highlighter,
             writer: this.options.logger,

package/utils/ConfigurationLoader.d.ts

@@ -6,9 +6,10 @@ import { Configuration, type Options } from './Configuration';
  * @internal
  */
 export declare class ConfigurationLoader {
-    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(validate?: boolean, options?: Partial<Options>): Promise<Configuration<D, EM>>;
+    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(paths: string[], options?: Partial<Options>, validate?: boolean): Promise<Configuration<D, EM>>;
     static getPackageConfig(basePath?: string): Dictionary;
     static getSettings(): Settings;
+    static configPathsFromArg(): string[] | undefined;
     static getConfigPaths(): string[];
     static isESM(): boolean;
     static registerTsNode(configPath?: string): boolean;

package/utils/ConfigurationLoader.js

@@ -16,10 +16,7 @@ const Utils_1 = require("./Utils");
  * @internal
  */
 class ConfigurationLoader {
-    static async getConfiguration(validate = true, options = {}) {
-        this.commonJSCompat(options);
-        this.registerDotenv(options);
-        const paths = this.getConfigPaths();
+    static async getConfiguration(paths, options = {}, validate = true) {
         const env = this.loadEnvironmentVars();
         for (let path of paths) {
             path = Utils_1.Utils.absolutePath(path);
@@ -73,12 +70,15 @@ class ConfigurationLoader {
         }
         return settings;
     }
-    static getConfigPaths() {
+    static configPathsFromArg() {
         const options = Utils_1.Utils.parseArgs();
         const configArgName = process.env.MIKRO_ORM_CONFIG_ARG_NAME ?? 'config';
         if (options[configArgName]) {
             return [options[configArgName]];
         }
+        return undefined;
+    }
+    static getConfigPaths() {
         const paths = [];
         const settings = ConfigurationLoader.getSettings();
         if (process.env.MIKRO_ORM_CLI_CONFIG) {