@mikro-orm/mongodb 6.5.8-dev.9 → 6.5.9-dev.0

package/MongoSchemaGenerator.d.ts

@@ -17,7 +17,9 @@ export declare class MongoSchemaGenerator extends AbstractSchemaGenerator<MongoD
         collectionsWithFailedIndexes?: string[];
     }): Promise<void>;
     ensureIndexes(options?: EnsureIndexesOptions): Promise<void>;
+    private mapIndexProperties;
     private createIndexes;
+    private executeQuery;
     private createUniqueIndexes;
     private createPropertyIndexes;
 }

package/MongoSchemaGenerator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoSchemaGenerator = void 0;
+const node_util_1 = require("node:util");
 const core_1 = require("@mikro-orm/core");
 class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
     static register(orm) {
@@ -63,7 +64,7 @@ class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 const isIdIndex = index.key._id === 1 && core_1.Utils.getObjectKeysSize(index.key) === 1;
                 /* istanbul ignore next */
                 if (!isIdIndex && !options?.skipIndexes?.find(idx => idx.collection === collection.name && idx.indexName === index.name)) {
-                    promises.push(db.collection(collection.name).dropIndex(index.name));
+                    promises.push(this.executeQuery(db.collection(collection.name), 'dropIndex', index.name));
                 }
             }
         }
@@ -115,11 +116,21 @@ class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
             });
         }
     }
+    mapIndexProperties(index, meta) {
+        return core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(propName => {
+            const rootPropName = propName.substring(0, propName.indexOf('.'));
+            const prop = meta.properties[rootPropName];
+            if (propName.includes('.')) {
+                return [prop.fieldNames[0] + propName.substring(propName.indexOf('.'))];
+            }
+            return prop?.fieldNames ?? propName;
+        }));
+    }
     createIndexes(meta) {
         const res = [];
         meta.indexes.forEach(index => {
             let fieldOrSpec;
-            const properties = core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames));
+            const properties = this.mapIndexProperties(index, meta);
             const collection = this.connection.getCollection(meta.className);
             if (Array.isArray(index.options) && index.options.length === 2 && properties.length === 0) {
                 res.push([collection.collectionName, collection.createIndex(index.options[0], index.options[1])]);
@@ -140,7 +151,7 @@ class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
             else {
                 fieldOrSpec = properties.reduce((o, i) => { o[i] = 1; return o; }, {});
             }
-            res.push([collection.collectionName, collection.createIndex(fieldOrSpec, {
+            res.push([collection.collectionName, this.executeQuery(collection, 'createIndex', fieldOrSpec, {
                     name: index.name,
                     unique: false,
                     ...index.options,
@@ -148,13 +159,26 @@ class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
         });
         return res;
     }
+    async executeQuery(collection, method, ...args) {
+        const now = Date.now();
+        return collection[method](...args).then((res) => {
+            core_1.Utils.dropUndefinedProperties(args);
+            const query = `db.getCollection('${collection.collectionName}').${method}(${args.map(arg => (0, node_util_1.inspect)(arg)).join(', ')});`;
+            this.config.getLogger().logQuery({
+                level: 'info',
+                query,
+                took: Date.now() - now,
+            });
+            return res;
+        });
+    }
     createUniqueIndexes(meta) {
         const res = [];
         meta.uniques.forEach(index => {
-            const properties = core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames));
+            const properties = this.mapIndexProperties(index, meta);
             const fieldOrSpec = properties.reduce((o, i) => { o[i] = 1; return o; }, {});
             const collection = this.connection.getCollection(meta.className);
-            res.push([collection.collectionName, collection.createIndex(fieldOrSpec, {
+            res.push([collection.collectionName, this.executeQuery(collection, 'createIndex', fieldOrSpec, {
                     name: index.name,
                     unique: true,
                     ...index.options,
@@ -170,7 +194,7 @@ class MongoSchemaGenerator extends core_1.AbstractSchemaGenerator {
         const fieldOrSpec = prop.embeddedPath
             ? prop.embeddedPath.join('.')
             : prop.fieldNames.reduce((o, i) => { o[i] = 1; return o; }, {});
-        return [[collection.collectionName, collection.createIndex(fieldOrSpec, {
+        return [[collection.collectionName, this.executeQuery(collection, 'createIndex', fieldOrSpec, {
                     name: (core_1.Utils.isString(prop[type]) ? prop[type] : undefined),
                     unique: type === 'unique',
                     sparse: prop.nullable === true,

package/index.mjs

@@ -211,6 +211,7 @@ export const expandDotPaths = mod.expandDotPaths;
 export const getLoadingStrategy = mod.getLoadingStrategy;
 export const getOnConflictFields = mod.getOnConflictFields;
 export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
+export const getWhereCondition = mod.getWhereCondition;
 export const helper = mod.helper;
 export const parseJsonSafe = mod.parseJsonSafe;
 export const quote = mod.quote;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mongodb",
-  "version": "6.5.8-dev.9",
+  "version": "6.5.9-dev.0",
   "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",
@@ -62,9 +62,9 @@
     "mongodb": "6.20.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.7"
+    "@mikro-orm/core": "^6.5.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.5.8-dev.9"
+    "@mikro-orm/core": "6.5.9-dev.0"
   }
 }