@opra/mongodb 1.0.0-beta.3 → 1.0.0-beta.4

package/cjs/mongo-entity-service.js

@@ -39,7 +39,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const r = await collection.insertOne(document, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /* istanbul ignore next */
         if (!r.insertedId) {
@@ -61,7 +61,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         return ((await collection.countDocuments(filter || {}, {
             ...options,
             limit: undefined,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         })) || 0);
     }
     /**
@@ -79,9 +79,10 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         ]);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        const session = options?.session ?? this.getSession();
         return (await collection.deleteOne(filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session,
         })).deletedCount;
     }
     /**
@@ -97,7 +98,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         return (await collection.deleteMany(filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         })).deletedCount;
     }
     /**
@@ -113,7 +114,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         return await collection.distinct(field, filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
     }
     /**
@@ -132,7 +133,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const out = await collection.findOne(filter || {}, {
             ...(0, lodash_omit_1.default)(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
             limit: undefined,
             skip: undefined,
@@ -155,7 +156,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const out = await collection.findOne(filter || {}, {
             ...(0, lodash_omit_1.default)(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             sort: options?.sort ? mongo_adapter_js_1.MongoAdapter.prepareSort(options.sort) : undefined,
             projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
             limit: undefined,
@@ -195,7 +196,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...(0, lodash_omit_1.default)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /** Execute db command */
         try {
@@ -253,7 +254,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...(0, lodash_omit_1.default)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /** Fetch the cursor and decode the result objects */
         try {
@@ -301,7 +302,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             ...options,
             returnDocument: 'after',
             includeResultMetadata: false,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
         });
         const outputCodec = this._getOutputCodec('update');
@@ -339,7 +340,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         return (await collection.updateOne(filter || {}, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         })).matchedCount;
     }
@@ -371,7 +372,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         return (await collection.updateMany(filter || {}, update, {
             ...(0, lodash_omit_1.default)(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: false,
         })).matchedCount;
     }

package/cjs/mongo-nested-service.js

