@opra/mongodb 0.23.2 → 0.24.1

package/cjs/index.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./mongo-adapter.js"), exports);
-tslib_1.__exportStar(require("./mongo-collection-resource.js"), exports);
+tslib_1.__exportStar(require("./mongo-collection.js"), exports);
 tslib_1.__exportStar(require("./mongo-entity-service.js"), exports);
-tslib_1.__exportStar(require("./mongo-singleton-resource.js"), exports);
+tslib_1.__exportStar(require("./mongo-singleton.js"), exports);

package/cjs/mongo-adapter.js

@@ -20,22 +20,22 @@ 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;
-            if (operation === 'create' || operation === 'update' ||
-                operation === 'get' || operation === 'findMany') {
+            if (endpoint === 'create' || endpoint === 'update' ||
+                endpoint === 'get' || endpoint === 'findMany') {
                 options.projection = MongoAdapter.transformProjection(resource.type, params);
             }
             if (resource instanceof common_1.Collection &&
-                (operation === 'delete' || operation === 'get' || operation === 'update')) {
+                (endpoint === 'delete' || endpoint === 'get' || endpoint === 'update')) {
                 filter = MongoAdapter.transformKeyValues(resource, request.key);
             }
             if (params?.filter) {
                 const f = MongoAdapter.transformFilter(params.filter);
                 filter = filter ? { $and: [filter, f] } : f;
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 options.sort = params?.sort;
                 options.limit = params?.limit;
                 options.skip = params?.skip;
@@ -43,7 +43,7 @@ var MongoAdapter;
                 options.count = params?.count;
             }
             options = (0, lodash_omitby_1.default)(options, lodash_isnil_1.default);
-            switch (operation) {
+            switch (endpoint) {
                 case 'create': {
                     return {
                         method: 'insertOne',
@@ -55,7 +55,7 @@ var MongoAdapter;
                 case 'delete':
                 case 'deleteMany': {
                     return {
-                        method: (operation === 'delete' ? 'deleteOne' : 'deleteMany'),
+                        method: (endpoint === 'delete' ? 'deleteOne' : 'deleteMany'),
                         filter,
                         options,
                         args: [filter, options]
@@ -102,7 +102,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})`);
     }
     MongoAdapter.transformRequest = transformRequest;
 })(MongoAdapter || (exports.MongoAdapter = MongoAdapter = {}));

package/cjs/{mongo-collection-resource.js → mongo-collection.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoCollectionResource = void 0;
+exports.MongoCollection = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const core_1 = require("@opra/core");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
-class MongoCollectionResource {
+class MongoCollection {
     constructor(options) {
         this.defaultLimit = options?.defaultLimit || 100;
     }
@@ -54,46 +53,25 @@ class MongoCollectionResource {
         return service.find(prepared.filter, prepared.options);
     }
 }
-exports.MongoCollectionResource = MongoCollectionResource;
+exports.MongoCollection = MongoCollection;
 tslib_1.__decorate([
-    common_1.Collection.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "create", null);
+    common_1.Collection.Create()
+], MongoCollection.prototype, "create", null);
 tslib_1.__decorate([
-    common_1.Collection.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "delete", null);
+    common_1.Collection.Delete()
+], MongoCollection.prototype, "delete", null);
 tslib_1.__decorate([
-    common_1.Collection.DeleteMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "deleteMany", null);
+    common_1.Collection.DeleteMany()
+], MongoCollection.prototype, "deleteMany", null);
 tslib_1.__decorate([
-    common_1.Collection.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "get", null);
+    common_1.Collection.Get()
+], MongoCollection.prototype, "get", null);
 tslib_1.__decorate([
-    common_1.Collection.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "update", null);
+    common_1.Collection.Update()
+], MongoCollection.prototype, "update", null);
 tslib_1.__decorate([
-    common_1.Collection.UpdateMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "updateMany", null);
+    common_1.Collection.UpdateMany()
+], MongoCollection.prototype, "updateMany", null);
 tslib_1.__decorate([
-    common_1.Collection.FindMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "findMany", null);
+    common_1.Collection.FindMany()
+], MongoCollection.prototype, "findMany", null);

package/cjs/mongo-entity-service.js

@@ -123,7 +123,7 @@ class MongoEntityService {
         if (this.transformData)
             out = this.transformData(out);
         if (!out)
-            throw new Error('"insertOne" operation returned no result!');
+            throw new Error('"insertOne" endpoint returned no result!');
         return out;
     }
     async updateOne(filter, doc, options) {

package/cjs/{mongo-singleton-resource.js → mongo-singleton.js}

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoSingletonResource = void 0;
+exports.MongoSingleton = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const core_1 = require("@opra/core");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
-class MongoSingletonResource {
+class MongoSingleton {
     constructor() {
         this.defaultLimit = 100;
     }
@@ -31,28 +30,16 @@ class MongoSingletonResource {
         return service.updateOne(prepared.filter, prepared.update, prepared.options);
     }
 }
-exports.MongoSingletonResource = MongoSingletonResource;
+exports.MongoSingleton = MongoSingleton;
 tslib_1.__decorate([
-    common_1.Singleton.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "create", null);
+    common_1.Singleton.Create()
+], MongoSingleton.prototype, "create", null);
 tslib_1.__decorate([
-    common_1.Singleton.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "delete", null);
+    common_1.Singleton.Delete()
+], MongoSingleton.prototype, "delete", null);
 tslib_1.__decorate([
-    common_1.Singleton.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "get", null);
+    common_1.Singleton.Get()
+], MongoSingleton.prototype, "get", null);
 tslib_1.__decorate([
-    common_1.Singleton.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "update", null);
+    common_1.Singleton.Update()
+], MongoSingleton.prototype, "update", null);

package/esm/index.js

@@ -1,4 +1,4 @@
 export * from './mongo-adapter.js';
-export * from './mongo-collection-resource.js';
+export * from './mongo-collection.js';
 export * from './mongo-entity-service.js';
-export * from './mongo-singleton-resource.js';
+export * from './mongo-singleton.js';

package/esm/mongo-adapter.js

@@ -16,22 +16,22 @@ 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;
-            if (operation === 'create' || operation === 'update' ||
-                operation === 'get' || operation === 'findMany') {
+            if (endpoint === 'create' || endpoint === 'update' ||
+                endpoint === 'get' || endpoint === 'findMany') {
                 options.projection = MongoAdapter.transformProjection(resource.type, params);
             }
             if (resource instanceof Collection &&
-                (operation === 'delete' || operation === 'get' || operation === 'update')) {
+                (endpoint === 'delete' || endpoint === 'get' || endpoint === 'update')) {
                 filter = MongoAdapter.transformKeyValues(resource, request.key);
             }
             if (params?.filter) {
                 const f = MongoAdapter.transformFilter(params.filter);
                 filter = filter ? { $and: [filter, f] } : f;
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 options.sort = params?.sort;
                 options.limit = params?.limit;
                 options.skip = params?.skip;
@@ -39,7 +39,7 @@ export var MongoAdapter;
                 options.count = params?.count;
             }
             options = omitBy(options, isNil);
-            switch (operation) {
+            switch (endpoint) {
                 case 'create': {
                     return {
                         method: 'insertOne',
@@ -51,7 +51,7 @@ export var MongoAdapter;
                 case 'delete':
                 case 'deleteMany': {
                     return {
-                        method: (operation === 'delete' ? 'deleteOne' : 'deleteMany'),
+                        method: (endpoint === 'delete' ? 'deleteOne' : 'deleteMany'),
                         filter,
                         options,
                         args: [filter, options]
@@ -98,7 +98,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})`);
     }
     MongoAdapter.transformRequest = transformRequest;
 })(MongoAdapter || (MongoAdapter = {}));

package/esm/{mongo-collection-resource.js → mongo-collection.js}

@@ -1,9 +1,8 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Collection } from '@opra/common';
-import { OperationContext } from '@opra/core';
 import { MongoAdapter } from './mongo-adapter.js';
 // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
