@opra/mongodb 1.0.0-alpha.17 → 1.0.0-alpha.19

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

@@ -1,6 +1,5 @@
 import mongodb from 'mongodb';
-import { PartialDTO, PatchDTO, Type } from 'ts-gems';
-import { MongoAdapter } from './mongo-adapter.js';
+import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { MongoService } from './mongo-service.js';
 /**
  *
@@ -27,14 +26,57 @@ export declare namespace MongoEntityService {
     }
     interface DistinctOptions<T> extends MongoService.DistinctOptions<T> {
     }
+    interface ExistsOptions<T> extends MongoService.ExistsOptions<T> {
+    }
     interface FindOneOptions<T> extends MongoService.FindOneOptions<T> {
     }
     interface FindManyOptions<T> extends MongoService.FindManyOptions<T> {
     }
-    interface UpdateOptions<T> extends MongoService.UpdateOptions<T> {
+    interface UpdateOneOptions<T> extends MongoService.UpdateOneOptions<T> {
     }
     interface UpdateManyOptions<T> extends MongoService.UpdateManyOptions<T> {
     }
+    interface CreateCommand extends StrictOmit<RequiredSome<CommandInfo, 'input'>, 'documentId' | 'nestedId'> {
+        crud: 'create';
+        options?: CreateOptions;
+    }
+    interface CountCommand<T> extends StrictOmit<CommandInfo, 'documentId' | 'nestedId' | 'input'> {
+        crud: 'read';
+        options?: CountOptions<T>;
+    }
+    interface DeleteCommand<T> extends StrictOmit<CommandInfo, 'nestedId' | 'input'> {
+        crud: 'delete';
+        options?: DeleteOptions<T>;
+    }
+    interface DistinctCommand<T> extends StrictOmit<CommandInfo, 'documentId' | 'nestedId' | 'input'> {
+        crud: 'read';
+        field: string;
+        options?: DistinctOptions<T>;
+    }
+    interface ExistsCommand<T> extends StrictOmit<CommandInfo, 'nestedId' | 'input'> {
+        crud: 'read';
+        options?: ExistsOptions<T>;
+    }
+    interface FindOneCommand<T> extends StrictOmit<CommandInfo, 'nestedId' | 'input'> {
+        crud: 'read';
+        options?: FindOneOptions<T>;
+    }
+    interface FindManyCommand<T> extends StrictOmit<CommandInfo, 'nestedId' | 'input'> {
+        crud: 'read';
+        options?: FindManyOptions<T>;
+    }
+    interface UpdateOneCommand<T> extends StrictOmit<CommandInfo, 'nestedId'> {
+        crud: 'update';
+        input?: PatchDTO<T>;
+        inputRaw?: mongodb.UpdateFilter<T>;
+        options?: UpdateOneOptions<T>;
+    }
+    interface UpdateManyCommand<T> extends StrictOmit<CommandInfo, 'nestedId'> {
+        crud: 'update';
+        input?: PatchDTO<T>;
+        inputRaw?: mongodb.UpdateFilter<T>;
+        options?: UpdateManyOptions<T>;
+    }
 }
 /**
  * @class MongoEntityService
@@ -52,98 +94,82 @@ export declare class MongoEntityService<T extends mongodb.Document> extends Mong
     /**
      * Creates a new document in the MongoDB collection.
      *
-     * @param {PartialDTO<T>} input
-     * @param {MongoEntityService.CreateOptions} options
+     * @param {MongoEntityService.CreateCommand} command
      * @protected
      */
-    protected _create(input: PartialDTO<T>, options?: MongoEntityService.CreateOptions): Promise<PartialDTO<T>>;
+    protected _create(command: MongoEntityService.CreateCommand): Promise<PartialDTO<T>>;
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
-     * @param {MongoEntityService.CountOptions<T>} options - The options for the count operation.
-     * @return {Promise<number>} - A promise that resolves to the count of documents in the collection.
+     * @param {MongoEntityService.CountCommand<T>} command
+     * @protected
      */
