@opra/mongodb 0.31.5 → 0.31.7

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

@@ -1,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function preparePatch(doc) {
+function preparePatch(doc, options) {
     const trg = {};
-    _preparePatch(doc, trg);
+    _preparePatch(doc, trg, '', options);
     return trg;
 }
 exports.default = preparePatch;
-function _preparePatch(src, trg = {}, path = '') {
-    let fieldName;
+function _preparePatch(src, trg = {}, path, options) {
+    let f;
+    let key;
+    let field;
+    const fieldPrefix = options?.fieldPrefix;
     for (const [k, v] of Object.entries(src)) {
-        fieldName = k.startsWith('*') ? k.substring(1) : k;
-        const key = path ? path + '.' + fieldName : fieldName;
+        f = k.startsWith('*') ? k.substring(1) : k;
+        key = path ? path + '.' + f : f;
+        field = (fieldPrefix ? fieldPrefix : '') + key;
         if (v == null) {
             trg.$unset = trg.$unset || {};
-            trg.$unset[key] = '';
+            trg.$unset[field] = '';
             continue;
         }
         if (v && typeof v === 'object') {
@@ -24,7 +28,7 @@ function _preparePatch(src, trg = {}, path = '') {
             }
         }
         trg.$set = trg.$set || {};
-        trg.$set[key] = v;
+        trg.$set[field] = v;
     }
     return trg;
 }

package/cjs/mongo-collection-service.js

@@ -105,20 +105,21 @@ class MongoCollectionService extends mongo_service_js_1.MongoService {
         // Prevent updating _id field
         delete doc._id;
         const patch = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
+        patch.$set = patch.$set || {};
         const mongoOptions = {
             ...options,
             upsert: undefined
         };
         const r = await this._rawUpdateOne(filter, patch, mongoOptions);
-        if (r.modifiedCount)
-            return await this.get(filter, options);
         if (r.upsertedCount)
             return await this.get(r.upsertedId, options);
+        return await this.get(id, options);
     }
     async updateMany(doc, options) {
         // Prevent updating _id field
         delete doc._id;
         const patch = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
+        patch.$set = patch.$set || {};
         const mongoOptions = {
             ...(0, lodash_omit_1.default)(options, 'filter'),
             upsert: undefined

package/cjs/mongo-service.js

@@ -7,8 +7,8 @@ class MongoService extends core_1.ApiService {
     constructor(dataType, options) {
         super();
         this._dataType = dataType;
-        this.collectionName = options?.collectionName;
         this.db = options?.db;
+        this.collectionName = options?.collectionName || options?.resourceName;
         if (!this.collectionName) {
             if (typeof dataType === 'string')
                 this.collectionName = dataType;
@@ -20,12 +20,8 @@ class MongoService extends core_1.ApiService {
         }
         this.resourceName = options?.resourceName || this.collectionName;
     }
-    forContext(context, options) {
-        return super.forContext(context, {
-            newInstance: options?.newInstance ||
-                (options?.db && this.db !== options?.db) ||
-                (options?.session && this.session !== options?.session)
-        });
+    forContext(arg0, attributes) {
+        return super.forContext(arg0, attributes);
     }
     async _rawInsertOne(doc, options) {
         const db = await this.getDatabase();
@@ -171,5 +167,10 @@ class MongoService extends core_1.ApiService {
             return this.collectionName;
         throw new Error('collectionName is not defined');
     }
+    _cacheMatch(service, context, attributes) {
+        return super._cacheMatch(service, context, attributes) &&
+            (!attributes?.db || service.db === attributes.db) &&
+            (!attributes?.session || this.session === attributes?.session);
+    }
 }
 exports.MongoService = MongoService;

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

@@ -1,16 +1,20 @@
-export default function preparePatch(doc) {
+export default function preparePatch(doc, options) {
     const trg = {};
-    _preparePatch(doc, trg);
+    _preparePatch(doc, trg, '', options);
     return trg;
 }
-function _preparePatch(src, trg = {}, path = '') {
-    let fieldName;
+function _preparePatch(src, trg = {}, path, options) {
+    let f;
+    let key;
+    let field;
+    const fieldPrefix = options?.fieldPrefix;
     for (const [k, v] of Object.entries(src)) {
-        fieldName = k.startsWith('*') ? k.substring(1) : k;
-        const key = path ? path + '.' + fieldName : fieldName;
+        f = k.startsWith('*') ? k.substring(1) : k;
+        key = path ? path + '.' + f : f;
+        field = (fieldPrefix ? fieldPrefix : '') + key;
         if (v == null) {
             trg.$unset = trg.$unset || {};
-            trg.$unset[key] = '';
+            trg.$unset[field] = '';
             continue;
         }
         if (v && typeof v === 'object') {
@@ -21,7 +25,7 @@ function _preparePatch(src, trg = {}, path = '') {
             }
         }
         trg.$set = trg.$set || {};
-        trg.$set[key] = v;
+        trg.$set[field] = v;
     }
     return trg;
 }

package/esm/mongo-collection-service.js

@@ -101,20 +101,21 @@ export class MongoCollectionService extends MongoService {
         // Prevent updating _id field
         delete doc._id;
         const patch = MongoAdapter.preparePatch(doc);
+        patch.$set = patch.$set || {};
         const mongoOptions = {
             ...options,
             upsert: undefined
         };
         const r = await this._rawUpdateOne(filter, patch, mongoOptions);
-        if (r.modifiedCount)
-            return await this.get(filter, options);
         if (r.upsertedCount)
             return await this.get(r.upsertedId, options);
+        return await this.get(id, options);
     }
     async updateMany(doc, options) {
         // Prevent updating _id field
         delete doc._id;
         const patch = MongoAdapter.preparePatch(doc);
+        patch.$set = patch.$set || {};
         const mongoOptions = {
             ...omit(options, 'filter'),
             upsert: undefined

package/esm/mongo-service.js

@@ -4,8 +4,8 @@ export class MongoService extends ApiService {
     constructor(dataType, options) {
         super();
         this._dataType = dataType;
-        this.collectionName = options?.collectionName;
         this.db = options?.db;
+        this.collectionName = options?.collectionName || options?.resourceName;
         if (!this.collectionName) {
             if (typeof dataType === 'string')
                 this.collectionName = dataType;
@@ -17,12 +17,8 @@ export class MongoService extends ApiService {
         }
         this.resourceName = options?.resourceName || this.collectionName;
     }
-    forContext(context, options) {
-        return super.forContext(context, {
-            newInstance: options?.newInstance ||
-                (options?.db && this.db !== options?.db) ||
-                (options?.session && this.session !== options?.session)
-        });
+    forContext(arg0, attributes) {
+        return super.forContext(arg0, attributes);
     }
     async _rawInsertOne(doc, options) {
         const db = await this.getDatabase();
@@ -168,4 +164,9 @@ export class MongoService extends ApiService {
             return this.collectionName;
         throw new Error('collectionName is not defined');
     }
+    _cacheMatch(service, context, attributes) {
+        return super._cacheMatch(service, context, attributes) &&
+            (!attributes?.db || service.db === attributes.db) &&
+            (!attributes?.session || this.session === attributes?.session);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "0.31.5",
+  "version": "0.31.7",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -24,17 +24,16 @@
     "clean:dist": "rimraf ../../build/mongodb",
     "clean:cover": "rimraf ../../coverage/mongodb"
   },
-  "dependencies": {},
   "devDependencies": {
     "@faker-js/faker": "^8.3.1",
     "@types/lodash.isnil": "^4.0.9",
     "@types/lodash.omitby": "^4.6.9",
-    "mongodb": "^6.2.0",
+    "mongodb": "^6.3.0",
     "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@opra/common": "^0.31.5",
-    "@opra/core": "^0.31.5",
+    "@opra/common": "^0.31.7",
+    "@opra/core": "^0.31.7",
     "mongodb": ">=6.x.x"
   },
   "type": "module",

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

@@ -1 +1,3 @@
-export default function preparePatch(doc: any): any;
+export default function preparePatch(doc: any, options?: {
+    fieldPrefix?: string;
+}): any;

package/types/mongo-service.d.ts

@@ -16,8 +16,8 @@ export declare class MongoService<T extends mongodb.Document> extends ApiService
     session?: mongodb.ClientSession;
     resourceName?: string;
     constructor(dataType: Type | string, options?: MongoService.Options);
-    forContext(context: RequestContext, options?: {
-        newInstance?: boolean;
+    forContext(source: ApiService): this;
+    forContext(context: RequestContext, attributes?: {
         db?: mongodb.Db;
         session?: mongodb.ClientSession;
     }): this;
@@ -34,6 +34,7 @@ export declare class MongoService<T extends mongodb.Document> extends ApiService
     protected getDataType(): ComplexType;
     protected getCollection(db: mongodb.Db): Promise<mongodb.Collection<T>>;
     protected getCollectionName(): string;
+    protected _cacheMatch(service: MongoService<any>, context: RequestContext, attributes?: any): boolean;
     protected onError?(error: unknown): void | Promise<void>;
     protected transformData?(row: PartialOutput<T>): PartialOutput<T>;
 }