@opra/mongodb 1.0.0-alpha.3 → 1.0.0-alpha.31

package/esm/mongo-service.js

@@ -1,6 +1,6 @@
-import { ObjectId } from 'mongodb';
 import { DATATYPE_METADATA } from '@opra/common';
 import { ServiceBase } from '@opra/core';
+import { ObjectId } from 'mongodb';
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -16,23 +16,24 @@ export class MongoService extends ServiceBase {
      */
     constructor(dataType, options) {
         super();
-        this._encoders = {};
-        this._dataType = dataType;
+        this._inputCodecs = {};
+        this._outputCodecs = {};
+        this._dataType_ = dataType;
         this.db = options?.db;
-        this.$documentFilter = this.$documentFilter || options?.documentFilter;
-        this.$interceptor = this.$interceptor || options?.interceptor;
-        this.$collectionName = options?.collectionName;
-        if (!this.$collectionName) {
+        this.documentFilter = options?.documentFilter;
+        this.interceptor = options?.interceptor;
+        this.collectionName = options?.collectionName;
+        if (!this.collectionName) {
             if (typeof dataType === 'string')
-                this.$collectionName = dataType;
+                this.collectionName = dataType;
             if (typeof dataType === 'function') {
                 const metadata = Reflect.getMetadata(DATATYPE_METADATA, dataType);
                 if (metadata)
-                    this.$collectionName = metadata.name;
+                    this.collectionName = metadata.name;
             }
         }
-        this.$resourceName = options?.resourceName;
-        this.$idGenerator = options?.idGenerator;
+        this.resourceName = options?.resourceName;
+        this.idGenerator = options?.idGenerator;
     }
     /**
      * Retrieves the collection name.
@@ -42,7 +43,7 @@ export class MongoService extends ServiceBase {
      * @throws {Error} If the collection name is not defined.
      */
     getCollectionName() {
-        const out = typeof this.$collectionName === 'function' ? this.$collectionName(this) : this.$collectionName;
+        const out = typeof this.collectionName === 'function' ? this.collectionName(this) : this.collectionName;
         if (out)
             return out;
         throw new Error('collectionName is not defined');
@@ -52,53 +53,53 @@ export class MongoService extends ServiceBase {
      *
      * @protected
      * @returns {string} The resource name.
-     * @throws {Error} If the collection name is not defined.
+     * @throws {Error} If the resource name is not defined.
      */
     getResourceName() {
-        const out = typeof this.$resourceName === 'function'
-            ? this.$resourceName(this)
-            : this.$resourceName || this.getCollectionName();
+        const out = typeof this.resourceName === 'function' ? this.resourceName(this) : this.resourceName || this.getCollectionName();
         if (out)
             return out;
         throw new Error('resourceName is not defined');
     }
     /**
-     * Retrieves the data type of the document
+     * Retrieves the OPRA data type
      *
      * @throws {NotAcceptableError} If the data type is not a ComplexType.
      */
-    getDataType() {
-        return this.context.document.node.getComplexType(this._dataType);
+    get dataType() {
+        if (!this._dataType)
+            this._dataType = this.context.document.node.getComplexType(this._dataType_);
+        return this._dataType;
     }
     /**
-     * Retrieves the encoder for the specified operation.
+     * Retrieves the codec for the specified operation.
      *
      * @param operation - The operation to retrieve the encoder for. Valid values are 'create' and 'update'.
      */
-    getEncoder(operation) {
-        let encoder = this._encoders[operation];
-        if (encoder)
-            return encoder;
+    getInputCodec(operation) {
+        let validator = this._inputCodecs[operation];
+        if (validator)
+            return validator;
         const options = { projection: '*' };
         if (operation === 'update')
-            options.partial = true;
-        const dataType = this.getDataType();
-        encoder = dataType.generateCodec('encode', options);
-        this._encoders[operation] = encoder;
-        return encoder;
+            options.partial = 'deep';
+        const dataType = this.dataType;
+        validator = dataType.generateCodec('decode', options);
+        this._inputCodecs[operation] = validator;
+        return validator;
     }
     /**
-     * Retrieves the decoder.
+     * Retrieves the codec.
      */
-    getDecoder() {
-        let decoder = this._decoder;
-        if (decoder)
-            return decoder;
-        const options = { projection: '*', partial: true };
-        const dataType = this.getDataType();
-        decoder = dataType.generateCodec('decode', options);
-        this._decoder = decoder;
-        return decoder;
+    getOutputCodec(operation) {
+        let validator = this._outputCodecs[operation];
+        if (validator)
+            return validator;
+        const options = { projection: '*', partial: 'deep' };
+        const dataType = this.dataType;
+        validator = dataType.generateCodec('decode', options);
+        this._outputCodecs[operation] = validator;
+        return validator;
     }
     /**
      * Executes the provided function within a transaction.
@@ -111,7 +112,7 @@ export class MongoService extends ServiceBase {
         if (session)
             return callback(session);
         // Backup old session property
-        const hasOldSession = this.hasOwnProperty('session');
+        const hasOldSession = Object.prototype.hasOwnProperty.call(this, 'session');
         const oldSessionGetter = hasOldSession ? this.session : undefined;
         const db = this.getDatabase();
         const client = db.client;
@@ -364,8 +365,8 @@ export class MongoService extends ServiceBase {
      * @protected
      * @returns {MongoAdapter.AnyId} The generated ID.
      */
-    _generateId() {
-        return typeof this.$idGenerator === 'function' ? this.$idGenerator(this) : new ObjectId();
+    _generateId(command) {
+        return typeof this.idGenerator === 'function' ? this.idGenerator(command, this) : new ObjectId();
     }
     /**
      * Retrieves the common filter used for querying documents.
@@ -375,18 +376,29 @@ export class MongoService extends ServiceBase {
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    _getDocumentFilter(info) {
-        return typeof this.$documentFilter === 'function' ? this.$documentFilter(info, this) : this.$documentFilter;
+    _getDocumentFilter(command) {
+        return typeof this.documentFilter === 'function' ? this.documentFilter(command, this) : this.documentFilter;
     }
-    async _intercept(callback, info) {
+    async _executeCommand(command, commandFn) {
+        let proto;
+        const next = async () => {
+            proto = proto ? Object.getPrototypeOf(proto) : this;
+            while (proto) {
+                if (proto.interceptor && Object.prototype.hasOwnProperty.call(proto, 'interceptor')) {
+                    return await proto.interceptor.call(this, next, command, this);
+                }
+                proto = Object.getPrototypeOf(proto);
+                if (!(proto instanceof MongoService))
+                    break;
+            }
+            return commandFn();
+        };
         try {
-            if (this.$interceptor)
-                return this.$interceptor(callback, info, this);
-            return callback();
+            return await next();
         }
         catch (e) {
-            Error.captureStackTrace(e, this._intercept);
-            await this.$onError?.(e, this);
+            Error.captureStackTrace(e, this._executeCommand);
+            await this.onError?.(e, this);
             throw e;
         }
     }

package/esm/mongo-singleton-service.js

@@ -1,5 +1,5 @@
-import { ObjectId } from 'mongodb';
 import { ResourceNotAvailableError } from '@opra/common';
+import { ObjectId } from 'mongodb';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
@@ -18,12 +18,12 @@ export class MongoSingletonService extends MongoEntityService {
      */
     constructor(dataType, options) {
         super(dataType, options);
-        this._id = this._id || options?._id || new ObjectId('655608925cad472b75fc6485');
+        this._id = options?._id || new ObjectId('655608925cad472b75fc6485');
     }
     /**
      * Asserts the existence of a resource based on the given options.
      *
-     * @param {MongoSingletonService.ExistsOptions<T>} [options]
+     * @param {MongoEntityService.ExistsOptions<T>} [options]
      * @returns {Promise<void>} A Promise that resolves when the resource exists.
      * @throws {ResourceNotAvailableError} If the resource does not exist.
      */
@@ -35,72 +35,88 @@ export class MongoSingletonService extends MongoEntityService {
      * Creates the document in the database.
      *
      * @param {PartialDTO<T>} input - The partial input to create the document with.
-     * @param {MongoSingletonService.CreateOptions} [options] - The options for creating the document.
+     * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @return {Promise<PartialDTO<T>>} A promise that resolves to the partial output of the created document.
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.
      */
     async create(input, options) {
-        input._id = this._id;
-        const info = {
+        const command = {
             crud: 'create',
             method: 'create',
             byId: false,
-            documentId: this._id,
             input,
             options,
         };
-        return this._intercept(() => this._create(input, options), info);
+        input._id = this._id;
+        return this._executeCommand(command, () => this._create(command));
     }
     /**
      * Deletes a record from the database
      *
-     * @param {MongoSingletonService.DeleteOptions<T>} options - The options for deleting the record
+     * @param {MongoEntityService.DeleteOptions<T>} options - The options for deleting the record
      * @returns {Promise<number>} The number of records deleted
      */
     async delete(options) {
-        const info = {
+        const command = {
             crud: 'delete',
             method: 'delete',
             byId: true,
             documentId: this._id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._delete(this._id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._delete(command);
+        });
     }
     /**
      * Checks if the document exists in the database.
      *
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @return {Promise<boolean>} - A promise that resolves to a boolean value indicating if the document exists.
      */
     async exists(options) {
-        return !!(await this.find({ ...options, projection: ['_id'], skip: undefined }));
+        const command = {
+            crud: 'read',
+            method: 'exists',
+            byId: true,
+            documentId: this._id,
+            options,
+        };
+        return this._executeCommand(command, async () => {
+            const documentFilter = await this._getDocumentFilter(command);
+            const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+            const findCommand = command;
+            findCommand.options = { ...command.options, filter, projection: ['_id'] };
+            return !!(await this._findById(findCommand));
+        });
     }
     /**
      * Fetches the document if it exists. Returns undefined if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} [options] - The options for finding the document.
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @returns {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the found document or undefined if not found.
      */
     async find(options) {
-        const info = {
+        const command = {
             crud: 'read',
-            method: 'findOne',
+            method: 'findById',
             byId: true,
             documentId: this._id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._findById(this._id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const documentFilter = await this._getDocumentFilter(command);
+            const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findById(command);
+        });
     }
     /**
      * Fetches the document from the Mongo collection service. Throws error if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} options - The options to customize the query.
+     * @param {MongoEntityService.FindOneOptions<T>} options - The options to customize the query.
      * @return {Promise<PartialDTO<T>>} - A promise that resolves to the fetched document.
      * @throws {ResourceNotAvailableError} - If the document is not found in the collection.
      */
@@ -114,44 +130,48 @@ export class MongoSingletonService extends MongoEntityService {
      * Updates a document in the MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
      */
-    async updateOnly(input, options) {
-        const info = {
+    async update(input, options) {
+        const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
+        const command = {
             crud: 'update',
             method: 'update',
-            byId: true,
             documentId: this._id,
-            input,
+            byId: true,
+            input: isUpdateFilter ? undefined : input,
+            inputRaw: isUpdateFilter ? input : undefined,
             options,
         };
-        return this._intercept(async () => {
-            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._updateOnly(this._id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._update(command);
+        });
     }
     /**
      * Updates a document in the MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
      */
-    async update(input, options) {
-        const info = {
+    async updateOnly(input, options) {
+        const command = {
             crud: 'update',
-            method: 'update',
-            byId: true,
+            method: 'updateOnly',
             documentId: this._id,
+            byId: true,
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._update(this._id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateOnly(command);
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.31",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -17,22 +17,29 @@
     "build:esm": "tsc -b tsconfig-build-esm.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/mongodb && cp ../../package.cjs.json ../../build/mongodb/cjs/package.json",
     "lint": "eslint . --max-warnings=0",
+    "lint:fix": "eslint . --max-warnings=0 --fix",
     "format": "prettier . --write --log-level=warn",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "test": "jest --passWithNoTests",
+    "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
     "clean:dist": "rimraf ../../build/mongodb",
     "clean:cover": "rimraf ../../coverage/mongodb"
   },
+  "dependencies": {
+    "lodash.omit": "^4.5.0",
+    "putil-isplainobject": "^1.1.5",
+    "tslib": "^2.6.3",
+    "valgen": "^5.6.0"
+  },
   "devDependencies": {
     "@faker-js/faker": "^8.4.1",
-    "mongodb": "^6.7.0",
+    "mongodb": "^6.8.0",
     "ts-gems": "^3.4.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.0.0-alpha.3",
-    "@opra/core": "^1.0.0-alpha.3",
+    "@opra/common": "^1.0.0-alpha.31",
+    "@opra/core": "^1.0.0-alpha.31",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

package/types/adapter-utils/prepare-projection.d.ts

@@ -1,4 +1,4 @@
-import mongodb, { Document } from 'mongodb';
 import { ComplexType, FieldsProjection } from '@opra/common';
+import mongodb, { Document } from 'mongodb';
 export default function prepareProjection(dataType: ComplexType, projection?: string | string[] | Document): mongodb.Document | undefined;
 export declare function prepare(dataType: ComplexType, target: mongodb.Document, projection?: FieldsProjection): void;

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from './mongo-adapter.js';
-export * from './mongo-nested-service.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-adapter.d.ts

@@ -1,6 +1,6 @@
-import mongodb, { ClientSession, ObjectId } from 'mongodb';
 import { OpraFilter } from '@opra/common';
 import { HttpContext } from '@opra/core';
+import mongodb, { ClientSession, ObjectId } from 'mongodb';
 import _prepareFilter from './adapter-utils/prepare-filter.js';
 import _prepareKeyValues from './adapter-utils/prepare-key-values.js';
 import _preparePatch from './adapter-utils/prepare-patch.js';