-    protected _count(options?: MongoEntityService.CountOptions<T>): Promise<number>;
+    protected _count(command: MongoEntityService.CountCommand<T>): Promise<number>;
     /**
      * Deletes a document from the collection.
      *
-     * @param {MongoAdapter.AnyId} id - The ID of the document to delete.
-     * @param {MongoEntityService.DeleteOptions<T>} [options] - Optional delete options.
-     * @return {Promise<number>} - A Promise that resolves to the number of documents deleted.
+     * @param {MongoEntityService.DeleteCommand<T>} command
+     * @protected
      */
-    protected _delete(id: MongoAdapter.AnyId, options?: MongoEntityService.DeleteOptions<T>): Promise<number>;
+    protected _delete(command: MongoEntityService.DeleteCommand<T>): Promise<number>;
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
      *
-     * @param {MongoEntityService.DeleteManyOptions<T>} options - The options for the delete operation.
-     * @return {Promise<number>} - A promise that resolves to the number of documents deleted.
+     * @param {MongoEntityService.DeleteCommand<T>} command
+     * @protected
      */
-    protected _deleteMany(options?: MongoEntityService.DeleteManyOptions<T>): Promise<number>;
+    protected _deleteMany(command: MongoEntityService.DeleteCommand<T>): Promise<number>;
     /**
      * The distinct command returns a list of distinct values for the given key across a collection.
-     * @param {string} field
-     * @param {MongoEntityService.DistinctOptions<T>} options
+     *
+     * @param {MongoEntityService.DistinctCommand<T>} command
      * @protected
      */
-    protected _distinct(field: string, options?: MongoEntityService.DistinctOptions<T>): Promise<any[]>;
+    protected _distinct(command: MongoEntityService.DistinctCommand<T>): Promise<any[]>;
     /**
      * Finds a document by its ID.
      *
-     * @param {MongoAdapter.AnyId} id - The ID of the document.
-     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for the find query.
-     * @return {Promise<PartialDTO<T | undefined>>} - A promise resolving to the found document, or undefined if not found.
+     * @param { MongoEntityService.FindOneCommand<T>} command
      */