-export class MongoCollectionResource {
+export class MongoCollection {
     constructor(options) {
         this.defaultLimit = options?.defaultLimit || 100;
     }
@@ -52,44 +51,23 @@ export class MongoCollectionResource {
     }
 }
 __decorate([
-    Collection.Create(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "create", null);
+    Collection.Create()
+], MongoCollection.prototype, "create", null);
 __decorate([
-    Collection.Delete(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "delete", null);
+    Collection.Delete()
+], MongoCollection.prototype, "delete", null);
 __decorate([
-    Collection.DeleteMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "deleteMany", null);
+    Collection.DeleteMany()
+], MongoCollection.prototype, "deleteMany", null);
 __decorate([
-    Collection.Get(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "get", null);
+    Collection.Get()
+], MongoCollection.prototype, "get", null);
 __decorate([
-    Collection.Update(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "update", null);
+    Collection.Update()
+], MongoCollection.prototype, "update", null);
 __decorate([
-    Collection.UpdateMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "updateMany", null);
+    Collection.UpdateMany()
+], MongoCollection.prototype, "updateMany", null);
 __decorate([
-    Collection.FindMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoCollectionResource.prototype, "findMany", null);
+    Collection.FindMany()
+], MongoCollection.prototype, "findMany", null);

package/esm/mongo-entity-service.js

