@mikro-orm/mongodb 6.4.7-dev.0 → 7.0.0-dev.0

package/MongoConnection.d.ts

@@ -1,5 +1,5 @@
 import { MongoClient, type ClientSession, type Collection, type Db, type MongoClientOptions, type TransactionOptions } from 'mongodb';
-import { Connection, type AnyEntity, type Configuration, type ConnectionConfig, type ConnectionOptions, type ConnectionType, type EntityData, type EntityName, type FilterQuery, type IsolationLevel, type QueryOrderMap, type QueryResult, type Transaction, type TransactionEventBroadcaster, type UpsertOptions, type UpsertManyOptions, type LoggingOptions } from '@mikro-orm/core';
+import { Connection, type AnyEntity, type Configuration, type ConnectionOptions, type ConnectionType, type EntityData, type EntityName, type FilterQuery, type IsolationLevel, type QueryOrderMap, type QueryResult, type Transaction, type TransactionEventBroadcaster, type UpsertOptions, type UpsertManyOptions, type LoggingOptions } from '@mikro-orm/core';
 export declare class MongoConnection extends Connection {
     protected client: MongoClient;
     protected db: Db;
@@ -19,8 +19,7 @@ export declare class MongoConnection extends Connection {
     createCollection<T extends object>(name: EntityName<T>): Promise<Collection<T>>;
     listCollections(): Promise<string[]>;
     dropCollection(name: EntityName<AnyEntity>): Promise<boolean>;
-    getDefaultClientUrl(): string;
-    getConnectionOptions(): MongoClientOptions & ConnectionConfig;
+    mapOptions(overrides: MongoClientOptions): MongoClientOptions;
     getClientUrl(): string;
     getDb(): Db;
     execute(query: string): Promise<any>;

package/MongoConnection.js

@@ -20,14 +20,22 @@ class MongoConnection extends core_1.Connection {
         };
     }
     async connect() {
-        const driverOptions = this.config.get('driverOptions');
+        let driverOptions = this.options.driverOptions ?? this.config.get('driverOptions');
+        if (typeof driverOptions === 'function') {
+            driverOptions = await driverOptions();
+        }
         if (driverOptions instanceof mongodb_1.MongoClient) {
             this.logger.log('info', 'Reusing MongoClient provided via `driverOptions`');
             this.client = driverOptions;
         }
         else {
-            this.client = new mongodb_1.MongoClient(this.config.getClientUrl(), this.getConnectionOptions());
+            this.client = new mongodb_1.MongoClient(this.config.getClientUrl(), this.mapOptions(driverOptions));
             await this.client.connect();
+            const onCreateConnection = this.options.onCreateConnection ?? this.config.get('onCreateConnection');
+            /* istanbul ignore next */
+            this.client.on('connectionCreated', () => {
+                void onCreateConnection?.(this.client);
+            });
         }
         this.db = this.client.db(this.config.get('dbName'));
         this.connected = true;
@@ -72,10 +80,7 @@ class MongoConnection extends core_1.Connection {
     async dropCollection(name) {
         return this.db.dropCollection(this.getCollectionName(name));
     }
-    getDefaultClientUrl() {
-        return 'mongodb://127.0.0.1:27017';
-    }
-    getConnectionOptions() {
+    mapOptions(overrides) {
         const ret = {};
         const pool = this.config.get('pool');
         const username = this.config.get('user');
@@ -96,10 +101,10 @@ class MongoConnection extends core_1.Connection {
             name: 'MikroORM',
             version: core_1.Utils.getORMVersion(),
         };
-        return core_1.Utils.mergeConfig(ret, this.config.get('driverOptions'));
+        return core_1.Utils.mergeConfig(ret, overrides);
     }
     getClientUrl() {
-        const options = this.getConnectionOptions();
+        const options = this.mapOptions(this.options.driverOptions ?? {});
         const clientUrl = this.config.getClientUrl(true);
         const match = clientUrl.match(/^(\w+):\/\/((.*@.+)|.+)$/);
         return match ? `${match[1]}://${options.auth ? options.auth.username + ':*****@' : ''}${match[2]}` : clientUrl;

package/MongoPlatform.d.ts

@@ -27,4 +27,5 @@ export declare class MongoPlatform extends Platform {
     shouldHaveColumn<T>(prop: EntityProperty<T>, populate: PopulateOptions<T>[], exclude?: string[]): boolean;
     validateMetadata(meta: EntityMetadata): void;
     isAllowedTopLevelOperator(operator: string): boolean;
+    getDefaultClientUrl(): string;
 }

package/MongoPlatform.js

@@ -89,5 +89,8 @@ class MongoPlatform extends core_1.Platform {
     isAllowedTopLevelOperator(operator) {
         return ['$not', '$fulltext'].includes(operator);
     }
+    getDefaultClientUrl() {
+        return 'mongodb://127.0.0.1:27017';
+    }
 }
 exports.MongoPlatform = MongoPlatform;

package/README.md

@@ -183,7 +183,6 @@ yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-yarn add @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 
@@ -196,7 +195,6 @@ npm i -s @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 npm i -s @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 npm i -s @mikro-orm/core @mikro-orm/mssql         # for mssql
 npm i -s @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-npm i -s @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 npm i -s @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 

package/index.mjs

@@ -146,6 +146,7 @@ export const QueryHelper = mod.QueryHelper;
 export const QueryOperator = mod.QueryOperator;
 export const QueryOrder = mod.QueryOrder;
 export const QueryOrderNumeric = mod.QueryOrderNumeric;
+export const Raw = mod.Raw;
 export const RawQueryFragment = mod.RawQueryFragment;
 export const ReadOnlyException = mod.ReadOnlyException;
 export const Ref = mod.Ref;
@@ -193,6 +194,7 @@ export const equals = mod.equals;
 export const getOnConflictFields = mod.getOnConflictFields;
 export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
 export const helper = mod.helper;
+export const isRaw = mod.isRaw;
 export const parseJsonSafe = mod.parseJsonSafe;
 export const raw = mod.raw;
 export const ref = mod.ref;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mongodb",
-  "version": "6.4.7-dev.0",
+  "version": "7.0.0-dev.0",
   "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",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 18.12.0"
+    "node": ">= 22.11.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
@@ -62,9 +62,9 @@
     "mongodb": "6.13.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.6"
+    "@mikro-orm/core": "^6.4.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.0"
+    "@mikro-orm/core": "7.0.0-dev.0"
   }
 }