@opra/mongodb 1.2.1 → 1.2.2

package/cjs/adapter-utils/prepare-key-values.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = prepareKeyValues;
-const tslib_1 = require("tslib");
-const putil_isplainobject_1 = tslib_1.__importDefault(require("putil-isplainobject"));
+const objects_1 = require("@jsopen/objects");
 const defaultPrimaryKey = ['_id'];
 function prepareKeyValues(keyValue, primaryKey) {
     primaryKey = primaryKey || defaultPrimaryKey;
-    const b = (0, putil_isplainobject_1.default)(keyValue);
+    const b = (0, objects_1.isPlainObject)(keyValue);
     if (primaryKey.length > 1 && !b) {
         throw new TypeError(`Argument "keyValue" must be an object that contains all key values`);
     }

package/cjs/adapter-utils/prepare-patch.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = preparePatch;
-const common_1 = require("@opra/common");
+const objects_1 = require("@jsopen/objects");
 function preparePatch(doc, options) {
     const trg = {};
     _preparePatch(doc, trg, '', options);
@@ -23,7 +23,7 @@ function _preparePatch(src, trg, path, options) {
             trg.$unset[field] = '';
             continue;
         }
-        if (v && typeof v === 'object' && !(0, common_1.isBuiltInObject)(v)) {
+        if (v && typeof v === 'object' && !(0, objects_1.isBuiltIn)(v)) {
             // If field name starts with "*", do "replace" operation except "merge"
             if (!k.startsWith('*')) {
                 _preparePatch(v, trg, key);

package/cjs/mongo-collection-service.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCollectionService = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 const mongo_entity_service_js_1 = require("./mongo-entity-service.js");
 /**
@@ -53,7 +51,7 @@ class MongoCollectionService extends mongo_entity_service_js_1.MongoEntityServic
                 crud: 'read',
                 byId: true,
                 documentId: r._id,
-                options: (0, lodash_omit_1.default)(options, 'filter'),
+                options,
             };
             const out = await this._findById(findCommand);
             if (out)

package/cjs/mongo-entity-service.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoEntityService = void 0;
-const tslib_1 = require("tslib");
+const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const valgen_1 = require("valgen");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 const mongo_service_js_1 = require("./mongo-service.js");
@@ -196,7 +195,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...(0, lodash_omit_1.default)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
+            ...(0, objects_1.omit)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         /** Execute db command */
@@ -224,9 +223,6 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
         const dataStages = [];
         const countStages = [];
-        if (filter)
-            countStages.push({ $match: filter });
-        countStages.push({ $count: 'totalMatches' });
         const stages = [
             {
                 $facet: {
@@ -235,15 +231,25 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
                 },
             },
         ];
-        if (filter)
+        /** Pre-Stages */
+        if (options?.preStages)
+            dataStages.push(...options.preStages);
+        /** Filter */
+        if (filter) {
+            countStages.push({ $match: filter });
             dataStages.push({ $match: filter });
-        if (options?.skip)
-            dataStages.push({ $skip: options.skip });
+        }
+        countStages.push({ $count: 'totalMatches' });
+        /** Sort */
         if (options?.sort) {
             const sort = mongo_adapter_js_1.MongoAdapter.prepareSort(options.sort);
             if (sort)
                 dataStages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            dataStages.push({ $skip: options.skip });
+        /** Limit */
         dataStages.push({ $limit: limit });
         const dataType = this.dataType;
         const projection = mongo_adapter_js_1.MongoAdapter.prepareProjection(dataType, options?.projection);
@@ -254,7 +260,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...(0, lodash_omit_1.default)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
+            ...(0, objects_1.omit)(options, ['projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         /** Fetch the cursor and decode the result objects */
@@ -402,7 +408,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         return (await collection.updateMany(filter || {}, update, {
-            ...(0, lodash_omit_1.default)(options, 'filter'),
+            ...(0, objects_1.omit)(options, ['filter']),
             session: options?.session ?? this.getSession(),
             upsert: false,
         })).matchedCount;

package/cjs/mongo-nested-service.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoNestedService = void 0;
-const tslib_1 = require("tslib");
+const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const valgen_1 = require("valgen");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 const mongo_service_js_1 = require("./mongo-service.js");
@@ -178,7 +177,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...(0, objects_1.omit)(options, ['documentFilter', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -433,26 +432,36 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
             { $unwind: { path: '$' + this.fieldName } },
             { $replaceRoot: { newRoot: '$' + this.fieldName } },
         ];
+        /** Pre-Stages */
+        if (options?.preStages)
+            stages.push(...options.preStages);
+        /** Filter */
         if (options?.filter || options?.nestedFilter) {
             const optionsFilter = mongo_adapter_js_1.MongoAdapter.prepareFilter([options?.filter, options.nestedFilter]);
             stages.push({ $match: optionsFilter });
         }
-        if (options?.skip)
-            stages.push({ $skip: options.skip });
+        /** Sort */
         if (options?.sort) {
             const sort = mongo_adapter_js_1.MongoAdapter.prepareSort(options.sort);
             if (sort)
                 stages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            stages.push({ $skip: options.skip });
+        /** Limit */
         stages.push({ $limit: limit });
         const dataType = this.dataType;
         const projection = mongo_adapter_js_1.MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
             stages.push({ $project: projection });
+        /** Post-Stages */
+        if (options?.postStages)
+            stages.push(...options.postStages);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...(0, objects_1.omit)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -504,18 +513,28 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
                 },
             },
         ];
+        /** Pre-Stages */
+        if (options?.preStages)
+            dataStages.push(...options.preStages);
+        /** Filter */
         if (options?.filter || options?.nestedFilter) {
             const optionsFilter = mongo_adapter_js_1.MongoAdapter.prepareFilter([options?.filter, options?.nestedFilter]);
             dataStages.push({ $match: optionsFilter });
         }
-        if (options?.skip)
-            dataStages.push({ $skip: options.skip });
+        /** Sort */
         if (options?.sort) {
             const sort = mongo_adapter_js_1.MongoAdapter.prepareSort(options.sort);
             if (sort)
                 dataStages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            dataStages.push({ $skip: options.skip });
+        /** Limit */
         dataStages.push({ $limit: limit });
+        /** Post-Stages */
+        if (options?.postStages)
+            dataStages.push(...options.postStages);
         const dataType = this.dataType;
         const projection = mongo_adapter_js_1.MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
@@ -523,7 +542,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...(0, lodash_omit_1.default)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...(0, objects_1.omit)(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {

package/cjs/mongo-singleton-service.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoSingletonService = void 0;
-const tslib_1 = require("tslib");
+const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const mongodb_1 = require("mongodb");
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 const mongo_entity_service_js_1 = require("./mongo-entity-service.js");
@@ -54,7 +53,7 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
                 crud: 'read',
                 byId: true,
                 documentId: r._id,
-                options: (0, lodash_omit_1.default)(options, 'filter'),
+                options,
             };
             const out = await this._findById(findCommand);
             if (out)
@@ -64,7 +63,7 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
     /**
      * Creates the document in the database.
      *
-     * @param {DTO<T>} input - The partial input to create the document with.
+     * @param {PartialDTO<T>} input - The partial input to create the document with.
      * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @returns {Promise<T>} A promise that resolves create operation result
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.
@@ -164,7 +163,7 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
                     crud: 'read',
                     byId: true,
                     documentId: this._id,
-                    options: (0, lodash_omit_1.default)(options, ['filter', 'sort']),
+                    options: (0, objects_1.omit)(options, ['filter', 'sort']),
                 };
                 const out = await this._findById(findCommand);
                 if (out)

package/esm/adapter-utils/prepare-key-values.js

@@ -1,4 +1,4 @@
-import isPlainObject from 'putil-isplainobject';
+import { isPlainObject } from '@jsopen/objects';
 const defaultPrimaryKey = ['_id'];
 export default function prepareKeyValues(keyValue, primaryKey) {
     primaryKey = primaryKey || defaultPrimaryKey;

package/esm/adapter-utils/prepare-patch.js

@@ -1,4 +1,4 @@
-import { isBuiltInObject } from '@opra/common';
+import { isBuiltIn } from '@jsopen/objects';
 export default function preparePatch(doc, options) {
     const trg = {};
     _preparePatch(doc, trg, '', options);
@@ -20,7 +20,7 @@ function _preparePatch(src, trg, path, options) {
             trg.$unset[field] = '';
             continue;
         }
-        if (v && typeof v === 'object' && !isBuiltInObject(v)) {
+        if (v && typeof v === 'object' && !isBuiltIn(v)) {
             // If field name starts with "*", do "replace" operation except "merge"
             if (!k.startsWith('*')) {
                 _preparePatch(v, trg, key);

package/esm/mongo-collection-service.js

@@ -1,5 +1,4 @@
 import { ResourceNotAvailableError } from '@opra/common';
-import omit from 'lodash.omit';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
@@ -49,7 +48,7 @@ export class MongoCollectionService extends MongoEntityService {
                 crud: 'read',
                 byId: true,
                 documentId: r._id,
-                options: omit(options, 'filter'),
+                options,
             };
             const out = await this._findById(findCommand);
             if (out)

package/esm/mongo-entity-service.js

@@ -1,5 +1,5 @@
+import { omit } from '@jsopen/objects';
 import { InternalServerError } from '@opra/common';
-import omit from 'lodash.omit';
 import { isNotNullish } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoService } from './mongo-service.js';
@@ -220,9 +220,6 @@ export class MongoEntityService extends MongoService {
             filter = MongoAdapter.prepareFilter(options?.filter);
         const dataStages = [];
         const countStages = [];
-        if (filter)
-            countStages.push({ $match: filter });
-        countStages.push({ $count: 'totalMatches' });
         const stages = [
             {
                 $facet: {
@@ -231,15 +228,25 @@ export class MongoEntityService extends MongoService {
                 },
             },
         ];
-        if (filter)
+        /** Pre-Stages */
+        if (options?.preStages)
+            dataStages.push(...options.preStages);
+        /** Filter */
+        if (filter) {
+            countStages.push({ $match: filter });
             dataStages.push({ $match: filter });
-        if (options?.skip)
-            dataStages.push({ $skip: options.skip });
+        }
+        countStages.push({ $count: 'totalMatches' });
+        /** Sort */
         if (options?.sort) {
             const sort = MongoAdapter.prepareSort(options.sort);
             if (sort)
                 dataStages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            dataStages.push({ $skip: options.skip });
+        /** Limit */
         dataStages.push({ $limit: limit });
         const dataType = this.dataType;
         const projection = MongoAdapter.prepareProjection(dataType, options?.projection);
@@ -398,7 +405,7 @@ export class MongoEntityService extends MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         return (await collection.updateMany(filter || {}, update, {
-            ...omit(options, 'filter'),
+            ...omit(options, ['filter']),
             session: options?.session ?? this.getSession(),
             upsert: false,
         })).matchedCount;

package/esm/mongo-nested-service.js

@@ -1,5 +1,5 @@
+import { omit } from '@jsopen/objects';
 import { ComplexType, NotAcceptableError, ResourceNotAvailableError } from '@opra/common';
-import omit from 'lodash.omit';
 import { isNotNullish } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoService } from './mongo-service.js';
@@ -174,7 +174,7 @@ export class MongoNestedService extends MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...omit(options, ['documentFilter', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -429,26 +429,36 @@ export class MongoNestedService extends MongoService {
             { $unwind: { path: '$' + this.fieldName } },
             { $replaceRoot: { newRoot: '$' + this.fieldName } },
         ];
+        /** Pre-Stages */
+        if (options?.preStages)
+            stages.push(...options.preStages);
+        /** Filter */
         if (options?.filter || options?.nestedFilter) {
             const optionsFilter = MongoAdapter.prepareFilter([options?.filter, options.nestedFilter]);
             stages.push({ $match: optionsFilter });
         }
-        if (options?.skip)
-            stages.push({ $skip: options.skip });
+        /** Sort */
         if (options?.sort) {
             const sort = MongoAdapter.prepareSort(options.sort);
             if (sort)
                 stages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            stages.push({ $skip: options.skip });
+        /** Limit */
         stages.push({ $limit: limit });
         const dataType = this.dataType;
         const projection = MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
             stages.push({ $project: projection });
+        /** Post-Stages */
+        if (options?.postStages)
+            stages.push(...options.postStages);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -500,18 +510,28 @@ export class MongoNestedService extends MongoService {
                 },
             },
         ];
+        /** Pre-Stages */
+        if (options?.preStages)
+            dataStages.push(...options.preStages);
+        /** Filter */
         if (options?.filter || options?.nestedFilter) {
             const optionsFilter = MongoAdapter.prepareFilter([options?.filter, options?.nestedFilter]);
             dataStages.push({ $match: optionsFilter });
         }
-        if (options?.skip)
-            dataStages.push({ $skip: options.skip });
+        /** Sort */
         if (options?.sort) {
             const sort = MongoAdapter.prepareSort(options.sort);
             if (sort)
                 dataStages.push({ $sort: sort });
         }
+        /** Skip */
+        if (options?.skip)
+            dataStages.push({ $skip: options.skip });
+        /** Limit */
         dataStages.push({ $limit: limit });
+        /** Post-Stages */
+        if (options?.postStages)
+            dataStages.push(...options.postStages);
         const dataType = this.dataType;
         const projection = MongoAdapter.prepareProjection(dataType, options?.projection);
         if (projection)
@@ -519,7 +539,7 @@ export class MongoNestedService extends MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter', 'count']),
+            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
             session: options?.session ?? this.getSession(),
         });
         try {

package/esm/mongo-singleton-service.js

@@ -1,5 +1,5 @@
+import { omit } from '@jsopen/objects';
 import { ResourceNotAvailableError } from '@opra/common';
-import omit from 'lodash.omit';
 import { ObjectId } from 'mongodb';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
@@ -50,7 +50,7 @@ export class MongoSingletonService extends MongoEntityService {
                 crud: 'read',
                 byId: true,
                 documentId: r._id,
-                options: omit(options, 'filter'),
+                options,
             };
             const out = await this._findById(findCommand);
             if (out)
@@ -60,7 +60,7 @@ export class MongoSingletonService extends MongoEntityService {
     /**
      * Creates the document in the database.
      *
-     * @param {DTO<T>} input - The partial input to create the document with.
+     * @param {PartialDTO<T>} input - The partial input to create the document with.
      * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @returns {Promise<T>} A promise that resolves create operation result
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "lodash.omit": "^4.5.0",
-    "putil-isplainobject": "^1.1.5",
+    "@jsopen/objects": "^1.4.2",
     "tslib": "^2.8.1",
     "valgen": "^5.12.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.2.1",
-    "@opra/core": "^1.2.1",
-    "@opra/http": "^1.2.1",
+    "@opra/common": "^1.2.2",
+    "@opra/core": "^1.2.2",
+    "@opra/http": "^1.2.2",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

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

@@ -31,8 +31,6 @@ export declare namespace MongoEntityService {
     interface FindOneOptions<T> extends MongoService.FindOneOptions<T> {
     }
     interface FindManyOptions<T> extends MongoService.FindManyOptions<T> {
-        preStages?: mongodb.Document[];
-        postStages?: mongodb.Document[];
     }
     interface ReplaceOptions<T> extends MongoService.ReplaceOptions<T> {
     }

package/types/mongo-service.d.ts

@@ -103,6 +103,8 @@ export declare namespace MongoService {
         sort?: string[];
         limit?: number;
         skip?: number;
+        preStages?: mongodb.Document[];
+        postStages?: mongodb.Document[];
     }
     /**
      * Represents options for "replace" operation

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

@@ -58,7 +58,7 @@ export declare class MongoSingletonService<T extends mongodb.Document> extends M
     /**
      * Creates the document in the database.
      *
-     * @param {DTO<T>} input - The partial input to create the document with.
+     * @param {PartialDTO<T>} input - The partial input to create the document with.
      * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @returns {Promise<T>} A promise that resolves create operation result
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.