@opra/mongodb 0.31.12 → 0.31.13

package/cjs/mongo-collection-service.js

@@ -45,16 +45,17 @@ class MongoCollectionService extends mongo_service_js_1.MongoService {
         return r.deletedCount;
     }
     async get(id, options) {
-        const out = await this.findOne(id, options);
-        if (!out)
-            throw new common_1.ResourceNotFoundError(this.resourceName || this.getCollectionName(), id);
-        return out;
-    }
-    async findOne(id, options) {
         const filter = mongo_adapter_js_1.MongoAdapter.prepareKeyValues(id, this.keyFields);
         const optionsFilter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
         if (optionsFilter)
             filter.$and = [...(Array.isArray(optionsFilter) ? optionsFilter : [optionsFilter])];
+        const out = await this.findOne({ ...options, filter });
+        if (!out)
+            throw new common_1.ResourceNotFoundError(this.resourceName || this.getCollectionName(), id);
+        return out;
+    }
+    async findOne(options) {
+        const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter) || {};
         const mongoOptions = {
             ...(0, lodash_omit_1.default)(options, ['sort', 'skip', 'limit', 'filter']),
             projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.getDataType(), options),

package/esm/mongo-collection-service.js

@@ -41,16 +41,17 @@ export class MongoCollectionService extends MongoService {
         return r.deletedCount;
     }
     async get(id, options) {
-        const out = await this.findOne(id, options);
-        if (!out)
-            throw new ResourceNotFoundError(this.resourceName || this.getCollectionName(), id);
-        return out;
-    }
-    async findOne(id, options) {
         const filter = MongoAdapter.prepareKeyValues(id, this.keyFields);
         const optionsFilter = MongoAdapter.prepareFilter(options?.filter);
         if (optionsFilter)
             filter.$and = [...(Array.isArray(optionsFilter) ? optionsFilter : [optionsFilter])];
+        const out = await this.findOne({ ...options, filter });
+        if (!out)
+            throw new ResourceNotFoundError(this.resourceName || this.getCollectionName(), id);
+        return out;
+    }
+    async findOne(options) {
+        const filter = MongoAdapter.prepareFilter(options?.filter) || {};
         const mongoOptions = {
             ...omit(options, ['sort', 'skip', 'limit', 'filter']),
             projection: MongoAdapter.prepareProjection(this.getDataType(), options),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "0.31.12",
+  "version": "0.31.13",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -32,8 +32,8 @@
     "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@opra/common": "^0.31.12",
-    "@opra/core": "^0.31.12",
+    "@opra/common": "^0.31.13",
+    "@opra/core": "^0.31.13",
     "mongodb": ">=6.x.x"
   },
   "type": "module",

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

@@ -15,8 +15,8 @@ export declare class MongoCollectionService<T extends mongodb.Document> extends
     protected count(options?: MongoCollectionService.CountOptions<T>): Promise<number>;
     protected delete(id: any, options?: MongoCollectionService.DeleteOptions<T>): Promise<number>;
     protected deleteMany(options?: MongoCollectionService.DeleteManyOptions<T>): Promise<number>;
-    protected get(id: any, options?: MongoCollectionService.GetOptions): Promise<PartialOutput<T>>;
-    protected findOne(id: any, options?: MongoCollectionService.GetOptions): Promise<PartialOutput<T> | undefined>;
+    protected get(id: any, options?: MongoCollectionService.FindOneOptions): Promise<PartialOutput<T>>;
+    protected findOne(options?: MongoCollectionService.FindOneOptions): Promise<PartialOutput<T> | undefined>;
     protected findMany(options?: MongoCollectionService.FindManyOptions<T>): Promise<PartialOutput<T>[]>;
     protected update(id: any, doc: PartialInput<T>, options?: MongoCollectionService.UpdateOptions<T>): Promise<PartialOutput<T> | undefined>;
     protected updateMany(doc: OpraCommon.PartialInput<T>, options?: MongoCollectionService.UpdateManyOptions<T>): Promise<number>;
@@ -44,7 +44,7 @@ export declare namespace MongoCollectionService {
     interface DeleteManyOptions<T> extends mongodb.DeleteOptions {
         filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
     }
-    interface GetOptions<T = any> extends StrictOmit<mongodb.FindOptions, 'sort' | 'limit' | 'skip' | 'projection'> {
+    interface FindOneOptions<T = any> extends StrictOmit<mongodb.FindOptions, 'sort' | 'limit' | 'skip' | 'projection'> {
         filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
         pick?: string[];
         omit?: string[];