@mikro-orm/reflection 7.0.6-dev.1 → 7.0.6-dev.2

package/TsMorphMetadataProvider.js

@@ -1,5 +1,5 @@
 import { extname } from 'node:path';
-import { ComputedPropertyName, ModuleKind, NoSubstitutionTemplateLiteral, Project, StringLiteral, } from 'ts-morph';
+import { ModuleKind, Project } from 'ts-morph';
 import { EntitySchema, MetadataError, MetadataProvider, MetadataStorage, RawQueryFragment, ReferenceKind, Type, Utils, } from '@mikro-orm/core';
 import { fs } from '@mikro-orm/core/fs-utils';
 /** Metadata provider that uses ts-morph to infer property types from TypeScript source files or declaration files. */
@@ -61,7 +61,9 @@ export class TsMorphMetadataProvider extends MetadataProvider {
     }
     initPropertyType(meta, prop) {
         const { type: typeRaw, optional } = this.readTypeFromSource(meta, prop);
-        prop.type = this.cleanUpTypeTags(typeRaw);
+        if (typeRaw != null) {
+            prop.type = this.cleanUpTypeTags(typeRaw);
+        }
         if (optional) {
             prop.optional = true;
         }
@@ -83,23 +85,9 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         if (!cls) {
             throw new MetadataError(`Source class for entity ${meta.className} not found. Verify you have 'compilerOptions.declaration' enabled in your 'tsconfig.json'. If you are using webpack, see https://bit.ly/35pPDNn`);
         }
-        const properties = cls.getInstanceProperties();
-        const property = properties.find(v => {
-            if (v.getName() === prop.name) {
-                return true;
-            }
-            const nameNode = v.getNameNode();
-            if (nameNode instanceof StringLiteral && nameNode.getLiteralText() === prop.name) {
-                return true;
-            }
-            if (nameNode instanceof ComputedPropertyName) {
-                const expr = nameNode.getExpression();
-                if (expr instanceof NoSubstitutionTemplateLiteral && expr.getLiteralText() === prop.name) {
-                    return true;
-                }
-            }
-            return false;
-        });
+        const property = (cls.getInstanceProperty(prop.name) ??
+            // fallback to the type checker for inherited properties (e.g. with TC39/ES decorators)
+            cls.getType().getProperty(prop.name)?.getDeclarations()?.[0]);
         if (!property) {
             return { type: prop.type, optional: prop.nullable };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/reflection",
-  "version": "7.0.6-dev.1",
+  "version": "7.0.6-dev.2",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.0.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.6-dev.1"
+    "@mikro-orm/core": "7.0.6-dev.2"
   },
   "engines": {
     "node": ">= 22.17.0"