@mikro-orm/core 6.3.14-dev.66 → 6.3.14-dev.67

package/MikroORM.js

@@ -30,7 +30,7 @@ class MikroORM {
         const env = utils_1.ConfigurationLoader.loadEnvironmentVars();
         if (!options) {
             const configPathFromArg = utils_1.ConfigurationLoader.configPathsFromArg();
-            const config = (await utils_1.ConfigurationLoader.getConfiguration(configPathFromArg ?? utils_1.ConfigurationLoader.getConfigPaths()));
+            const config = (await utils_1.ConfigurationLoader.getConfiguration(process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default', 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' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.66",
+  "version": "6.3.14-dev.67",
   "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.66",
+    "mikro-orm": "6.3.14-dev.67",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/ConfigurationLoader.d.ts

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

package/utils/ConfigurationLoader.js

@@ -16,27 +16,69 @@ const Utils_1 = require("./Utils");
  * @internal
  */
 class ConfigurationLoader {
-    static async getConfiguration(paths, options = {}, validate = true) {
+    static async getConfiguration(contextName = 'default', paths, options = {}) {
         const env = this.loadEnvironmentVars();
+        const configFinder = (cfg) => {
+            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);
+        };
         for (let path of paths) {
             path = Utils_1.Utils.absolutePath(path);
             path = Utils_1.Utils.normalizePath(path);
             if ((0, fs_extra_1.pathExistsSync)(path)) {
                 const config = await Utils_1.Utils.dynamicImport(path);
                 /* istanbul ignore next */
-                let tmp = config.default ?? config;
-                if (tmp instanceof Function) {
-                    tmp = tmp();
+                let tmp = await (config.default ?? config);
+                if (Array.isArray(tmp)) {
+                    const tmpFirstIndex = tmp.findIndex(configFinder);
+                    if (tmpFirstIndex === -1) {
+                        // Static config not found. Try factory functions
+                        let configCandidate;
+                        for (let i = 0, l = tmp.length; i < l; ++i) {
+                            const f = tmp[i];
+                            if (typeof f !== 'function') {
+                                continue;
+                            }
+                            configCandidate = await f(contextName);
+                            if (!isValidConfigFactoryResult(configCandidate)) {
+                                continue;
+                            }
+                            tmp = configCandidate;
+                            break;
+                        }
+                        if (Array.isArray(tmp)) {
+                            throw new Error(`MikroORM config '${contextName}' was not found within the config file '${path}'. Either add a config with this name to the array, or add a function that when given this name will return a configuration object without a name, or with name set to this name.`);
+                        }
+                    }
+                    else {
+                        const tmpLastIndex = tmp.findLastIndex(configFinder);
+                        if (tmpLastIndex !== tmpFirstIndex) {
+                            throw new Error(`MikroORM config '${contextName}' is not unique within the array exported by '${path}' (first occurrence index: ${tmpFirstIndex}; last occurrence index: ${tmpLastIndex})`);
+                        }
+                        tmp = tmp[tmpFirstIndex];
+                    }
                 }
-                if (tmp instanceof Promise) {
-                    tmp = await tmp;
+                else {
+                    if (tmp instanceof Function) {
+                        tmp = await tmp(contextName);
+                        if (!isValidConfigFactoryResult(tmp)) {
+                            throw new Error(`MikroORM config '${contextName}' was not what the function exported from '${path}' provided. Ensure it returns a config object with no name, or name matching the requested one.`);
+                        }
+                    }
+                    else {
+                        if (!configFinder(tmp)) {
+                            throw new Error(`MikroORM config '${contextName}' was not what the default export from '${path}' provided.`);
+                        }
+                    }
                 }
                 const esmConfigOptions = this.isESM() ? { entityGenerator: { esmImport: true } } : {};
-                return new Configuration_1.Configuration(Utils_1.Utils.mergeConfig({}, esmConfigOptions, tmp, options, env), validate);
+                return new Configuration_1.Configuration(Utils_1.Utils.mergeConfig({}, esmConfigOptions, tmp, options, env));
             }
         }
         if (Utils_1.Utils.hasObjectKeys(env)) {
-            return new Configuration_1.Configuration(Utils_1.Utils.mergeConfig({}, options, env), validate);
+            return new Configuration_1.Configuration(Utils_1.Utils.mergeConfig({ contextName }, options, env));
         }
         throw new Error(`MikroORM config file not found in ['${paths.join(`', '`)}']`);
     }