@@ -120,7 +120,7 @@ export class MongoEntityService {
         if (this.transformData)
             out = this.transformData(out);
         if (!out)
-            throw new Error('"insertOne" operation returned no result!');
+            throw new Error('"insertOne" endpoint returned no result!');
         return out;
     }
     async updateOne(filter, doc, options) {

package/esm/{mongo-singleton-resource.js → mongo-singleton.js}

@@ -1,8 +1,7 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Singleton } from '@opra/common';
-import { OperationContext } from '@opra/core';
 import { MongoAdapter } from './mongo-adapter.js';
-export class MongoSingletonResource {
+export class MongoSingleton {
     constructor() {
         this.defaultLimit = 100;
     }
@@ -29,26 +28,14 @@ export class MongoSingletonResource {
     }
 }
 __decorate([
-    Singleton.Create(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "create", null);
+    Singleton.Create()
+], MongoSingleton.prototype, "create", null);
 __decorate([
-    Singleton.Delete(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "delete", null);
+    Singleton.Delete()
+], MongoSingleton.prototype, "delete", null);
 __decorate([
-    Singleton.Get(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "get", null);
+    Singleton.Get()
+], MongoSingleton.prototype, "get", null);
 __decorate([
-    Singleton.Update(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], MongoSingletonResource.prototype, "update", null);
+    Singleton.Update()
+], MongoSingleton.prototype, "update", null);

package/package.json

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

package/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './mongo-adapter.js';
-export * from './mongo-collection-resource.js';
+export * from './mongo-collection.js';
 export * from './mongo-entity-service.js';
-export * from './mongo-singleton-resource.js';
+export * from './mongo-singleton.js';

package/types/mongo-collection.d.ts

