@mikro-orm/mongodb 6.2.10-dev.9 → 6.2.10-dev.91

package/MongoConnection.js

@@ -249,8 +249,14 @@ class MongoConnection extends core_1.Connection {
                     const cond = core_1.Utils.isPlainObject(id) ? id : { _id: id };
                     const doc = this.createUpdatePayload(row, upsertOptions);
                     if (upsert) {
-                        query += log(() => `bulk.find(${this.logObject(cond)}).upsert().update(${this.logObject(doc)});\n`);
-                        bulk.find(cond).upsert().update(doc);
+                        if (core_1.Utils.isEmpty(cond)) {
+                            query += log(() => `bulk.insert(${this.logObject(row)});\n`);
+                            bulk.insert(row);
+                        }
+                        else {
+                            query += log(() => `bulk.find(${this.logObject(cond)}).upsert().update(${this.logObject(doc)});\n`);
+                            bulk.find(cond).upsert().update(doc);
+                        }
                         return;
                     }
                     query += log(() => `bulk.find(${this.logObject(cond)}).update(${this.logObject(doc)});\n`);

package/MongoDriver.js

@@ -104,7 +104,7 @@ class MongoDriver extends core_1.DatabaseDriver {
         const meta = this.metadata.find(entityName);
         /* istanbul ignore next */
         const rename = (field) => meta ? (meta.properties[field]?.fieldNames[0] ?? field) : field;
-        if (options.onConflictFields) {
+        if (options.onConflictFields && Array.isArray(options.onConflictFields)) {
             options.onConflictFields = options.onConflictFields.map(rename);
         }
         if (options.onConflictMergeFields) {
@@ -127,7 +127,7 @@ class MongoDriver extends core_1.DatabaseDriver {
         const meta = this.metadata.find(entityName);
         /* istanbul ignore next */
         const rename = (field) => meta ? (meta.properties[field]?.fieldNames[0] ?? field) : field;
-        if (options.onConflictFields) {
+        if (options.onConflictFields && Array.isArray(options.onConflictFields)) {
             options.onConflictFields = options.onConflictFields.map(rename);
         }
         if (options.onConflictMergeFields) {
@@ -136,7 +136,19 @@ class MongoDriver extends core_1.DatabaseDriver {
         if (options.onConflictExcludeFields) {
             options.onConflictExcludeFields = options.onConflictExcludeFields.map(rename);
         }
-        return this.rethrow(this.getConnection('write').bulkUpdateMany(entityName, where, data, options.ctx, options.upsert, options));
+        /* istanbul ignore next */
+        const pk = meta?.getPrimaryProps()[0].fieldNames[0] ?? '_id';
+        const res = await this.rethrow(this.getConnection('write').bulkUpdateMany(entityName, where, data, options.ctx, options.upsert, options));
+        if (res.insertedIds) {
+            let i = 0;
+            res.rows = where.map(cond => {
+                if (core_1.Utils.isEmpty(cond)) {
+                    return { [pk]: res.insertedIds[i++] };
+                }
+                return { [pk]: cond[pk] };
+            });
+        }
+        return res;
     }
     async nativeDelete(entityName, where, options = {}) {
         if (core_1.Utils.isPrimaryKey(where)) {

package/MongoMikroORM.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineMongoConfig = exports.MongoMikroORM = void 0;
+exports.MongoMikroORM = void 0;
+exports.defineMongoConfig = defineMongoConfig;
 const core_1 = require("@mikro-orm/core");
 const MongoDriver_1 = require("./MongoDriver");
 /**
@@ -26,4 +27,3 @@ exports.MongoMikroORM = MongoMikroORM;
 function defineMongoConfig(options) {
     return (0, core_1.defineConfig)({ driver: MongoDriver_1.MongoDriver, ...options });
 }
-exports.defineMongoConfig = defineMongoConfig;

package/MongoPlatform.d.ts

@@ -21,7 +21,7 @@ export declare class MongoPlatform extends Platform {
     usesImplicitTransactions(): boolean;
     convertsJsonAutomatically(): boolean;
     convertJsonToDatabaseValue(value: unknown): unknown;
-    convertJsonToJSValue(value: unknown): unknown;
+    convertJsonToJSValue(value: unknown, prop: EntityProperty): unknown;
     marshallArray(values: string[]): string;
     cloneEmbeddable<T>(data: T): T;
     shouldHaveColumn<T>(prop: EntityProperty<T>, populate: PopulateOptions<T>[], exclude?: string[]): boolean;

package/MongoPlatform.js

@@ -63,7 +63,7 @@ class MongoPlatform extends core_1.Platform {
     convertJsonToDatabaseValue(value) {
         return core_1.Utils.copy(value);
     }
-    convertJsonToJSValue(value) {
+    convertJsonToJSValue(value, prop) {
         return value;
     }
     marshallArray(values) {

package/index.mjs

@@ -25,6 +25,7 @@ export const ChangeSet = mod.ChangeSet;
 export const ChangeSetComputer = mod.ChangeSetComputer;
 export const ChangeSetPersister = mod.ChangeSetPersister;
 export const ChangeSetType = mod.ChangeSetType;
+export const CharacterType = mod.CharacterType;
 export const Check = mod.Check;
 export const CheckConstraintViolationException = mod.CheckConstraintViolationException;
 export const Collection = mod.Collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mongodb",
-  "version": "6.2.10-dev.9",
+  "version": "6.2.10-dev.91",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -59,12 +59,12 @@
   },
   "dependencies": {
     "bson": "^6.7.0",
-    "mongodb": "6.7.0"
+    "mongodb": "6.8.0"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.9"
+    "@mikro-orm/core": "6.2.10-dev.91"
   }
 }