@mikro-orm/core 7.0.0-dev.45 → 7.0.0-dev.47

package/MikroORM.d.ts

@@ -27,7 +27,6 @@ export declare class MikroORM<Driver extends IDatabaseDriver = IDatabaseDriver,
      * - database connection will be established when you first interact with the database (or you can use `orm.connect()` explicitly)
      * - no loading of the `config` file, `options` parameter is mandatory
      * - no support for folder based discovery
-     * - no check for mismatched package versions
      */
     constructor(options: Options<Driver, EM>);
     /**

package/MikroORM.js

@@ -27,17 +27,10 @@ export class MikroORM {
         if (!options) {
             throw new Error(`options parameter is required`);
         }
-        const coreVersion = ConfigurationLoader.checkPackageVersion();
         options.discovery ??= {};
         options.discovery.skipSyncDiscovery ??= true;
         const orm = new this(options);
-        orm.logger.log('info', `MikroORM version: ${colors.green(coreVersion)}`);
-        // we need to allow global context here as we are not in a scope of requests yet
-        const allowGlobalContext = orm.config.get('allowGlobalContext');
-        orm.config.set('allowGlobalContext', true);
         await orm.discoverEntities();
-        orm.config.set('allowGlobalContext', allowGlobalContext);
-        orm.driver.getPlatform().init(orm);
         return orm;
     }
     /**
@@ -45,11 +38,11 @@ export class MikroORM {
      * - database connection will be established when you first interact with the database (or you can use `orm.connect()` explicitly)
      * - no loading of the `config` file, `options` parameter is mandatory
      * - no support for folder based discovery
-     * - no check for mismatched package versions
      */
     constructor(options) {
         ConfigurationLoader.registerDotenv(options);
         const env = ConfigurationLoader.loadEnvironmentVarsSync();
+        const coreVersion = ConfigurationLoader.checkPackageVersion();
         options = Utils.merge(options, env);
         this.config = new Configuration(options);
         const discovery = this.config.get('discovery');
@@ -60,18 +53,15 @@ export class MikroORM {
         }
         this.driver = this.config.getDriver();
         this.logger = this.config.getLogger();
+        this.logger.log('info', `MikroORM version: ${colors.green(coreVersion)}`);
         this.discovery = new MetadataDiscovery(new MetadataStorage(), this.driver.getPlatform(), this.config);
-        if (!discovery.skipSyncDiscovery) {
-            // we need to allow global context here as we are not in a scope of requests yet
-            const allowGlobalContext = this.config.get('allowGlobalContext');
-            this.config.set('allowGlobalContext', true);
-            this.discoverEntitiesSync();
-            this.config.set('allowGlobalContext', allowGlobalContext);
-            this.driver.getPlatform().init(this);
-        }
+        this.driver.getPlatform().init(this);
         for (const extension of this.config.get('extensions')) {
             extension.register(this);
         }
+        if (!discovery.skipSyncDiscovery) {
+            this.discoverEntitiesSync();
+        }
     }
     /**
      * Connects to the database.
@@ -125,12 +115,20 @@ export class MikroORM {
         return this.metadata;
     }
     async discoverEntities() {
+        // we need to allow global context here as we are not in a scope of requests yet
+        const allowGlobalContext = this.config.get('allowGlobalContext');
+        this.config.set('allowGlobalContext', true);
         this.metadata = await this.discovery.discover(this.config.get('preferTs'));
         this.createEntityManager();
+        this.config.set('allowGlobalContext', allowGlobalContext);
     }
     discoverEntitiesSync() {
+        // we need to allow global context here as we are not in a scope of requests yet
+        const allowGlobalContext = this.config.get('allowGlobalContext');
+        this.config.set('allowGlobalContext', true);
         this.metadata = this.discovery.discoverSync();
         this.createEntityManager();
+        this.config.set('allowGlobalContext', allowGlobalContext);
     }
     createEntityManager() {
         this.driver.setMetadata(this.metadata);

package/metadata/MetadataDiscovery.js

@@ -367,11 +367,8 @@ export class MetadataDiscovery {
         }
     }
     initNullability(prop) {
-        if (prop.kind === ReferenceKind.MANY_TO_ONE) {
-            return Utils.defaultValue(prop, 'nullable', prop.optional || prop.cascade.includes(Cascade.REMOVE) || prop.cascade.includes(Cascade.ALL));
-        }
         if (prop.kind === ReferenceKind.ONE_TO_ONE) {
-            return Utils.defaultValue(prop, 'nullable', prop.optional || !prop.owner || prop.cascade.includes(Cascade.REMOVE) || prop.cascade.includes(Cascade.ALL));
+            return Utils.defaultValue(prop, 'nullable', prop.optional || !prop.owner);
         }
         return Utils.defaultValue(prop, 'nullable', prop.optional);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.45",
+  "version": "7.0.0-dev.47",
   "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",
@@ -54,7 +54,7 @@
     "dataloader": "2.2.3",
     "dotenv": "17.2.3",
     "esprima": "4.0.1",
-    "mikro-orm": "7.0.0-dev.45",
+    "mikro-orm": "7.0.0-dev.47",
     "reflect-metadata": "0.2.2",
     "tinyglobby": "0.2.13"
   }

package/utils/ConfigurationLoader.d.ts

@@ -33,7 +33,6 @@ export declare class ConfigurationLoader {
     static checkPackageVersion(): string;
 }
 export interface Settings {
-    alwaysAllowTs?: boolean;
     verbose?: boolean;
     preferTs?: boolean;
     tsLoader?: 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto';

package/utils/ConfigurationLoader.js

@@ -112,7 +112,6 @@ export class ConfigurationLoader {
         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.alwaysAllowTs = process.env.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS != null ? bool(process.env.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS) : settings.alwaysAllowTs;
         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;
@@ -120,14 +119,14 @@ export class ConfigurationLoader {
         return settings;
     }
     static getConfigPaths() {
-        const paths = [];
         const settings = ConfigurationLoader.getSettings();
+        const typeScriptSupport = settings.preferTs ?? Utils.detectTypeScriptSupport();
+        const paths = [];
         if (process.env.MIKRO_ORM_CLI_CONFIG) {
             paths.push(process.env.MIKRO_ORM_CLI_CONFIG);
         }
         paths.push(...(settings.configPaths || []));
-        const alwaysAllowTs = settings.alwaysAllowTs ?? process.versions.bun;
-        if (settings.preferTs !== false || alwaysAllowTs) {
+        if (typeScriptSupport) {
             paths.push('./src/mikro-orm.config.ts');
             paths.push('./mikro-orm.config.ts');
         }
@@ -137,9 +136,8 @@ export class ConfigurationLoader {
         const path = distDir ? 'dist' : (buildDir ? 'build' : 'src');
         paths.push(`./${path}/mikro-orm.config.js`);
         paths.push('./mikro-orm.config.js');
-        const typeScriptSupport = Utils.detectTypeScriptSupport();
         /* v8 ignore next */
-        return Utils.unique(paths).filter(p => p.endsWith('.js') || typeScriptSupport || alwaysAllowTs);
+        return Utils.unique(paths).filter(p => !p.match(/\.[mc]?ts$/) || typeScriptSupport);
     }
     static isESM() {
         const config = ConfigurationLoader.getPackageConfig();