@@ -0,0 +1,22 @@
+import mongodb from 'mongodb';
+import { Maybe } from 'ts-gems';
+import { Collection, ICollection, PartialOutput } from '@opra/common';
+import { EndpointContext } from '@opra/core';
+import { MongoEntityService } from './mongo-entity-service.js';
+export declare namespace MongoCollection {
+    interface Options {
+        defaultLimit?: number;
+    }
+}
+export declare abstract class MongoCollection<T extends mongodb.Document> implements ICollection<T> {
+    defaultLimit?: number;
+    constructor(options?: MongoCollection.Options);
+    create?(ctx: Collection.Create.Context): Promise<PartialOutput<T>>;
+    delete?(ctx: EndpointContext): Promise<number>;
+    deleteMany?(ctx: EndpointContext): Promise<number>;
+    get?(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    update?(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    updateMany?(ctx: EndpointContext): Promise<number>;
+    findMany?(ctx: EndpointContext): Promise<PartialOutput<T>[]>;
+    abstract getService(ctx: EndpointContext): MongoEntityService<T> | Promise<MongoEntityService<T>>;
+}

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

@@ -1,6 +1,6 @@
 import mongodb, { UpdateFilter } from 'mongodb';
 import { StrictOmit } from 'ts-gems';
-import { OperationContext, PartialOutput } from '@opra/core';
+import { EndpointContext, PartialOutput } from '@opra/core';
 export declare namespace MongoEntityService {
     interface Options {
         db?: mongodb.Db;
@@ -9,7 +9,7 @@ export declare namespace MongoEntityService {
 }
 export declare class MongoEntityService<T extends mongodb.Document> {
     protected _collectionName: string;
-    context: OperationContext;
+    context: EndpointContext;
     defaultLimit: number;
     db?: mongodb.Db;
     session?: mongodb.ClientSession;
@@ -23,7 +23,7 @@ export declare class MongoEntityService<T extends mongodb.Document> {
     insertOne(doc: mongodb.OptionalUnlessRequiredId<T>, options?: mongodb.InsertOneOptions): Promise<PartialOutput<T>>;
     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: OperationContext, db?: mongodb.Db, session?: mongodb.ClientSession): MongoEntityService<T>;
+    with(context: EndpointContext, db?: mongodb.Db, session?: mongodb.ClientSession): MongoEntityService<T>;
     protected _onError(error: unknown): Promise<void>;
     protected getDatabase(): mongodb.Db | Promise<mongodb.Db>;
     protected getCollection(db: mongodb.Db): Promise<mongodb.Collection<T>>;

package/types/mongo-singleton.d.ts

@@ -0,0 +1,13 @@
+import mongodb from 'mongodb';
+import { Maybe } from 'ts-gems';
+import { PartialOutput } from '@opra/common';
+import { EndpointContext } from '@opra/core';
+import { MongoEntityService } from './mongo-entity-service.js';
+export declare abstract class MongoSingleton<T extends mongodb.Document> {
+    defaultLimit: number;
+    create?(ctx: EndpointContext): Promise<PartialOutput<T>>;
+    delete?(ctx: EndpointContext): Promise<number>;
+    get?(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    update?(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    abstract getService(ctx: EndpointContext): MongoEntityService<T> | Promise<MongoEntityService<T>>;
+}

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

@@ -1,22 +0,0 @@
-import mongodb from 'mongodb';
-import { Maybe } from 'ts-gems';
-import { Collection, CollectionResource, PartialOutput } from '@opra/common';
-import { OperationContext } from '@opra/core';
-import { MongoEntityService } from './mongo-entity-service.js';
-export declare namespace MongoCollectionResource {
-    interface Options {
-        defaultLimit?: number;
-    }
-}
-export declare abstract class MongoCollectionResource<T extends mongodb.Document> implements CollectionResource<T> {
-    defaultLimit?: number;
-    constructor(options?: MongoCollectionResource.Options);
-    create?(ctx: Collection.Create.Context): Promise<PartialOutput<T>>;
-    delete?(ctx: OperationContext): Promise<number>;
-    deleteMany?(ctx: OperationContext): Promise<number>;
-    get?(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    update?(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    updateMany?(ctx: OperationContext): Promise<number>;
-    findMany?(ctx: OperationContext): Promise<PartialOutput<T>[]>;
-    abstract getService(ctx: OperationContext): MongoEntityService<T> | Promise<MongoEntityService<T>>;
-}

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

@@ -1,13 +0,0 @@
-import mongodb from 'mongodb';
-import { Maybe } from 'ts-gems';
-import { PartialOutput } from '@opra/common';
-import { OperationContext } from '@opra/core';
-import { MongoEntityService } from './mongo-entity-service.js';
-export declare abstract class MongoSingletonResource<T extends mongodb.Document> {
-    defaultLimit: number;
-    create?(ctx: OperationContext): Promise<PartialOutput<T>>;
-    delete?(ctx: OperationContext): Promise<number>;
-    get?(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    update?(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    abstract getService(ctx: OperationContext): MongoEntityService<T> | Promise<MongoEntityService<T>>;
-}