@mikro-orm/core 6.3.10-dev.14 → 6.3.10-dev.16

package/MikroORM.d.ts

@@ -1,5 +1,5 @@
 import type { EntityManagerType, IDatabaseDriver } from './drivers';
-import { MetadataStorage } from './metadata';
+import { MetadataStorage, type EntitySchema } from './metadata';
 import { Configuration, type Options } from './utils';
 import type { EntityManager } from './EntityManager';
 import type { Constructor, EntityMetadata, EntityName, IEntityGenerator, IMigrator, ISeedManager } from './typings';
@@ -66,7 +66,7 @@ export declare class MikroORM<D extends IDatabaseDriver = IDatabaseDriver, EM ex
     /**
      * Allows dynamically discovering new entity by reference, handy for testing schema diffing.
      */
-    discoverEntity(entities: Constructor | Constructor[]): void;
+    discoverEntity<T extends Constructor | EntitySchema>(entities: T | T[]): void;
     /**
      * Gets the SchemaGenerator.
      */

package/MikroORM.js

@@ -192,7 +192,10 @@ class MikroORM {
         const options = this.config.get('discovery');
         new metadata_1.MetadataValidator().validateDiscovered([...Object.values(this.metadata.getAll()), ...tmp], options);
         const metadata = this.discovery.processDiscoveredEntities(tmp);
-        metadata.forEach(meta => this.metadata.set(meta.className, meta));
+        metadata.forEach(meta => {
+            this.metadata.set(meta.className, meta);
+            meta.root = this.metadata.get(meta.root.className);
+        });
         this.metadata.decorate(this.em);
     }
     /**

package/metadata/MetadataDiscovery.js

@@ -121,7 +121,11 @@ class MetadataDiscovery {
         if (combinedCachePath) {
             this.config.get('metadataCache').combined = combinedCachePath;
         }
-        return discovered.map(meta => this.metadata.get(meta.className));
+        return discovered.map(meta => {
+            meta = this.metadata.get(meta.className);
+            meta.sync(true);
+            return meta;
+        });
     }
     findEntities(preferTsNode, sync = false) {
         this.discovered.length = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.10-dev.14",
+  "version": "6.3.10-dev.16",
   "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.3.10-dev.14",
+    "mikro-orm": "6.3.10-dev.16",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -683,7 +683,7 @@ export type AutoPath<O, P extends string | boolean, E extends string = never, D
 export type UnboxArray<T> = T extends any[] ? ArrayElement<T> : T;
 export type ArrayElement<ArrayType extends unknown[]> = ArrayType extends (infer ElementType)[] ? ElementType : never;
 export type ExpandProperty<T> = T extends Reference<infer U> ? NonNullable<U> : T extends Collection<infer U, any> ? NonNullable<U> : T extends (infer U)[] ? NonNullable<U> : NonNullable<T>;
-type LoadedLoadable<T, E extends object> = T extends Collection<any, any> ? LoadedCollection<E> : T extends Reference<any> ? LoadedReference<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends Scalar | any[] ? T : E;
+type LoadedLoadable<T, E extends object> = T extends Collection<any, any> ? LoadedCollection<E> : T extends Reference<any> ? T & LoadedReference<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends Scalar | any[] ? T : E;
 type IsTrue<T> = IsNever<T> extends true ? false : T extends boolean ? T extends true ? true : false : false;
 type StringLiteral<T> = T extends string ? string extends T ? never : T : never;
 type Prefix<T, K> = K extends `${infer S}.${string}` ? S : (K extends '*' ? keyof T : K);