@opra/mongodb 1.0.0-alpha.6 → 1.0.0-alpha.8

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

@@ -167,6 +167,8 @@ function prepareFilterAst(ast, negative) {
                         },
                     }, !negative),
                 };
+            default:
+                break;
         }
         throw new Error(`Unimplemented ComparisonExpression operation (right side is ${ast.right.kind})`);
     }

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

@@ -6,13 +6,14 @@ const defaultPrimaryKey = ['_id'];
 function prepareKeyValues(keyValue, primaryKey) {
     primaryKey = primaryKey || defaultPrimaryKey;
     const b = (0, putil_isplainobject_1.default)(keyValue);
-    if (primaryKey.length > 1 && !b)
-        new TypeError(`Argument "keyValue" must be an object that contains all key values`);
+    if (primaryKey.length > 1 && !b) {
+        throw new TypeError(`Argument "keyValue" must be an object that contains all key values`);
+    }
     if (primaryKey.length > 1 || b) {
         return primaryKey.reduce((o, k) => {
             o[k] = keyValue[k];
             if (o[k] == null)
-                new Error(`Value of key "${k}" is required`);
+                throw new Error(`Value of key "${k}" is required`);
             return o;
         }, {});
     }

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

@@ -7,10 +7,11 @@ function preparePatch(doc, options) {
     return trg;
 }
 exports.default = preparePatch;
-function _preparePatch(src, trg = {}, path, options) {
+function _preparePatch(src, trg, path, options) {
     let f;
     let key;
     let field;
+    trg = trg || {};
     const fieldPrefix = options?.fieldPrefix;
     for (const [k, v] of Object.entries(src)) {
         f = k.startsWith('*') ? k.substring(1) : k;

package/cjs/index.js

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

package/cjs/mongo-adapter.js

@@ -77,6 +77,8 @@ var MongoAdapter;
                     };
                     return { method: 'updateMany', data, options };
                 }
+                default:
+                    break;
             }
         }
         throw new Error(`This operation is not compatible to MongoDB adapter`);

package/cjs/mongo-collection-service.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCollectionService = void 0;
-const mongodb_1 = require("mongodb");
 const common_1 = require("@opra/common");
