@mikro-orm/mongodb 7.0.0-dev.3 → 7.0.0-dev.31

package/MongoConnection.js

@@ -292,12 +292,19 @@ export class MongoConnection extends Connection {
     createUpdatePayload(row, upsertOptions) {
         const doc = { $set: row };
         const $unset = {};
-        Utils.keys(row)
-            .filter(k => typeof row[k] === 'undefined')
-            .forEach(k => {
-            $unset[k] = '';
-            delete row[k];
-        });
+        const $inc = {};
+        for (const k of Utils.keys(row)) {
+            const item = row[k];
+            if (typeof item === 'undefined') {
+                $unset[k] = '';
+                delete row[k];
+                continue;
+            }
+            if (Utils.isPlainObject(item) && '$inc' in item) {
+                $inc[k] = item.$inc;
+                delete row[k];
+            }
+        }
         if (upsertOptions) {
             if (upsertOptions.onConflictAction === 'ignore') {
                 doc.$setOnInsert = doc.$set;
@@ -323,9 +330,12 @@ export class MongoConnection extends Connection {
         }
         if (Utils.hasObjectKeys($unset)) {
             doc.$unset = $unset;
-            if (!Utils.hasObjectKeys(doc.$set)) {
-                delete doc.$set;
-            }
+        }
+        if (Utils.hasObjectKeys($inc)) {
+            doc.$inc = $inc;
+        }
+        if (!Utils.hasObjectKeys(doc.$set)) {
+            delete doc.$set;
         }
         return doc;
     }

package/MongoDriver.d.ts

@@ -26,4 +26,5 @@ export declare class MongoDriver extends DatabaseDriver<MongoConnection> {
     private convertObjectIds;
     private buildFilterById;
     protected buildFields<T extends object, P extends string = never>(entityName: string, populate: PopulateOptions<T>[], fields?: readonly EntityField<T, P>[], exclude?: string[]): string[] | undefined;
+    private handleVersionProperty;
 }

package/MongoDriver.js

@@ -79,11 +79,15 @@ export class MongoDriver extends DatabaseDriver {
         return this.rethrow(this.getConnection('read').countDocuments(entityName, where, ctx));
     }
     async nativeInsert(entityName, data, options = {}) {
+        this.handleVersionProperty(entityName, data);
         data = this.renameFields(entityName, data);
         return this.rethrow(this.getConnection('write').insertOne(entityName, data, options.ctx));
     }
     async nativeInsertMany(entityName, data, options = {}) {
-        data = data.map(d => this.renameFields(entityName, d));
+        data = data.map(item => {
+            this.handleVersionProperty(entityName, item);
+            return this.renameFields(entityName, item);
+        });
         const meta = this.metadata.find(entityName);
         /* v8 ignore next */
         const pk = meta?.getPrimaryProps()[0].fieldNames[0] ?? '_id';
@@ -95,8 +99,9 @@ export class MongoDriver extends DatabaseDriver {
         if (Utils.isPrimaryKey(where)) {
             where = this.buildFilterById(entityName, where);
         }
-        where = this.renameFields(entityName, where, true);
+        this.handleVersionProperty(entityName, data, true);
         data = this.renameFields(entityName, data);
+        where = this.renameFields(entityName, where, true);
         options = { ...options };
         const meta = this.metadata.find(entityName);
         /* v8 ignore next */
@@ -119,7 +124,10 @@ export class MongoDriver extends DatabaseDriver {
             }
             return row;
         });
-        data = data.map(row => this.renameFields(entityName, row));
+        data = data.map(row => {
+            this.handleVersionProperty(entityName, row, true);
+            return this.renameFields(entityName, row);
+        });
         options = { ...options };
         const meta = this.metadata.find(entityName);
         /* v8 ignore next */
@@ -307,4 +315,17 @@ export class MongoDriver extends DatabaseDriver {
         }
         return ret.length > 0 ? ret : undefined;
     }
+    handleVersionProperty(entityName, data, update = false) {
+        const meta = this.metadata.find(entityName);
+        if (!meta?.versionProperty) {
+            return;
+        }
+        const versionProperty = meta.properties[meta.versionProperty];
+        if (versionProperty.runtimeType === 'Date') {
+            data[versionProperty.name] ??= new Date();
+        }
+        else {
+            data[versionProperty.name] ??= update ? { $inc: 1 } : 1;
+        }
+    }
 }

package/MongoSchemaGenerator.js

@@ -4,10 +4,10 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         orm.config.registerExtension('@mikro-orm/schema-generator', () => new MongoSchemaGenerator(orm.em));
     }
     async createSchema(options = {}) {
+        await this.connection.ensureConnection();
         options.ensureIndexes ??= true;
         const existing = await this.connection.listCollections();
         const metadata = this.getOrderedMetadata();
-        metadata.push({ collection: this.config.get('migrations').tableName });
         /* v8 ignore start */
         const promises = metadata
             .filter(meta => !existing.includes(meta.collection))
@@ -25,9 +25,8 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         await Promise.all(promises);
     }
     async dropSchema(options = {}) {
-        const db = this.connection.getDb();
-        const collections = await db.listCollections().toArray();
-        const existing = collections.map(c => c.name);
+        await this.connection.ensureConnection();
+        const existing = await this.connection.listCollections();
         const metadata = this.getOrderedMetadata();
         if (options.dropMigrationsTable) {
             metadata.push({ collection: this.config.get('migrations').tableName });
@@ -49,6 +48,7 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         await this.createSchema(options);
     }
     async dropIndexes(options) {
+        await this.connection.ensureConnection();
         const db = this.connection.getDb();
         const collections = await db.listCollections().toArray();
         const promises = [];
@@ -68,6 +68,7 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         await Promise.all(promises);
     }
     async ensureIndexes(options = {}) {
+        await this.connection.ensureConnection();
         options.ensureCollections ??= true;
         options.retryLimit ??= 3;
         if (options.ensureCollections) {

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/mongodb",
   "type": "module",
-  "version": "7.0.0-dev.3",
+  "version": "7.0.0-dev.31",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -50,12 +50,12 @@
     "access": "public"
   },
   "dependencies": {
-    "mongodb": "6.13.0"
+    "mongodb": "6.20.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.5.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.3"
+    "@mikro-orm/core": "7.0.0-dev.31"
   }
 }