@@ -123,7 +123,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         };
         const r = await collection.updateOne(docFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         if (!r.matchedCount) {
@@ -173,7 +173,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const n = await cursor.next();
@@ -223,7 +223,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const r = await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return r.modifiedCount ? 1 : 0;
@@ -273,7 +273,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return matchCount;
@@ -447,7 +447,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const outputCodec = this._getOutputCodec('find');
@@ -518,7 +518,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const facetResult = await cursor.toArray();
@@ -677,7 +677,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const collection = await this.getCollection(db);
         await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return count;

package/cjs/mongo-service.js

@@ -5,6 +5,7 @@ const common_1 = require("@opra/common");
 const core_1 = require("@opra/core");
 const mongodb_1 = require("mongodb");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const transactionKey = Symbol.for('transaction');
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -95,38 +96,43 @@ class MongoService extends core_1.ServiceBase {
      * @param [options] - Optional options for the transaction.
      */
     async withTransaction(callback, options) {
-        let session = this.getSession();
-        if (session)
-            return callback(session);
-        // Backup old session property
-        const hasOldSession = Object.prototype.hasOwnProperty.call(this, 'session');
-        const oldSessionGetter = hasOldSession ? this.session : undefined;
-        const db = this.getDatabase();
-        const client = db.client;
-        session = client.startSession();
-        this.session = session;
+        const ctx = this.context;
+        let closeSessionOnFinish = false;
+        let transaction = ctx[transactionKey];
+        let session;
+        if (transaction) {
+            session = transaction.session;
+        }
+        else {
+            const db = this.getDatabase();
+            const client = db.client;
+            session = client.startSession();
+            closeSessionOnFinish = true;
+            transaction = {
+                db,
+                session,
+            };
+            ctx[transactionKey] = transaction;
+        }
         const oldInTransaction = session.inTransaction();
         try {
             if (!oldInTransaction)
                 session.startTransaction(options);
-            const out = await callback(session);
-            if (!oldInTransaction)
+            const out = await callback(session, this);
+            if (!oldInTransaction && session.inTransaction())
                 await session.commitTransaction();
             return out;
         }
         catch (e) {
-            if (!oldInTransaction)
+            if (!oldInTransaction && session.inTransaction())
                 await session.abortTransaction();
             throw e;
         }
         finally {
-            // Restore old session property
-            if (hasOldSession)
-                this.session = oldSessionGetter;
-            else
-                delete this.session;
-            if (!oldInTransaction)
+            delete ctx[transactionKey];
+            if (closeSessionOnFinish) {
                 await session.endSession();
+            }
         }
     }
     /**
@@ -137,10 +143,14 @@ class MongoService extends core_1.ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getDatabase() {
+        const ctx = this.context;
+        const transaction = ctx[transactionKey];
+        if (transaction)
+            return transaction.db;
         const db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (!db)
-            throw new Error(`Database not set!`);
-        return db;
+        if (db)
+            return db;
+        throw new Error(`Database not set!`);
     }
     /**
      * Retrieves the database session.
@@ -150,7 +160,13 @@ class MongoService extends core_1.ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getSession() {
-        return typeof this.session === 'function' ? this.session(this) : this.session;
+        const ctx = this.context;
+        const transaction = ctx[transactionKey];
+        if (transaction)
+            return transaction.session;
+        const session = typeof this.session === 'function' ? this.session(this) : this.session;
+        if (session)
+            return session;
     }
     /**
      * Retrieves a MongoDB collection from the given database.

package/cjs/mongo-singleton-service.js

@@ -173,7 +173,7 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
         });
     }
     /**
-     * Updates a document in the MongoDB collection.
+     * Updates a document in the MongoDB collection
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
      * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.

package/esm/mongo-entity-service.js

@@ -35,7 +35,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         const r = await collection.insertOne(document, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /* istanbul ignore next */
         if (!r.insertedId) {
@@ -57,7 +57,7 @@ export class MongoEntityService extends MongoService {
         return ((await collection.countDocuments(filter || {}, {
             ...options,
             limit: undefined,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         })) || 0);
     }
     /**
@@ -75,9 +75,10 @@ export class MongoEntityService extends MongoService {
         ]);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        const session = options?.session ?? this.getSession();
         return (await collection.deleteOne(filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session,
         })).deletedCount;
     }
     /**
@@ -93,7 +94,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         return (await collection.deleteMany(filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         })).deletedCount;
     }
     /**
@@ -109,7 +110,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         return await collection.distinct(field, filter || {}, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
     }
     /**
@@ -128,7 +129,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         const out = await collection.findOne(filter || {}, {
             ...omit(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
             limit: undefined,
             skip: undefined,
@@ -151,7 +152,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         const out = await collection.findOne(filter || {}, {
             ...omit(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             sort: options?.sort ? MongoAdapter.prepareSort(options.sort) : undefined,
             projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
             limit: undefined,
@@ -191,7 +192,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...omit(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /** Execute db command */
         try {
@@ -249,7 +250,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...omit(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         /** Fetch the cursor and decode the result objects */
         try {
@@ -297,7 +298,7 @@ export class MongoEntityService extends MongoService {
             ...options,
             returnDocument: 'after',
             includeResultMetadata: false,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
         });
         const outputCodec = this._getOutputCodec('update');
@@ -335,7 +336,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         return (await collection.updateOne(filter || {}, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         })).matchedCount;
     }
@@ -367,7 +368,7 @@ export class MongoEntityService extends MongoService {
         const collection = await this.getCollection(db);
         return (await collection.updateMany(filter || {}, update, {
             ...omit(options, 'filter'),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: false,
         })).matchedCount;
     }

package/esm/mongo-nested-service.js

@@ -119,7 +119,7 @@ export class MongoNestedService extends MongoService {
         };
         const r = await collection.updateOne(docFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         if (!r.matchedCount) {
@@ -169,7 +169,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const n = await cursor.next();
@@ -219,7 +219,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         const r = await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return r.modifiedCount ? 1 : 0;
@@ -269,7 +269,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return matchCount;
@@ -443,7 +443,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const outputCodec = this._getOutputCodec('find');
@@ -514,7 +514,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
             ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
         });
         try {
             const facetResult = await cursor.toArray();
@@ -673,7 +673,7 @@ export class MongoNestedService extends MongoService {
         const collection = await this.getCollection(db);
         await collection.updateOne(matchFilter, update, {
             ...options,
-            session: options?.session || this.getSession(),
+            session: options?.session ?? this.getSession(),
             upsert: undefined,
         });
         return count;

package/esm/mongo-service.js

@@ -2,6 +2,7 @@ import { DATATYPE_METADATA } from '@opra/common';
 import { ServiceBase } from '@opra/core';
 import { ObjectId } from 'mongodb';
 import { MongoAdapter } from './mongo-adapter.js';
+const transactionKey = Symbol.for('transaction');
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -92,38 +93,43 @@ export class MongoService extends ServiceBase {
      * @param [options] - Optional options for the transaction.
      */
     async withTransaction(callback, options) {
-        let session = this.getSession();
-        if (session)
-            return callback(session);
-        // Backup old session property
-        const hasOldSession = Object.prototype.hasOwnProperty.call(this, 'session');
-        const oldSessionGetter = hasOldSession ? this.session : undefined;
-        const db = this.getDatabase();
-        const client = db.client;
-        session = client.startSession();
-        this.session = session;
+        const ctx = this.context;
+        let closeSessionOnFinish = false;
+        let transaction = ctx[transactionKey];
+        let session;
+        if (transaction) {
+            session = transaction.session;
+        }
+        else {
+            const db = this.getDatabase();
+            const client = db.client;
+            session = client.startSession();
+            closeSessionOnFinish = true;
+            transaction = {
+                db,
+                session,
+            };
+            ctx[transactionKey] = transaction;
+        }
         const oldInTransaction = session.inTransaction();
         try {
             if (!oldInTransaction)
                 session.startTransaction(options);
-            const out = await callback(session);
-            if (!oldInTransaction)
+            const out = await callback(session, this);
+            if (!oldInTransaction && session.inTransaction())
                 await session.commitTransaction();
             return out;
         }
         catch (e) {
-            if (!oldInTransaction)
+            if (!oldInTransaction && session.inTransaction())
                 await session.abortTransaction();
             throw e;
         }
         finally {
-            // Restore old session property
-            if (hasOldSession)
-                this.session = oldSessionGetter;
-            else
-                delete this.session;
-            if (!oldInTransaction)
+            delete ctx[transactionKey];
+            if (closeSessionOnFinish) {
                 await session.endSession();
+            }
         }
     }
     /**
@@ -134,10 +140,14 @@ export class MongoService extends ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getDatabase() {
+        const ctx = this.context;
+        const transaction = ctx[transactionKey];
+        if (transaction)
+            return transaction.db;
         const db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (!db)
-            throw new Error(`Database not set!`);
-        return db;
+        if (db)
+            return db;
+        throw new Error(`Database not set!`);
     }
     /**
      * Retrieves the database session.
@@ -147,7 +157,13 @@ export class MongoService extends ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getSession() {
-        return typeof this.session === 'function' ? this.session(this) : this.session;
+        const ctx = this.context;
+        const transaction = ctx[transactionKey];
+        if (transaction)
+            return transaction.session;
+        const session = typeof this.session === 'function' ? this.session(this) : this.session;
+        if (session)
+            return session;
     }
     /**
      * Retrieves a MongoDB collection from the given database.

package/esm/mongo-singleton-service.js

@@ -169,7 +169,7 @@ export class MongoSingletonService extends MongoEntityService {
         });
     }
     /**
-     * Updates a document in the MongoDB collection.
+     * Updates a document in the MongoDB collection
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
      * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "valgen": "^5.10.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.0.0-beta.3",
-    "@opra/core": "^1.0.0-beta.3",
-    "@opra/http": "^1.0.0-beta.3",
+    "@opra/common": "^1.0.0-beta.4",
+    "@opra/core": "^1.0.0-beta.4",
+    "@opra/http": "^1.0.0-beta.4",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

package/types/mongo-adapter.d.ts

@@ -1,6 +1,6 @@
 import { OpraFilter } from '@opra/common';
 import type { ExecutionContext } from '@opra/core';
-import mongodb, { ClientSession, ObjectId } from 'mongodb';
+import mongodb, { ObjectId } from 'mongodb';
 import _prepareFilter from './adapter-utils/prepare-filter.js';
 import _prepareKeyValues from './adapter-utils/prepare-key-values.js';
 import _preparePatch from './adapter-utils/prepare-patch.js';
@@ -9,7 +9,6 @@ import _prepareSort from './adapter-utils/prepare-sort.js';
 export declare namespace MongoAdapter {
     type AnyId = string | number | ObjectId;
     type FilterInput<T = any> = OpraFilter.Expression | mongodb.Filter<T> | string | undefined;
-    type WithTransactionCallback = (session: ClientSession) => any;
     const prepareFilter: typeof _prepareFilter;
     const prepareKeyValues: typeof _prepareKeyValues;
     const preparePatch: typeof _preparePatch;

package/types/mongo-service.d.ts

@@ -1,6 +1,6 @@
 import { ComplexType } from '@opra/common';
 import { ExecutionContext, ServiceBase } from '@opra/core';
-import mongodb, { type Document, type TransactionOptions } from 'mongodb';
+import mongodb, { ClientSession, type Document, type TransactionOptions } from 'mongodb';
 import type { Nullish, StrictOmit, Type } from 'ts-gems';
 import type { IsObject } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
@@ -188,7 +188,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @constructor
      */
     constructor(dataType: Type | string, options?: MongoService.Options);
-    for<C extends ExecutionContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
+    for<C extends ExecutionContext, P extends Partial<this>>(context: C | ServiceBase, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
     /**
      * Retrieves the collection name.
      *
@@ -217,7 +217,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @param callback - The function to be executed within the transaction.
      * @param [options] - Optional options for the transaction.
      */
-    withTransaction(callback: MongoAdapter.WithTransactionCallback, options?: TransactionOptions): Promise<any>;
+    withTransaction(callback: (session: ClientSession, _this: this) => any, options?: TransactionOptions): Promise<any>;
     /**
      * Retrieves the database connection.
      *

package/types/mongo-singleton-service.d.ts

@@ -91,12 +91,12 @@ export declare class MongoSingletonService<T extends mongodb.Document> extends M
      *
      * @param {MongoEntityService.FindOneOptions<T>} options - The options to customize the query.
      * @return {Promise<PartialDTO<T>>} - A promise that resolves to the fetched document.
-     * @throws {ResourceNotAvailableError} - If the document is not found in the collection.
+     * @throws {ResourceNotAvailableError} - If the document is not found in the collection
      */
     get(options: RequiredSome<MongoEntityService.FindOneOptions<T>, 'projection'>): Promise<PartialDTO<T>>;
     get(options?: MongoEntityService.FindOneOptions<T>): Promise<T>;
     /**
-     * Updates a document in the MongoDB collection.
+     * Updates a document in the MongoDB collection
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
      * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
@@ -106,7 +106,7 @@ export declare class MongoSingletonService<T extends mongodb.Document> extends M
     update(input: PatchDTO<T> | UpdateFilter<T>, options: RequiredSome<MongoEntityService.UpdateOneOptions<T>, 'projection'>): Promise<PartialDTO<T> | undefined>;
     update(input: PatchDTO<T> | UpdateFilter<T>, options?: MongoEntityService.UpdateOneOptions<T>): Promise<T | undefined>;
     /**
-     * Updates a document in the MongoDB collection.
+     * Updates a document in the MongoDB collection
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
      * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.