@mikro-orm/core 6.2.10-dev.51 → 6.2.10-dev.53

package/metadata/MetadataDiscovery.js

@@ -109,7 +109,7 @@ class MetadataDiscovery {
                 }
             }
         }
-        filtered.forEach(meta => Object.values(meta.properties).forEach(prop => this.initIndexes(prop)));
+        filtered.forEach(meta => Object.values(meta.properties).forEach(prop => this.initIndexes(meta, prop)));
         filtered.forEach(meta => this.autoWireBidirectionalProperties(meta));
         filtered.forEach(meta => this.findReferencingProperties(meta, filtered));
         for (const meta of filtered) {
@@ -1204,8 +1204,9 @@ class MetadataDiscovery {
         }
         prop.unsigned ??= (prop.primary || prop.unsigned) && this.isNumericProperty(prop) && this.platform.supportsUnsigned();
     }
-    initIndexes(prop) {
-        if (prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && this.platform.indexForeignKeys()) {
+    initIndexes(meta, prop) {
+        const hasIndex = meta.indexes.some(idx => idx.properties?.length === 1 && idx.properties[0] === prop.name);
+        if (prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && this.platform.indexForeignKeys() && !hasIndex) {
             prop.index ??= true;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.2.10-dev.51",
+  "version": "6.2.10-dev.53",
   "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",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.2.10-dev.51",
+    "mikro-orm": "6.2.10-dev.53",
     "reflect-metadata": "0.2.2"
   }
 }

package/types/Type.d.ts

@@ -59,7 +59,7 @@ export declare abstract class Type<JSType = string, DBType = JSType> {
      * Gets the SQL declaration snippet for a field of this type.
      */
     getColumnType(prop: EntityProperty, platform: Platform): string;
-    static getType<JSType, DBType = JSType>(cls: Constructor<Type<JSType, DBType>>): Type<JSType, DBType>;
+    static getType<JSType, DBType = JSType, TypeClass extends Constructor<Type<JSType, DBType>> = Constructor<Type<JSType, DBType>>>(cls: TypeClass): InstanceType<TypeClass>;
     /**
      * Checks whether the argument is instance of `Type`.
      */

package/typings.d.ts

@@ -725,9 +725,9 @@ export interface LoadedReference<T> extends Reference<NonNullable<T>> {
     $: NonNullable<T>;
     get(): NonNullable<T>;
 }
-export interface LoadedScalarReference<T> extends ScalarReference<NonNullable<T>> {
-    $: NonNullable<T>;
-    get(): NonNullable<T>;
+export interface LoadedScalarReference<T> extends ScalarReference<T> {
+    $: T;
+    get(): T;
 }
 export interface LoadedCollection<T extends object> extends Collection<T> {
     $: Collection<T>;