@mikro-orm/mongodb 7.0.0-dev.33 → 7.0.0-dev.331

package/MongoSchemaGenerator.js

@@ -1,30 +1,30 @@
-import { AbstractSchemaGenerator, Utils, } from '@mikro-orm/core';
+import { Utils, inspect, } from '@mikro-orm/core';
+import { AbstractSchemaGenerator } from '@mikro-orm/core/schema';
 export class MongoSchemaGenerator extends AbstractSchemaGenerator {
     static register(orm) {
         orm.config.registerExtension('@mikro-orm/schema-generator', () => new MongoSchemaGenerator(orm.em));
     }
-    async createSchema(options = {}) {
+    async create(options = {}) {
         await this.connection.ensureConnection();
         options.ensureIndexes ??= true;
         const existing = await this.connection.listCollections();
         const metadata = this.getOrderedMetadata();
-        /* v8 ignore start */
+        /* v8 ignore next */
         const promises = metadata
             .filter(meta => !existing.includes(meta.collection))
-            .map(meta => this.connection.createCollection(meta.collection).catch(err => {
+            .map(meta => this.connection.createCollection(meta.class).catch(err => {
             const existsErrorMessage = `Collection ${this.config.get('dbName')}.${meta.collection} already exists.`;
             // ignore errors about the collection already existing
             if (!(err.name === 'MongoServerError' && err.message.includes(existsErrorMessage))) {
                 throw err;
             }
         }));
-        /* v8 ignore stop */
         if (options.ensureIndexes) {
             await this.ensureIndexes({ ensureCollections: false });
         }
         await Promise.all(promises);
     }
-    async dropSchema(options = {}) {
+    async drop(options = {}) {
         await this.connection.ensureConnection();
         const existing = await this.connection.listCollections();
         const metadata = this.getOrderedMetadata();
@@ -33,19 +33,19 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         }
         const promises = metadata
             .filter(meta => existing.includes(meta.collection))
-            .map(meta => this.connection.dropCollection(meta.collection));
+            .map(meta => this.connection.dropCollection(meta.class));
         await Promise.all(promises);
     }
-    async updateSchema(options = {}) {
-        await this.createSchema(options);
+    async update(options = {}) {
+        await this.create(options);
     }
     async ensureDatabase() {
         return false;
     }
-    async refreshDatabase(options = {}) {
+    async refresh(options = {}) {
         await this.ensureDatabase();
-        await this.dropSchema();
-        await this.createSchema(options);
+        await this.drop();
+        await this.create(options);
     }
     async dropIndexes(options) {
         await this.connection.ensureConnection();
@@ -59,9 +59,10 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
             const indexes = await db.collection(collection.name).listIndexes().toArray();
             for (const index of indexes) {
                 const isIdIndex = index.key._id === 1 && Utils.getObjectKeysSize(index.key) === 1;
-                /* v8 ignore next 3 */
-                if (!isIdIndex && !options?.skipIndexes?.find(idx => idx.collection === collection.name && idx.indexName === index.name)) {
-                    promises.push(db.collection(collection.name).dropIndex(index.name));
+                /* v8 ignore next */
+                if (!isIdIndex &&
+                    !options?.skipIndexes?.find(idx => idx.collection === collection.name && idx.indexName === index.name)) {
+                    promises.push(this.executeQuery(db.collection(collection.name), 'dropIndex', index.name));
                 }
             }
         }
@@ -72,7 +73,7 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         options.ensureCollections ??= true;
         options.retryLimit ??= 3;
         if (options.ensureCollections) {
-            await this.createSchema({ ensureIndexes: false });
+            await this.create({ ensureIndexes: false });
         }
         const promises = [];
         for (const meta of this.getOrderedMetadata()) {
@@ -113,12 +114,22 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
             });
         }
     }
+    mapIndexProperties(index, meta) {
+        return Utils.flatten(Utils.asArray(index.properties).map(propName => {
+            const rootPropName = propName.split('.')[0];
+            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 = Utils.flatten(Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames));
-            const collection = this.connection.getCollection(meta.className);
+            const properties = this.mapIndexProperties(index, meta);
+            const collection = this.connection.getCollection(meta.class);
             if (Array.isArray(index.options) && index.options.length === 2 && properties.length === 0) {
                 res.push([collection.collectionName, collection.createIndex(index.options[0], index.options[1])]);
                 return;
@@ -132,31 +143,58 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
                     index.type = 'text';
                 }
                 const spec = {};
-                properties.forEach(prop => spec[prop] = index.type);
+                properties.forEach(prop => (spec[prop] = index.type));
                 fieldOrSpec = spec;
             }
             else {
-                fieldOrSpec = properties.reduce((o, i) => { o[i] = 1; return o; }, {});
+                fieldOrSpec = properties.reduce((o, i) => {
+                    o[i] = 1;
+                    return o;
+                }, {});
             }
-            res.push([collection.collectionName, collection.createIndex(fieldOrSpec, {
-                    name: index.name,
-                    unique: false,
-                    ...index.options,
-                })]);
+            // MongoDB uses 'hidden' for invisible indexes
+            const indexOptions = {
+                name: index.name,
+                unique: false,
+                ...index.options,
+            };
+            if (index.invisible) {
+                indexOptions.hidden = true;
+            }
+            res.push([collection.collectionName, this.executeQuery(collection, 'createIndex', fieldOrSpec, indexOptions)]);
         });
         return res;
     }
+    async executeQuery(collection, method, ...args) {
+        const now = Date.now();
+        return collection[method](...args).then((res) => {
+            Utils.dropUndefinedProperties(args);
+            const query = `db.getCollection('${collection.collectionName}').${method}(${args.map(arg => 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 = Utils.flatten(Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames));
-            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, {
+            const properties = this.mapIndexProperties(index, meta);
+            const fieldOrSpec = properties.reduce((o, i) => {
+                o[i] = 1;
+                return o;
+            }, {});
+            const collection = this.connection.getCollection(meta.class);
+            res.push([
+                collection.collectionName,
+                this.executeQuery(collection, 'createIndex', fieldOrSpec, {
                     name: index.name,
                     unique: true,
                     ...index.options,
-                })]);
+                }),
+            ]);
         });
         return res;
     }
@@ -164,14 +202,22 @@ export class MongoSchemaGenerator extends AbstractSchemaGenerator {
         if (!prop[type] || !meta.collection) {
             return [];
         }
-        const collection = this.connection.getCollection(meta.className);
+        const collection = this.connection.getCollection(meta.class);
         const fieldOrSpec = prop.embeddedPath
             ? prop.embeddedPath.join('.')
-            : prop.fieldNames.reduce((o, i) => { o[i] = 1; return o; }, {});
-        return [[collection.collectionName, collection.createIndex(fieldOrSpec, {
-                    name: (Utils.isString(prop[type]) ? prop[type] : undefined),
+            : prop.fieldNames.reduce((o, i) => {
+                o[i] = 1;
+                return o;
+            }, {});
+        return [
+            [
+                collection.collectionName,
+                this.executeQuery(collection, 'createIndex', fieldOrSpec, {
+                    name: typeof prop[type] === 'string' ? prop[type] : undefined,
                     unique: type === 'unique',
                     sparse: prop.nullable === true,
-                })]];
+                }),
+            ],
+        ];
     }
 }

package/README.md

@@ -2,14 +2,14 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL and SQLite (including libSQL) databases. 
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases. 
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
-[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
-[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
+[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![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)
+[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://npmx.dev/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)
 [![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)
 
@@ -181,6 +181,7 @@ yarn add @mikro-orm/core @mikro-orm/mysql         # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
+yarn add @mikro-orm/core @mikro-orm/oracledb      # for oracle
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
@@ -381,6 +382,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/index.d.ts

@@ -8,4 +8,4 @@ export * from './MongoEntityRepository.js';
 export * from './MongoSchemaGenerator.js';
 export { MongoEntityManager as EntityManager } from './MongoEntityManager.js';
 export { MongoEntityRepository as EntityRepository } from './MongoEntityRepository.js';
-export { MongoMikroORM as MikroORM, MongoOptions as Options, defineMongoConfig as defineConfig, } from './MongoMikroORM.js';
+export { MongoMikroORM as MikroORM, type MongoOptions as Options, defineMongoConfig as defineConfig, } from './MongoMikroORM.js';

package/package.json

@@ -1,61 +1,61 @@
 {
   "name": "@mikro-orm/mongodb",
-  "type": "module",
-  "version": "7.0.0-dev.33",
+  "version": "7.0.0-dev.331",
   "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",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
-  "engines": {
-    "node": ">= 22.11.0"
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy",
+    "build": "yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "mongodb": "6.20.0"
+    "mongodb": "7.1.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.7"
+    "@mikro-orm/core": "^6.6.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.33"
+    "@mikro-orm/core": "7.0.0-dev.331"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }