@opra/mongodb 0.26.3 → 0.26.5

package/cjs/mongo-adapter.js

@@ -20,9 +20,10 @@ var MongoAdapter;
     function transformRequest(request) {
         const { resource } = request;
         if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
-            const { params, operation } = request;
+            const { params, endpoint } = request;
             let options = {};
             let filter;
+            const operation = endpoint.name;
             if (operation === 'create' || operation === 'update' ||
                 operation === 'get' || operation === 'findMany') {
                 options.projection = MongoAdapter.transformProjection(resource.type, params);
@@ -100,7 +101,7 @@ var MongoAdapter;
                 }
             }
         }
-        throw new TypeError(`Unimplemented request kind (${request.resource.kind}.${request.operation})`);
+        throw new TypeError(`Unimplemented request kind (${request.resource.kind}.${request.endpoint.name})`);
     }
     MongoAdapter.transformRequest = transformRequest;
 })(MongoAdapter || (exports.MongoAdapter = MongoAdapter = {}));

package/cjs/mongo-entity-service.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoEntityService = void 0;
-class MongoEntityService {
+const core_1 = require("@opra/core");
+class MongoEntityService extends core_1.ApiService {
     constructor(arg0, arg1) {
+        super();
         const options = typeof arg0 === 'object' ? arg0 : arg1;
         if (typeof arg0 === 'string')
             this._collectionName = arg0;
@@ -168,17 +170,9 @@ class MongoEntityService {
         return this.forContext(context, db, session);
     }
     forContext(context, db, session) {
-        if (this.context === context && this.db === db && this.session === session)
-            return this;
-        const instance = { context };
-        // Should reset session if db changed
-        if (db) {
-            instance.db = db;
-            instance.session = session;
-        }
-        if (session)
-            instance.session = session;
-        Object.setPrototypeOf(instance, this);
+        const instance = super.forContext(context);
+        instance.db = db || this.db;
+        instance.session = session || this.session;
         return instance;
     }
     async _onError(error) {

package/esm/mongo-adapter.js

@@ -16,9 +16,10 @@ export var MongoAdapter;
     function transformRequest(request) {
         const { resource } = request;
         if (resource instanceof Collection || resource instanceof Singleton) {
-            const { params, operation } = request;
+            const { params, endpoint } = request;
             let options = {};
             let filter;
+            const operation = endpoint.name;
             if (operation === 'create' || operation === 'update' ||
                 operation === 'get' || operation === 'findMany') {
                 options.projection = MongoAdapter.transformProjection(resource.type, params);
@@ -96,7 +97,7 @@ export var MongoAdapter;
                 }
             }
         }
-        throw new TypeError(`Unimplemented request kind (${request.resource.kind}.${request.operation})`);
+        throw new TypeError(`Unimplemented request kind (${request.resource.kind}.${request.endpoint.name})`);
     }
     MongoAdapter.transformRequest = transformRequest;
 })(MongoAdapter || (MongoAdapter = {}));

package/esm/mongo-entity-service.js

@@ -1,5 +1,7 @@
-export class MongoEntityService {
+import { ApiService } from '@opra/core';
+export class MongoEntityService extends ApiService {
     constructor(arg0, arg1) {
+        super();
         const options = typeof arg0 === 'object' ? arg0 : arg1;
         if (typeof arg0 === 'string')
             this._collectionName = arg0;
@@ -165,17 +167,9 @@ export class MongoEntityService {
         return this.forContext(context, db, session);
     }
     forContext(context, db, session) {
-        if (this.context === context && this.db === db && this.session === session)
-            return this;
-        const instance = { context };
-        // Should reset session if db changed
-        if (db) {
-            instance.db = db;
-            instance.session = session;
-        }
-        if (session)
-            instance.session = session;
-        Object.setPrototypeOf(instance, this);
+        const instance = super.forContext(context);
+        instance.db = db || this.db;
+        instance.session = session || this.session;
         return instance;
     }
     async _onError(error) {

package/package.json

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

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

@@ -1,15 +1,14 @@
 import mongodb, { UpdateFilter } from 'mongodb';
 import { StrictOmit } from 'ts-gems';
-import { PartialOutput, RequestContext } from '@opra/core';
+import { ApiService, PartialOutput, RequestContext } from '@opra/core';
 export declare namespace MongoEntityService {
     interface Options {
         db?: mongodb.Db;
         defaultLimit?: number;
     }
 }
-export declare class MongoEntityService<T extends mongodb.Document> {
+export declare class MongoEntityService<T extends mongodb.Document> extends ApiService {
     protected _collectionName: string;
-    context: RequestContext;
     defaultLimit: number;
     db?: mongodb.Db;
     session?: mongodb.ClientSession;
@@ -24,7 +23,7 @@ export declare class MongoEntityService<T extends mongodb.Document> {
     updateOne(filter: mongodb.Filter<T>, doc: UpdateFilter<T> | Partial<T>, options?: mongodb.UpdateOptions): Promise<PartialOutput<T> | undefined>;
     updateMany(filter: mongodb.Filter<T>, doc: UpdateFilter<T> | Partial<T>, options?: StrictOmit<mongodb.UpdateOptions, 'upsert'>): Promise<number>;
     with(context: RequestContext, db?: mongodb.Db, session?: mongodb.ClientSession): MongoEntityService<T>;
-    forContext(context: RequestContext, db?: mongodb.Db, session?: mongodb.ClientSession): MongoEntityService<T>;
+    forContext(context: RequestContext, db?: mongodb.Db, session?: mongodb.ClientSession): typeof this;
     protected _onError(error: unknown): Promise<void>;
     protected getDatabase(): mongodb.Db | Promise<mongodb.Db>;
     protected getCollection(db: mongodb.Db): Promise<mongodb.Collection<T>>;