@opra/mongodb 1.0.0-alpha.33 → 1.0.0-alpha.35

package/cjs/mongo-service.js

@@ -4,6 +4,7 @@ exports.MongoService = void 0;
 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");
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -38,6 +39,17 @@ class MongoService extends core_1.ServiceBase {
         this.resourceName = options?.resourceName;
         this.idGenerator = options?.idGenerator;
     }
+    for(context, overwriteProperties, overwriteContext) {
+        if (overwriteProperties?.documentFilter && this.documentFilter) {
+            overwriteProperties.documentFilter = [
+                ...(Array.isArray(this.documentFilter) ? this.documentFilter : [this.documentFilter]),
+                ...(Array.isArray(overwriteProperties?.documentFilter)
+                    ? overwriteProperties?.documentFilter
+                    : [overwriteProperties?.documentFilter]),
+            ];
+        }
+        return super.for(context, overwriteProperties, overwriteContext);
+    }
     /**
      * Retrieves the collection name.
      *
@@ -380,7 +392,9 @@ class MongoService extends core_1.ServiceBase {
      * that resolves to the common filter, or undefined if not available.
      */
     _getDocumentFilter(command) {
-        return typeof this.documentFilter === 'function' ? this.documentFilter(command, this) : this.documentFilter;
+        const commonFilter = Array.isArray(this.documentFilter) ? this.documentFilter : [this.documentFilter];
+        const mapped = commonFilter.map(f => (typeof f === 'function' ? f(command, this) : f));
+        return mapped.length > 1 ? mongo_adapter_js_1.MongoAdapter.prepareFilter(mapped) : mapped[0];
     }
     async _executeCommand(command, commandFn) {
         let proto;

package/esm/mongo-service.js

@@ -1,6 +1,7 @@
 import { DATATYPE_METADATA } from '@opra/common';
 import { ServiceBase } from '@opra/core';
 import { ObjectId } from 'mongodb';
+import { MongoAdapter } from './mongo-adapter.js';
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -35,6 +36,17 @@ export class MongoService extends ServiceBase {
         this.resourceName = options?.resourceName;
         this.idGenerator = options?.idGenerator;
     }
+    for(context, overwriteProperties, overwriteContext) {
+        if (overwriteProperties?.documentFilter && this.documentFilter) {
+            overwriteProperties.documentFilter = [
+                ...(Array.isArray(this.documentFilter) ? this.documentFilter : [this.documentFilter]),
+                ...(Array.isArray(overwriteProperties?.documentFilter)
+                    ? overwriteProperties?.documentFilter
+                    : [overwriteProperties?.documentFilter]),
+            ];
+        }
+        return super.for(context, overwriteProperties, overwriteContext);
+    }
     /**
      * Retrieves the collection name.
      *
@@ -377,7 +389,9 @@ export class MongoService extends ServiceBase {
      * that resolves to the common filter, or undefined if not available.
      */
     _getDocumentFilter(command) {
-        return typeof this.documentFilter === 'function' ? this.documentFilter(command, this) : this.documentFilter;
+        const commonFilter = Array.isArray(this.documentFilter) ? this.documentFilter : [this.documentFilter];
+        const mapped = commonFilter.map(f => (typeof f === 'function' ? f(command, this) : f));
+        return mapped.length > 1 ? MongoAdapter.prepareFilter(mapped) : mapped[0];
     }
     async _executeCommand(command, commandFn) {
         let proto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.0.0-alpha.33",
+  "version": "1.0.0-alpha.35",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -8,11 +8,11 @@
     "lodash.omit": "^4.5.0",
     "putil-isplainobject": "^1.1.5",
     "tslib": "^2.6.3",
-    "valgen": "^5.8.2"
+    "valgen": "^5.9.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.0.0-alpha.33",
-    "@opra/core": "^1.0.0-alpha.33",
+    "@opra/common": "^1.0.0-alpha.35",
+    "@opra/core": "^1.0.0-alpha.35",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",
@@ -23,7 +23,7 @@
         "default": "./esm/index.js"
       },
       "require": {
-        "types": "./types/index.d.ts",
+        "types": "./types/index.d.cts",
         "default": "./cjs/index.js"
       },
       "default": "./esm/index.js"

package/types/index.d.cts

@@ -0,0 +1,5 @@
+export * from './mongo-adapter.js';
+export * from './mongo-collection-service.js';
+export * from './mongo-nested-service.js';
+export * from './mongo-service.js';
+export * from './mongo-singleton-service.js';

package/types/mongo-service.d.ts

@@ -1,8 +1,8 @@
 import * as OpraCommon from '@opra/common';
 import { ComplexType } from '@opra/common';
-import { ServiceBase } from '@opra/core';
+import { HttpContext, ServiceBase } from '@opra/core';
 import mongodb, { Document, TransactionOptions } from 'mongodb';
-import { PartialDTO, StrictOmit, Type } from 'ts-gems';
+import { Nullish, PartialDTO, StrictOmit, Type } from 'ts-gems';
 import { IsObject } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
 /**
@@ -31,6 +31,7 @@ export declare namespace MongoService {
         input?: any;
         options?: any;
     }
+    type CommonFilter = MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: MongoService<any>) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
     /**
      * Represents options for "create" operation
      *
@@ -187,7 +188,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      *
      * @type {FilterInput | Function}
      */
-    documentFilter?: MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: this) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
+    documentFilter?: MongoService.CommonFilter | MongoService.CommonFilter[];
     /**
      * Constructs a new instance
      *
@@ -196,6 +197,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @constructor
      */
     constructor(dataType: Type | string, options?: MongoService.Options);
+    for<C extends HttpContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
     /**
      * Retrieves the collection name.
      *