@opra/mongodb 1.1.0 → 1.2.0

package/cjs/mongo-adapter.js

@@ -64,6 +64,16 @@ var MongoAdapter;
                     };
                     return { method: 'get', key, options };
                 }
+                case 'Entity.Replace': {
+                    const data = await ctx.getBody();
+                    const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);
+                    const key = keyParam && ctx.pathParams[String(keyParam.name)];
+                    const options = {
+                        projection: ctx.queryParams.projection,
+                        filter: ctx.queryParams.filter,
+                    };
+                    return { method: 'replace', key, data, options };
+                }
                 case 'Entity.Update': {
                     const data = await ctx.getBody();
                     const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);

package/cjs/mongo-entity-service.js

@@ -129,21 +129,17 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             command.options?.filter,
         ]);
         const { options } = command;
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const projection = mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection);
-        const out = await collection.findOne(filter || {}, {
-            ...(0, lodash_omit_1.default)(options, 'filter'),
-            session: options?.session ?? this.getSession(),
-            projection,
-            limit: undefined,
-            skip: undefined,
-            sort: undefined,
-        });
-        if (out) {
-            const outputCodec = this._getOutputCodec('find');
-            return outputCodec(out);
-        }
+        const findManyCommand = {
+            ...command,
+            options: {
+                ...options,
+                filter,
+                limit: 1,
+                skip: undefined,
+            },
+        };
+        const rows = await this._findMany(findManyCommand);
+        return rows?.[0];
     }
     /**
      * Finds a document in the collection that matches the specified options.
@@ -152,20 +148,15 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
      */
     async _findOne(command) {
         const { options } = command;
-        const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const out = await collection.findOne(filter || {}, {
-            ...(0, lodash_omit_1.default)(options, 'filter'),
-            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,
-        });
-        if (out) {
-            const outputCodec = this._getOutputCodec('find');
-            return outputCodec(out);
-        }
+        const findManyCommand = {
+            ...command,
+            options: {
+                ...options,
+                limit: 1,
+            },
+        };
+        const rows = await this._findMany(findManyCommand);
+        return rows?.[0];
     }
     /**
      * Finds multiple documents in the MongoDB collection
@@ -174,21 +165,30 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
      */
     async _findMany(command) {
         const { options } = command;
-        const limit = options?.limit || 10;
         const stages = [];
+        /** Pre-Stages */
+        if (options?.preStages)
+            stages.push(...options.preStages);
+        /** "Filter" stage */
         let filter;
         if (options?.filter)
             filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
         if (filter)
             stages.push({ $match: filter });
+        /** "Skip" stage */
         if (options?.skip)
             stages.push({ $skip: options.skip });
+        /** "Sort" stage */
         if (options?.sort) {
             const sort = mongo_adapter_js_1.MongoAdapter.prepareSort(options.sort);
             if (sort)
                 stages.push({ $sort: sort });
         }
-        stages.push({ $limit: limit });
+        /** "Limit" stage */
+        stages.push({ $limit: options?.limit || 10 });
+        /** Post-Stages */
+        if (options?.postStages)
+            stages.push(...options.postStages);
         const dataType = this.dataType;
         const projection = mongo_adapter_js_1.MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
@@ -319,7 +319,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const input = command.input;
         (0, valgen_1.isNotNullish)(input, { label: 'input' });
         (0, valgen_1.isNotNullish)(input._id, { label: 'input._id' });
-        const inputCodec = this._getInputCodec('create');
+        const inputCodec = this._getInputCodec('replace');
         const document = inputCodec(input);
         const { options } = command;
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
@@ -336,7 +336,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             session: options?.session ?? this.getSession(),
             projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
         });
-        const outputCodec = this._getOutputCodec('create');
+        const outputCodec = this._getOutputCodec('replace');
         if (out)
             return outputCodec(out);
     }

package/esm/mongo-adapter.js

@@ -60,6 +60,16 @@ export var MongoAdapter;
                     };
                     return { method: 'get', key, options };
                 }
+                case 'Entity.Replace': {
+                    const data = await ctx.getBody();
+                    const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);
+                    const key = keyParam && ctx.pathParams[String(keyParam.name)];
+                    const options = {
+                        projection: ctx.queryParams.projection,
+                        filter: ctx.queryParams.filter,
+                    };
+                    return { method: 'replace', key, data, options };
+                }
                 case 'Entity.Update': {
                     const data = await ctx.getBody();
                     const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);

package/esm/mongo-entity-service.js