-    protected _findById(id: MongoAdapter.AnyId, options?: MongoEntityService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
+    protected _findById(command: MongoEntityService.FindOneCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Finds a document in the collection that matches the specified options.
      *
-     * @param {MongoEntityService.FindOneOptions} [options] - The options for the query.
-     * @return {Promise<PartialDTO<T> | undefined>} A promise that resolves with the found document or undefined if no document is found.
+     * @param {MongoEntityService.FindOneCommand<T>} command
      */
-    protected _findOne(options?: MongoEntityService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
+    protected _findOne(command: MongoEntityService.FindOneCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Finds multiple documents in the MongoDB collection.
      *
-     * @param {MongoEntityService.FindManyOptions<T>} [options] - The options for the find operation.
-     * @return A Promise that resolves to an array of partial outputs of type T.
+     * @param {MongoEntityService.FindManyCommand<T>} command
      */
-    protected _findMany(options?: MongoEntityService.FindManyOptions<T>): Promise<PartialDTO<T>[]>;
+    protected _findMany(command: MongoEntityService.FindManyCommand<T>): Promise<PartialDTO<T>[]>;
     /**
      * Finds multiple documents in the collection and returns both records (max limit)
      * and total count that matched the given criteria
      *
-     * @param {MongoEntityService.FindManyOptions<T>} [options] - The options for the find operation.
-     * @return A Promise that resolves to an array of partial outputs of type T.
+     * @param {MongoEntityService.FindManyCommand<T>} command
      */
-    protected _findManyWithCount(options?: MongoEntityService.FindManyOptions<T>): Promise<{
+    protected _findManyWithCount(command: MongoEntityService.FindManyCommand<T>): Promise<{
         count: number;
         items: PartialDTO<T>[];
     }>;
     /**
      * Updates a document with the given id in the collection.
      *
-     * @param {AnyId} id - The id of the document to update.
-     * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input object containing the fields to update.
-     * @param {MongoEntityService.UpdateOptions<T>} [options] - The options for the update operation.
-     * @returns {Promise<PartialDTO<T> | undefined>} A promise that resolves to the updated document or
-     * undefined if the document was not found.
+     * @param {MongoEntityService.UpdateOneCommand<T>} command
      */
-    protected _update(id: MongoAdapter.AnyId, input: PatchDTO<T> | mongodb.UpdateFilter<T>, options?: MongoEntityService.UpdateOptions<T>): Promise<PartialDTO<T> | undefined>;
+    protected _update(command: MongoEntityService.UpdateOneCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Updates a document in the collection with the specified ID.
      *
-     * @param {MongoAdapter.AnyId} id - The ID of the document to update.
-     * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input data to update the document with.
-     * @param {MongoEntityService.UpdateOptions<T>} [options] - The options for updating the document.
-     * @returns {Promise<number>} - A promise that resolves to the number of documents modified.
+     * @param {MongoEntityService.UpdateOneCommand<T>} command
      */
-    protected _updateOnly(id: MongoAdapter.AnyId, input: PatchDTO<T> | mongodb.UpdateFilter<T>, options?: MongoEntityService.UpdateOptions<T>): Promise<number>;
+    protected _updateOnly(command: MongoEntityService.UpdateOneCommand<T>): Promise<number>;
     /**
      * Updates multiple documents in the collection based on the specified input and options.
      *
-     * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input to update the documents with.
-     * @param {MongoEntityService.UpdateManyOptions<T>} [options] - The options for updating the documents.
-     * @return {Promise<number>} - A promise that resolves to the number of documents matched and modified.
+     * @param {MongoEntityService.UpdateManyCommand<T>} command
      */
-    protected _updateMany(input: PatchDTO<T> | mongodb.UpdateFilter<T>, options?: MongoEntityService.UpdateManyOptions<T>): Promise<number>;
+    protected _updateMany(command: MongoEntityService.UpdateManyCommand<T>): Promise<number>;
 }

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

@@ -1,8 +1,7 @@
 import { ComplexType } from '@opra/common';
 import mongodb from 'mongodb';
-import { PartialDTO, PatchDTO, Type } from 'ts-gems';
+import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { MongoAdapter } from './mongo-adapter.js';
-import { MongoCollectionService } from './mongo-collection-service.js';
 import { MongoService } from './mongo-service.js';
 import FilterInput = MongoAdapter.FilterInput;
 /**
@@ -16,7 +15,9 @@ export declare namespace MongoNestedService {
     interface Options extends MongoService.Options {
         defaultLimit?: number;
         nestedKey?: string;
-        $nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
+        nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
+    }
+    interface CommandInfo extends MongoService.CommandInfo {
     }
     interface CreateOptions extends MongoService.CreateOptions {
     }
@@ -40,13 +41,47 @@ export declare namespace MongoNestedService {
         documentFilter?: FilterInput;
         nestedFilter?: FilterInput;
     }
-    interface UpdateOptions<T> extends MongoService.UpdateOptions<T> {
+    interface UpdateOneOptions<T> extends MongoService.UpdateOneOptions<T> {
         documentFilter?: FilterInput;
     }
     interface UpdateManyOptions<T> extends MongoService.UpdateManyOptions<T> {
         documentFilter?: FilterInput;
         count?: boolean;
     }
+    interface CreateCommand extends RequiredSome<CommandInfo, 'documentId' | 'input'> {
+        crud: 'create';
+        options?: CreateOptions;
+    }
+    interface CountCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'documentId'>, 'nestedId' | 'input'> {
+        crud: 'read';
+        options?: CountOptions<T>;
+    }
+    interface DeleteCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'documentId'>, 'input'> {
+        crud: 'delete';
+        options?: DeleteOptions<T>;
+    }
+    interface ExistsCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'documentId'>, 'input'> {
+        crud: 'read';
+        options?: ExistsOptions<T>;
+    }
+    interface FindOneCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'documentId'>, 'input'> {
+        crud: 'read';
+        options?: FindOneOptions<T>;
+    }
+    interface FindManyCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'documentId'>, 'input'> {
+        crud: 'read';
+        options?: FindManyOptions<T>;
+    }
+    interface UpdateOneCommand<T> extends RequiredSome<CommandInfo, 'documentId'> {
+        crud: 'update';
+        input: PatchDTO<T> | mongodb.UpdateFilter<T>;
+        options?: MongoNestedService.UpdateOneOptions<T>;
+    }
+    interface UpdateManyCommand<T> extends RequiredSome<CommandInfo, 'documentId'> {
+        crud: 'update';
+        input: PatchDTO<T> | mongodb.UpdateFilter<T>;
+        options?: MongoNestedService.UpdateManyOptions<T>;
+    }
 }
 /**
  * A class that provides methods to perform operations on an array field in a MongoDB collection.
@@ -77,7 +112,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      *
      * @type {FilterInput | Function}
      */
-    $nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
+    nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
     /**
      * Constructs a new instance
      *
@@ -115,7 +150,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @throws {ResourceNotAvailableError} - If the parent document is not found.
      */
     create(documentId: MongoAdapter.AnyId, input: PartialDTO<T>, options?: MongoNestedService.CreateOptions): Promise<PartialDTO<T>>;
-    protected _create(documentId: MongoAdapter.AnyId, input: PartialDTO<T>, options?: MongoNestedService.CreateOptions): Promise<PartialDTO<T>>;
+    protected _create(command: MongoNestedService.CreateCommand): Promise<PartialDTO<T>>;
     /**
      * Counts the number of documents in the collection that match the specified parentId and options.
      *
@@ -124,7 +159,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<number>} - A promise that resolves to the count of documents.
      */
     count(documentId: MongoAdapter.AnyId, options?: MongoNestedService.CountOptions<T>): Promise<number>;
-    protected _count(documentId: MongoAdapter.AnyId, options?: MongoNestedService.CountOptions<T>): Promise<number>;
+    protected _count(command: MongoNestedService.CountCommand<T>): Promise<number>;
     /**
      * Deletes an element from an array within a document in the MongoDB collection.
      *
@@ -134,7 +169,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @return {Promise<number>} - A Promise that resolves to the number of elements deleted (1 if successful, 0 if not).
      */
     delete(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, options?: MongoNestedService.DeleteOptions<T>): Promise<number>;
-    protected _delete(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, options?: MongoNestedService.DeleteOptions<T>): Promise<number>;
+    protected _delete(command: MongoNestedService.DeleteCommand<T>): Promise<number>;
     /**
      * Deletes multiple items from a collection based on the parent ID and optional filter.
      *
@@ -143,7 +178,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<number>} - A Promise that resolves to the number of items deleted.
      */
     deleteMany(documentId: MongoAdapter.AnyId, options?: MongoNestedService.DeleteManyOptions<T>): Promise<number>;
-    protected _deleteMany(documentId: MongoAdapter.AnyId, options?: MongoNestedService.DeleteManyOptions<T>): Promise<number>;
+    protected _deleteMany(command: MongoNestedService.DeleteCommand<T>): Promise<number>;
     /**
      * Checks if an array element with the given parentId and id exists.
      *
@@ -160,7 +195,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @param {MongoNestedService.ExistsOneOptions} [options] - The options for the query (optional).
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the object exists or not.
      */
-    existsOne(documentId: MongoAdapter.AnyId, options?: MongoCollectionService.ExistsOneOptions<T>): Promise<boolean>;
+    existsOne(documentId: MongoAdapter.AnyId, options?: MongoNestedService.ExistsOneOptions<T>): Promise<boolean>;
     /**
      * Finds an element in array field by its parent ID and ID.
      *
@@ -170,7 +205,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the found document or undefined if not found.
      */
     findById(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, options?: MongoNestedService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
-    protected _findById(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, options?: MongoNestedService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
+    protected _findById(command: MongoNestedService.FindOneCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Finds the first array element that matches the given parentId.
      *
@@ -179,7 +214,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<PartialDTO<T> | undefined>} A promise that resolves to the first matching document, or `undefined` if no match is found.
      */
     findOne(documentId: MongoAdapter.AnyId, options?: MongoNestedService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
-    protected _findOne(documentId: MongoAdapter.AnyId, options?: MongoNestedService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
+    protected _findOne(command: MongoNestedService.FindOneCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Finds multiple elements in an array field.
      *
@@ -188,7 +223,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<PartialDTO<T>[]>} - The found documents.
      */
     findMany(documentId: MongoAdapter.AnyId, options?: MongoNestedService.FindManyOptions<T>): Promise<PartialDTO<T>[]>;
-    protected _findMany(documentId: MongoAdapter.AnyId, options: MongoNestedService.FindManyOptions<T>): Promise<PartialDTO<T>[]>;
+    protected _findMany(command: MongoNestedService.FindManyCommand<T>): Promise<PartialDTO<T>[]>;
     /**
      * Finds multiple elements in an array field.
      *
@@ -200,7 +235,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
         count: number;
         items: PartialDTO<T>[];
     }>;
-    protected _findManyWithCount(documentId: MongoAdapter.AnyId, options: MongoNestedService.FindManyOptions<T>): Promise<{
+    protected _findManyWithCount(command: MongoNestedService.FindManyCommand<T>): Promise<{
         count: number;
         items: PartialDTO<T>[];
     }>;
@@ -220,22 +255,22 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @param {AnyId} documentId - The ID of the document to update.
      * @param {AnyId} nestedId - The ID of the item to update within the document.
      * @param {PatchDTO<T>} input - The new data to update the item with.
-     * @param {MongoNestedService.UpdateOptions<T>} [options] - Additional update options.
+     * @param {MongoNestedService.UpdateOneOptions<T>} [options] - Additional update options.
      * @returns {Promise<PartialDTO<T> | undefined>} The updated item or undefined if it does not exist.
      * @throws {Error} If an error occurs while updating the item.
      */
-    update(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateOptions<T>): Promise<PartialDTO<T> | undefined>;
+    update(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateOneOptions<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Update an array element with new data. Returns 1 if document updated 0 otherwise.
      *
      * @param {MongoAdapter.AnyId} documentId - The ID of the parent document.
      * @param {MongoAdapter.AnyId} nestedId - The ID of the document to update.
      * @param {PatchDTO<T>} input - The partial input object containing the fields to update.
-     * @param {MongoNestedService.UpdateOptions<T>} [options] - Optional update options.
+     * @param {MongoNestedService.UpdateOneOptions<T>} [options] - Optional update options.
      * @returns {Promise<number>} - A promise that resolves to the number of elements updated.
      */
-    updateOnly(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateOptions<T>): Promise<number>;
-    protected _updateOnly(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateOptions<T>): Promise<number>;
+    updateOnly(documentId: MongoAdapter.AnyId, nestedId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateOneOptions<T>): Promise<number>;
+    protected _updateOnly(command: MongoNestedService.UpdateOneCommand<T>): Promise<number>;
     /**
      * Updates multiple array elements in document
      *
@@ -245,7 +280,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * @returns {Promise<number>} - A promise that resolves to the number of documents updated.
      */
     updateMany(documentId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateManyOptions<T>): Promise<number>;
-    protected _updateMany(documentId: MongoAdapter.AnyId, input: PatchDTO<T>, options?: MongoNestedService.UpdateManyOptions<T>): Promise<number>;
+    protected _updateMany(command: MongoNestedService.UpdateManyCommand<T>): Promise<number>;
     /**
      * Retrieves the common filter used for querying array elements.
      * This method is mostly used for security issues like securing multi-tenant applications.

package/types/mongo-service.d.ts

@@ -14,12 +14,12 @@ export declare namespace MongoService {
     interface Options {
         db?: MongoService<any>['db'];
         session?: MongoService<any>['session'];
-        collectionName?: MongoService<any>['$collectionName'];
-        resourceName?: MongoService<any>['$resourceName'];
-        documentFilter?: MongoService<any>['$documentFilter'];
-        interceptor?: MongoService<any>['$interceptor'];
-        idGenerator?: MongoService<any>['$idGenerator'];
-        onError?: MongoService<any>['$onError'];
+        collectionName?: MongoService<any>['collectionName'];
+        resourceName?: MongoService<any>['resourceName'];
+        documentFilter?: MongoService<any>['documentFilter'];
+        interceptor?: MongoService<any>['interceptor'];
+        idGenerator?: MongoService<any>['idGenerator'];
+        onError?: MongoService<any>['onError'];
     }
     type CrudOp = 'create' | 'read' | 'update' | 'delete';
     interface CommandInfo {
@@ -28,8 +28,8 @@ export declare namespace MongoService {
         byId: boolean;
         documentId?: MongoAdapter.AnyId;
         nestedId?: MongoAdapter.AnyId;
-        input?: Record<string, any>;
-        options?: Record<string, any>;
+        input?: any;
+        options?: any;
     }
     /**
      * Represents options for "create" operation
@@ -118,7 +118,7 @@ export declare namespace MongoService {
      * @interface
      * @template T - The type of the document.
      */
-    interface UpdateOptions<T> extends StrictOmit<mongodb.FindOneAndUpdateOptions, 'projection' | 'returnDocument' | 'includeResultMetadata'> {
+    interface UpdateOneOptions<T> extends StrictOmit<mongodb.FindOneAndUpdateOptions, 'projection' | 'returnDocument' | 'includeResultMetadata'> {
         projection?: string | string[] | Document;
         filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
     }
@@ -132,6 +132,17 @@ export declare namespace MongoService {
         filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
     }
 }
+export interface MongoService {
+    /**
+     * Interceptor function for handling callback execution with provided arguments.
+     * @type Function
+     * @param next - The callback function to be intercepted.
+     * @param {MongoService.CommandInfo} info - The arguments object containing the following properties:
+     * @param _this - The reference to the current object.
+     * @returns - The promise that resolves to the result of the callback execution.
+     */
+    interceptor?(next: () => any, info: MongoService.CommandInfo, _this: any): Promise<any>;
+}
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -145,12 +156,12 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
     /**
      * Represents the name of a collection in MongoDB
      */
-    $collectionName?: string | ((_this: any) => string);
+    collectionName?: string | ((_this: any) => string);
     /**
      * Represents the name of a resource.
      * @type {string}
      */
-    $resourceName?: string | ((_this: any) => string);
+    resourceName?: string | ((_this: any) => string);
     /**
      * Represents a MongoDB database object.
      */
@@ -163,29 +174,20 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * Generates a new id for new inserting Document.
      *
      */
-    $idGenerator?: (_this: any) => MongoAdapter.AnyId;
+    idGenerator?: (command: MongoService.CommandInfo, _this: any) => MongoAdapter.AnyId;
     /**
      * Callback function for handling errors.
      *
      * @param {unknown} error - The error object.
      * @param _this - The context object.
      */
-    $onError?: (error: unknown, _this: any) => void | Promise<void>;
+    onError?: (error: unknown, _this: any) => void | Promise<void>;
     /**
      * Represents a common filter function for a MongoService.
      *
      * @type {FilterInput | Function}
      */
-    $documentFilter?: MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: this) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
-    /**
-     * Interceptor function for handling callback execution with provided arguments.
-     *
-     * @param callback - The callback function to be intercepted.
-     * @param {MongoService.CommandInfo} info - The arguments object containing the following properties:
-     * @param _this - The reference to the current object.
-     * @returns - The promise that resolves to the result of the callback execution.
-     */
-    $interceptor?: (callback: () => any, info: MongoService.CommandInfo, _this: any) => Promise<any>;
+    documentFilter?: MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: this) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
     /**
      * Constructs a new instance
      *
@@ -355,7 +357,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @protected
      * @returns {MongoAdapter.AnyId} The generated ID.
      */
-    protected _generateId(): MongoAdapter.AnyId;
+    protected _generateId(command: MongoService.CommandInfo): MongoAdapter.AnyId;
     /**
      * Retrieves the common filter used for querying documents.
      * This method is mostly used for security issues like securing multi-tenant applications.
@@ -364,6 +366,6 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    protected _getDocumentFilter(info: MongoService.CommandInfo): MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined;
-    protected _intercept(callback: (...args: any[]) => any, info: MongoService.CommandInfo): Promise<any>;
+    protected _getDocumentFilter(command: MongoService.CommandInfo): MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined;
+    protected _executeCommand(command: MongoService.CommandInfo, commandFn: () => any): Promise<any>;
 }

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

@@ -1,8 +1,7 @@
-import mongodb from 'mongodb';
+import mongodb, { UpdateFilter } from 'mongodb';
 import { PartialDTO, PatchDTO, Type } from 'ts-gems';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
-import { MongoService } from './mongo-service.js';
 /**
  *
  * @namespace MongoSingletonService
@@ -17,16 +16,6 @@ export declare namespace MongoSingletonService {
     interface Options extends MongoEntityService.Options {
         _id?: MongoAdapter.AnyId;
     }
-    interface CreateOptions extends MongoEntityService.CreateOptions {
-    }
-    interface DeleteOptions<T> extends MongoEntityService.DeleteOptions<T> {
-    }
-    interface ExistsOptions<T> extends MongoService.ExistsOptions<T> {
-    }
-    interface FindOneOptions<T> extends MongoEntityService.FindOneOptions<T> {
-    }
-    interface UpdateOptions<T> extends MongoEntityService.UpdateOptions<T> {
-    }
 }
 /**
  * A class that provides access to a MongoDB collection, with support for singleton document operations.
@@ -51,64 +40,65 @@ export declare class MongoSingletonService<T extends mongodb.Document> extends M
     /**
      * Asserts the existence of a resource based on the given options.
      *
-     * @param {MongoSingletonService.ExistsOptions<T>} [options]
+     * @param {MongoEntityService.ExistsOptions<T>} [options]
      * @returns {Promise<void>} A Promise that resolves when the resource exists.
      * @throws {ResourceNotAvailableError} If the resource does not exist.
      */
-    assert(options?: MongoSingletonService.ExistsOptions<T>): Promise<void>;
+    assert(options?: MongoEntityService.ExistsOptions<T>): Promise<void>;
     /**
      * Creates the document in the database.
      *
      * @param {PartialDTO<T>} input - The partial input to create the document with.
-     * @param {MongoSingletonService.CreateOptions} [options] - The options for creating the document.
+     * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @return {Promise<PartialDTO<T>>} A promise that resolves to the partial output of the created document.
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.
      */
-    create(input: PartialDTO<T>, options?: MongoSingletonService.CreateOptions): Promise<PartialDTO<T>>;
+    create(input: PartialDTO<T>, options?: MongoEntityService.CreateOptions): Promise<PartialDTO<T>>;
     /**
      * Deletes a record from the database
      *
-     * @param {MongoSingletonService.DeleteOptions<T>} options - The options for deleting the record
+     * @param {MongoEntityService.DeleteOptions<T>} options - The options for deleting the record
      * @returns {Promise<number>} The number of records deleted
      */
-    delete(options?: MongoSingletonService.DeleteOptions<T>): Promise<number>;
+    delete(options?: MongoEntityService.DeleteOptions<T>): Promise<number>;
     /**
      * Checks if the document exists in the database.
      *
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @return {Promise<boolean>} - A promise that resolves to a boolean value indicating if the document exists.
      */
-    exists(options?: MongoSingletonService.ExistsOptions<T>): Promise<boolean>;
+    exists(options?: MongoEntityService.ExistsOptions<T>): Promise<boolean>;
     /**
      * Fetches the document if it exists. Returns undefined if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} [options] - The options for finding the document.
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @returns {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the found document or undefined if not found.
      */
-    find(options?: MongoSingletonService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
+    find(options?: MongoEntityService.FindOneOptions<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Fetches the document from the Mongo collection service. Throws error if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} options - The options to customize the query.
+     * @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.
      */
-    get(options?: MongoSingletonService.FindOneOptions<T>): Promise<PartialDTO<T>>;
+    get(options?: MongoEntityService.FindOneOptions<T>): Promise<PartialDTO<T>>;
     /**
      * Updates a document in the MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
      */
-    updateOnly(input: PatchDTO<T>, options?: MongoSingletonService.UpdateOptions<T>): Promise<number>;
+    update(input: PatchDTO<T> | UpdateFilter<T>, options?: MongoEntityService.UpdateOneOptions<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Updates a document in the MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
      */
-    update(input: PatchDTO<T>, options?: MongoSingletonService.UpdateOptions<T>): Promise<PartialDTO<T> | undefined>;
+    updateOnly(input: PatchDTO<T> | UpdateFilter<T>, options?: MongoEntityService.UpdateOneOptions<T>): Promise<number>;
 }