@mikro-orm/mongodb 7.0.0-dev.97 → 7.0.0-dev.99

package/MongoConnection.d.ts

@@ -1,12 +1,12 @@
 import { type ClientSession, type Collection, type Db, MongoClient, type MongoClientOptions, type TransactionOptions } from 'mongodb';
 import { type AnyEntity, type Configuration, Connection, type ConnectionOptions, type ConnectionType, type EntityData, type EntityName, type FilterQuery, type IsolationLevel, type LoggingOptions, type QueryOrderMap, type QueryResult, type Transaction, type TransactionEventBroadcaster, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
 export declare class MongoConnection extends Connection {
-    protected client: MongoClient;
-    protected db: Db;
+    #private;
     constructor(config: Configuration, options?: ConnectionOptions, type?: ConnectionType);
     connect(options?: {
         skipOnConnect?: boolean;
     }): Promise<void>;
+    createClient(): void;
     close(force?: boolean): Promise<void>;
     isConnected(): Promise<boolean>;
     checkConnection(): Promise<{

package/MongoConnection.js

@@ -1,8 +1,8 @@
 import { MongoClient, ObjectId, } from 'mongodb';
 import { Connection, EventType, QueryOrder, Utils, ValidationError, inspect, } from '@mikro-orm/core';
 export class MongoConnection extends Connection {
-    client;
-    db;
+    #client;
+    #db;
     constructor(config, options, type = 'write') {
         super(config, options, type);
         // @ts-ignore
@@ -15,37 +15,40 @@ export class MongoConnection extends Connection {
         };
     }
     async connect(options) {
+        this.getClient();
+        this.connected = true;
+        if (options?.skipOnConnect !== true) {
+            await this.onConnect();
+        }
+    }
+    createClient() {
         let driverOptions = this.options.driverOptions ?? this.config.get('driverOptions');
         if (typeof driverOptions === 'function') {
-            driverOptions = await driverOptions();
+            driverOptions = driverOptions();
         }
         if (driverOptions instanceof MongoClient) {
             this.logger.log('info', 'Reusing MongoClient provided via `driverOptions`');
-            this.client = driverOptions;
+            this.#client = driverOptions;
         }
         else {
-            this.client = new MongoClient(this.config.get('clientUrl'), this.mapOptions(driverOptions));
-            await this.client.connect();
+            this.#client = new MongoClient(this.config.get('clientUrl'), this.mapOptions(driverOptions));
             const onCreateConnection = this.options.onCreateConnection ?? this.config.get('onCreateConnection');
             /* v8 ignore next */
-            this.client.on('connectionCreated', () => {
-                void onCreateConnection?.(this.client);
+            this.#client.on('connectionCreated', () => {
+                void onCreateConnection?.(this.#client);
             });
         }
-        this.db = this.client.db(this.config.get('dbName'));
-        this.connected = true;
-        if (options?.skipOnConnect !== true) {
-            await this.onConnect();
-        }
+        this.#db = this.#client.db(this.config.get('dbName'));
     }
     async close(force) {
-        await this.client?.close(force);
+        await this.#client?.close(force);
         this.connected = false;
+        this.#client = undefined;
     }
     async isConnected() {
         try {
-            const res = await this.db?.command({ ping: 1 });
-            return this.connected = !!res.ok;
+            const res = await this.#db?.command({ ping: 1 });
+            return this.connected = !!res?.ok;
         }
         catch (error) {
             return this.connected = false;
@@ -53,8 +56,8 @@ export class MongoConnection extends Connection {
     }
     async checkConnection() {
         try {
-            const res = await this.db?.command({ ping: 1 });
-            return res.ok
+            const res = await this.#db?.command({ ping: 1 });
+            return res?.ok
                 ? { ok: true }
                 : { ok: false, reason: 'Ping reply does not feature "ok" property, or it evaluates to "false"' };
         }
@@ -63,20 +66,23 @@ export class MongoConnection extends Connection {
         }
     }
     getClient() {
-        return this.client;
+        if (!this.#client) {
+            this.createClient();
+        }
+        return this.#client;
     }
     getCollection(name) {
-        return this.db.collection(this.getCollectionName(name));
+        return this.getDb().collection(this.getCollectionName(name));
     }
     async createCollection(name) {
-        return this.db.createCollection(this.getCollectionName(name));
+        return this.getDb().createCollection(this.getCollectionName(name));
     }
     async listCollections() {
-        const collections = await this.db.listCollections({}, { nameOnly: true }).toArray();
+        const collections = await this.getDb().listCollections({}, { nameOnly: true }).toArray();
         return collections.map(c => c.name);
     }
     async dropCollection(name) {
-        return this.db.dropCollection(this.getCollectionName(name));
+        return this.getDb().dropCollection(this.getCollectionName(name));
     }
     mapOptions(overrides) {
         const ret = {};
@@ -99,7 +105,8 @@ export class MongoConnection extends Connection {
         return Utils.mergeConfig(ret, overrides);
     }
     getDb() {
-        return this.db;
+        this.#db ??= this.getClient().db(this.config.get('dbName'));
+        return this.#db;
     }
     async execute(query) {
         throw new Error(`${this.constructor.name} does not support generic execute method`);
@@ -210,7 +217,7 @@ export class MongoConnection extends Connection {
         if (!ctx) {
             await eventBroadcaster?.dispatchEvent(EventType.beforeTransactionStart);
         }
-        const session = ctx || this.client.startSession();
+        const session = ctx || this.getClient().startSession();
         session.startTransaction(txOptions);
         this.logQuery('db.begin();');
         await eventBroadcaster?.dispatchEvent(EventType.afterTransactionStart, session);

package/MongoDriver.d.ts

@@ -1,8 +1,9 @@
 import { type ClientSession } from 'mongodb';
-import { type Configuration, type CountOptions, DatabaseDriver, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityName, type FilterQuery, type FindOneOptions, type FindOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type PopulateOptions, type PopulatePath, type QueryResult, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
+import { type Configuration, type Constructor, type CountOptions, DatabaseDriver, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityName, type FilterQuery, type FindOneOptions, type FindOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type PopulateOptions, type PopulatePath, type QueryResult, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
 import { MongoConnection } from './MongoConnection.js';
 import { MongoPlatform } from './MongoPlatform.js';
 import { MongoEntityManager } from './MongoEntityManager.js';
+import { MongoMikroORM } from './MongoMikroORM.js';
 export declare class MongoDriver extends DatabaseDriver<MongoConnection> {
     [EntityManagerType]: MongoEntityManager<this>;
     protected readonly connection: MongoConnection;
@@ -32,4 +33,6 @@ export declare class MongoDriver extends DatabaseDriver<MongoConnection> {
     private buildFilterById;
     protected buildFields<T extends object, P extends string = never>(entityName: string, populate: PopulateOptions<T>[], fields?: readonly EntityField<T, P>[], exclude?: string[]): string[] | undefined;
     private handleVersionProperty;
+    /** @inheritDoc */
+    getORMClass(): Constructor<MongoMikroORM>;
 }

package/MongoDriver.js

@@ -3,6 +3,7 @@ import { DatabaseDriver, EntityManagerType, GroupOperator, ReferenceKind, Utils,
 import { MongoConnection } from './MongoConnection.js';
 import { MongoPlatform } from './MongoPlatform.js';
 import { MongoEntityManager } from './MongoEntityManager.js';
+import { MongoMikroORM } from './MongoMikroORM.js';
 export class MongoDriver extends DatabaseDriver {
     [EntityManagerType];
     connection = new MongoConnection(this.config);
@@ -360,4 +361,8 @@ export class MongoDriver extends DatabaseDriver {
             data[versionProperty.name] ??= update ? { $inc: 1 } : 1;
         }
     }
+    /** @inheritDoc */
+    getORMClass() {
+        return MongoMikroORM;
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/mongodb",
   "type": "module",
-  "version": "7.0.0-dev.97",
+  "version": "7.0.0-dev.99",
   "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",
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.97"
+    "@mikro-orm/core": "7.0.0-dev.99"
   }
 }