@@ -125,21 +125,17 @@ export class MongoEntityService extends MongoService {
             command.options?.filter,
         ]);
         const { options } = command;
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const projection = MongoAdapter.prepareProjection(this.dataType, options?.projection);
-        const out = await collection.findOne(filter || {}, {
-            ...omit(options, 'filter'),
-            session: options?.session ?? this.getSession(),
-            projection,
-            limit: undefined,
-            skip: undefined,
-            sort: undefined,
-        });
-        if (out) {
-            const outputCodec = this._getOutputCodec('find');
-            return outputCodec(out);
-        }
+        const findManyCommand = {
+            ...command,
+            options: {
+                ...options,
+                filter,
+                limit: 1,
+                skip: undefined,
+            },
+        };
+        const rows = await this._findMany(findManyCommand);
+        return rows?.[0];
     }
     /**
      * Finds a document in the collection that matches the specified options.
@@ -148,20 +144,15 @@ export class MongoEntityService extends MongoService {
      */
     async _findOne(command) {
         const { options } = command;
-        const filter = MongoAdapter.prepareFilter(options?.filter);
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const out = await collection.findOne(filter || {}, {
-            ...omit(options, 'filter'),
-            session: options?.session ?? this.getSession(),
-            sort: options?.sort ? MongoAdapter.prepareSort(options.sort) : undefined,
-            projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
-            limit: undefined,
-        });
-        if (out) {
-            const outputCodec = this._getOutputCodec('find');
-            return outputCodec(out);
-        }
+        const findManyCommand = {
+            ...command,
+            options: {
+                ...options,
+                limit: 1,
+            },
+        };
+        const rows = await this._findMany(findManyCommand);
+        return rows?.[0];
     }
     /**
      * Finds multiple documents in the MongoDB collection
@@ -170,21 +161,30 @@ export class MongoEntityService extends MongoService {
      */
     async _findMany(command) {
         const { options } = command;
-        const limit = options?.limit || 10;
         const stages = [];
+        /** Pre-Stages */
+        if (options?.preStages)
+            stages.push(...options.preStages);
+        /** "Filter" stage */
         let filter;
         if (options?.filter)
             filter = MongoAdapter.prepareFilter(options?.filter);
         if (filter)
             stages.push({ $match: filter });
+        /** "Skip" stage */
         if (options?.skip)
             stages.push({ $skip: options.skip });
+        /** "Sort" stage */
         if (options?.sort) {
             const sort = MongoAdapter.prepareSort(options.sort);
             if (sort)
                 stages.push({ $sort: sort });
         }
-        stages.push({ $limit: limit });
+        /** "Limit" stage */
+        stages.push({ $limit: options?.limit || 10 });
+        /** Post-Stages */
+        if (options?.postStages)
+            stages.push(...options.postStages);
         const dataType = this.dataType;
         const projection = MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
@@ -315,7 +315,7 @@ export class MongoEntityService extends MongoService {
         const input = command.input;
         isNotNullish(input, { label: 'input' });
         isNotNullish(input._id, { label: 'input._id' });
-        const inputCodec = this._getInputCodec('create');
+        const inputCodec = this._getInputCodec('replace');
         const document = inputCodec(input);
         const { options } = command;
         const filter = MongoAdapter.prepareFilter([
@@ -332,7 +332,7 @@ export class MongoEntityService extends MongoService {
             session: options?.session ?? this.getSession(),
             projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
         });
-        const outputCodec = this._getOutputCodec('create');
+        const outputCodec = this._getOutputCodec('replace');
         if (out)
             return outputCodec(out);
     }

package/package.json

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

package/types/mongo-adapter.d.ts

@@ -15,7 +15,7 @@ export declare namespace MongoAdapter {
     const prepareProjection: typeof _prepareProjection;
     const prepareSort: typeof _prepareSort;
     interface TransformedRequest {
-        method: 'create' | 'delete' | 'deleteMany' | 'get' | 'findMany' | 'update' | 'updateMany';
+        method: 'create' | 'delete' | 'deleteMany' | 'get' | 'findMany' | 'replace' | 'update' | 'updateMany';
         key?: any;
         data?: any;
         options: any;

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

@@ -55,8 +55,8 @@ export declare class MongoCollectionService<T extends mongodb.Document> extends
      * @returns {Promise<PartialDTO<T>>} A promise that resolves to the created document.
      * @throws {Error} if an unknown error occurs while creating the document.
      */
-    create(input: PartialDTO<T>, options: RequiredSome<MongoEntityService.CreateOptions, 'projection'>): Promise<PartialDTO<T>>;
-    create(input: PartialDTO<T>, options?: MongoEntityService.CreateOptions): Promise<T>;
+    create(input: PartialDTO<T> | T, options: RequiredSome<MongoEntityService.CreateOptions, 'projection'>): Promise<PartialDTO<T>>;
+    create(input: PartialDTO<T> | T, options?: MongoEntityService.CreateOptions): Promise<T>;
     /**
      * Returns the count of documents in the collection based on the provided options.
      *

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

@@ -31,6 +31,8 @@ export declare namespace MongoEntityService {
     interface FindOneOptions<T> extends MongoService.FindOneOptions<T> {
     }
     interface FindManyOptions<T> extends MongoService.FindManyOptions<T> {
+        preStages?: mongodb.Document[];
+        postStages?: mongodb.Document[];
     }
     interface ReplaceOptions<T> extends MongoService.ReplaceOptions<T> {
     }