+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");
 /**

package/cjs/mongo-entity-service.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoEntityService = void 0;
 const tslib_1 = require("tslib");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const assert = tslib_1.__importStar(require("node:assert"));
 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_service_js_1 = require("./mongo-service.js");
 /**
@@ -239,8 +239,9 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
     async _update(id, input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');
@@ -274,8 +275,9 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
     async _updateOnly(id, input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');
@@ -307,8 +309,9 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
     async _updateMany(input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');

package/cjs/mongo-nested-service.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoNestedService = void 0;
 const tslib_1 = require("tslib");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 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_service_js_1 = require("./mongo-service.js");
 /**
@@ -50,8 +50,9 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
      * @throws {ResourceNotAvailableError} - If the resource does not exist.
      */
     async assert(documentId, id, options) {
-        if (!(await this.exists(documentId, id, options)))
+        if (!(await this.exists(documentId, id, options))) {
             throw new common_1.ResourceNotAvailableError(this.getResourceName() + '.' + this.nestedKey, documentId + '/' + id);
+        }
     }
     /**
      * Adds a single item into the array field.
@@ -457,8 +458,9 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
      */
     async get(documentId, nestedId, options) {
         const out = await this.findById(documentId, nestedId, options);
-        if (!out)
+        if (!out) {
             throw new common_1.ResourceNotAvailableError(this.getResourceName() + '.' + this.nestedKey, documentId + '/' + nestedId);
+        }
         return out;
     }
     /**

package/cjs/mongo-service.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoService = void 0;
-const mongodb_1 = require("mongodb");
 const common_1 = require("@opra/common");
 const core_1 = require("@opra/core");
+const mongodb_1 = require("mongodb");
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -117,7 +117,7 @@ class MongoService extends core_1.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;

package/cjs/mongo-singleton-service.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoSingletonService = void 0;
-const mongodb_1 = require("mongodb");
 const common_1 = require("@opra/common");
+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");
 /**

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

@@ -164,6 +164,8 @@ function prepareFilterAst(ast, negative) {
                         },
                     }, !negative),
                 };
+            default:
+                break;
         }
         throw new Error(`Unimplemented ComparisonExpression operation (right side is ${ast.right.kind})`);
     }

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

@@ -3,13 +3,14 @@ const defaultPrimaryKey = ['_id'];
 export default function prepareKeyValues(keyValue, primaryKey) {
     primaryKey = primaryKey || defaultPrimaryKey;
     const b = isPlainObject(keyValue);
-    if (primaryKey.length > 1 && !b)
-        new TypeError(`Argument "keyValue" must be an object that contains all key values`);
+    if (primaryKey.length > 1 && !b) {
+        throw new TypeError(`Argument "keyValue" must be an object that contains all key values`);
+    }
     if (primaryKey.length > 1 || b) {
         return primaryKey.reduce((o, k) => {
             o[k] = keyValue[k];
             if (o[k] == null)
-                new Error(`Value of key "${k}" is required`);
+                throw new Error(`Value of key "${k}" is required`);
             return o;
         }, {});
     }

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

@@ -4,10 +4,11 @@ export default function preparePatch(doc, options) {
     trg.$set = trg.$set || {};
     return trg;
 }
-function _preparePatch(src, trg = {}, path, options) {
+function _preparePatch(src, trg, path, options) {
     let f;
     let key;
     let field;
+    trg = trg || {};
     const fieldPrefix = options?.fieldPrefix;
     for (const [k, v] of Object.entries(src)) {
         f = k.startsWith('*') ? k.substring(1) : k;

package/esm/index.js

@@ -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/esm/mongo-adapter.js

@@ -73,6 +73,8 @@ export var MongoAdapter;
                     };
                     return { method: 'updateMany', data, options };
                 }
+                default:
+                    break;
             }
         }
         throw new Error(`This operation is not compatible to MongoDB adapter`);

package/esm/mongo-collection-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';
 /**

package/esm/mongo-entity-service.js

@@ -1,6 +1,6 @@
-import omit from 'lodash.omit';
 import * as assert from 'node:assert';
 import { InternalServerError } from '@opra/common';
+import omit from 'lodash.omit';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoService } from './mongo-service.js';
 /**
@@ -235,8 +235,9 @@ export class MongoEntityService extends MongoService {
     async _update(id, input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');
@@ -270,8 +271,9 @@ export class MongoEntityService extends MongoService {
     async _updateOnly(id, input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');
@@ -303,8 +305,9 @@ export class MongoEntityService extends MongoService {
     async _updateMany(input, options) {
         const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
         const isDocument = !Array.isArray(input) && !!Object.keys(input).find(x => !x.startsWith('$'));
-        if (isUpdateFilter && isDocument)
+        if (isUpdateFilter && isDocument) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
         let update;
         if (isDocument) {
             const inputCodec = this.getInputCodec('update');

package/esm/mongo-nested-service.js

@@ -1,5 +1,5 @@
-import omit from 'lodash.omit';
 import { ComplexType, NotAcceptableError, ResourceNotAvailableError } from '@opra/common';
+import omit from 'lodash.omit';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoService } from './mongo-service.js';
 /**
@@ -46,8 +46,9 @@ export class MongoNestedService extends MongoService {
      * @throws {ResourceNotAvailableError} - If the resource does not exist.
      */
     async assert(documentId, id, options) {
-        if (!(await this.exists(documentId, id, options)))
+        if (!(await this.exists(documentId, id, options))) {
             throw new ResourceNotAvailableError(this.getResourceName() + '.' + this.nestedKey, documentId + '/' + id);
+        }
     }
     /**
      * Adds a single item into the array field.
@@ -453,8 +454,9 @@ export class MongoNestedService extends MongoService {
      */
     async get(documentId, nestedId, options) {
         const out = await this.findById(documentId, nestedId, options);
-        if (!out)
+        if (!out) {
             throw new ResourceNotAvailableError(this.getResourceName() + '.' + this.nestedKey, documentId + '/' + nestedId);
+        }
         return out;
     }
     /**

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
@@ -114,7 +114,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;

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';
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.8",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -17,6 +17,7 @@
     "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 --passWithNoTests",
     "cover": "jest --passWithNoTests --collect-coverage",
@@ -25,14 +26,18 @@
     "clean:dist": "rimraf ../../build/mongodb",
     "clean:cover": "rimraf ../../coverage/mongodb"
   },
+  "dependencies": {
+    "lodash.omit": "^4.5.0",
+    "putil-isplainobject": "^1.1.5"
+  },
   "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.6",
-    "@opra/core": "^1.0.0-alpha.6",
+    "@opra/common": "^1.0.0-alpha.8",
+    "@opra/core": "^1.0.0-alpha.8",
     "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';

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

@@ -1,6 +1,6 @@
+import { ComplexType } from '@opra/common';
 import mongodb from 'mongodb';
 import { PartialDTO, PatchDTO, Type } from 'ts-gems';
-import { ComplexType } from '@opra/common';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoCollectionService } from './mongo-collection-service.js';
 import { MongoService } from './mongo-service.js';

package/types/mongo-service.d.ts

@@ -1,9 +1,9 @@
-import mongodb, { Document, TransactionOptions } from 'mongodb';
-import { PartialDTO, StrictOmit, Type } from 'ts-gems';
-import { IsObject } from 'valgen';
 import * as OpraCommon from '@opra/common';
 import { ComplexType } from '@opra/common';
 import { ServiceBase } from '@opra/core';
+import mongodb, { Document, TransactionOptions } from 'mongodb';
+import { PartialDTO, StrictOmit, Type } from 'ts-gems';
+import { IsObject } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
 /**
  * The namespace for the MongoService.