@mikro-orm/reflection 6.4.17-dev.40 → 6.4.17-dev.42

package/TsMorphMetadataProvider.d.ts

@@ -1,5 +1,5 @@
 import { type SourceFile } from 'ts-morph';
-import { MetadataProvider, type EntityMetadata } from '@mikro-orm/core';
+import { type EntityMetadata, MetadataProvider } from '@mikro-orm/core';
 export declare class TsMorphMetadataProvider extends MetadataProvider {
     private project;
     private sources;

package/TsMorphMetadataProvider.js

@@ -60,17 +60,17 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
     }
     initPropertyType(meta, prop) {
         const { type: typeRaw, optional } = this.readTypeFromSource(meta, prop);
-        const type = this.cleanUpTypeTags(typeRaw);
-        prop.type = type;
-        prop.runtimeType = type;
+        prop.type = this.cleanUpTypeTags(typeRaw);
         if (optional) {
             prop.optional = true;
         }
         this.processWrapper(prop, 'Ref');
         this.processWrapper(prop, 'Reference');
+        this.processWrapper(prop, 'EntityRef');
+        this.processWrapper(prop, 'ScalarRef');
         this.processWrapper(prop, 'ScalarReference');
-        this.processWrapper(prop, 'Ref');
         this.processWrapper(prop, 'Collection');
+        prop.runtimeType ??= prop.type;
         if (prop.type.replace(/import\(.*\)\./g, '').match(/^(Dictionary|Record)<.*>$/)) {
             prop.type = 'json';
         }
@@ -149,7 +149,7 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
             return;
         }
         prop.type = m[1];
-        if (['Ref', 'Reference', 'Ref'].includes(wrapper)) {
+        if (['Ref', 'Reference', 'EntityRef', 'ScalarRef', 'ScalarReference'].includes(wrapper)) {
             prop.ref = true;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/reflection",
-  "version": "6.4.17-dev.40",
+  "version": "6.4.17-dev.42",
   "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",
@@ -65,6 +65,6 @@
     "@mikro-orm/core": "^6.4.16"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.17-dev.40"
+    "@mikro-orm/core": "6.4.17-dev.42"
   }
 }