@mikro-orm/reflection 7.0.0-dev.6 → 7.0.0-dev.61

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![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)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![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)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
@@ -382,6 +381,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/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

@@ -1,5 +1,5 @@
-import { ModuleKind, Project } from 'ts-morph';
-import { MetadataError, MetadataProvider, MetadataStorage, ReferenceKind, Utils, ConfigurationLoader, } from '@mikro-orm/core';
+import { ComputedPropertyName, ModuleKind, NoSubstitutionTemplateLiteral, Project, StringLiteral } from 'ts-morph';
+import { ConfigurationLoader, MetadataError, MetadataProvider, MetadataStorage, ReferenceKind, Utils, } from '@mikro-orm/core';
 export class TsMorphMetadataProvider extends MetadataProvider {
     project;
     sources;
@@ -39,12 +39,11 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         return prop.type;
     }
     cleanUpTypeTags(type) {
-        const genericTags = [/Opt<(.*?)>/, /Hidden<(.*?)>/];
+        const genericTags = [/Opt<(.*?)>/, /Hidden<(.*?)>/, /RequiredNullable<(.*?)>/];
         const intersectionTags = [
-            '{ [__optional]?: 1 | undefined; }',
-            '{ [__optional]?: 1; }',
-            '{ [__hidden]?: 1 | undefined; }',
-            '{ [__hidden]?: 1; }',
+            'Opt.Brand',
+            'Hidden.Brand',
+            'RequiredNullable.Brand',
         ];
         for (const tag of genericTags) {
             type = type.replace(tag, '$1');
@@ -57,17 +56,17 @@ export class TsMorphMetadataProvider extends 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';
         }
@@ -80,7 +79,22 @@ export class TsMorphMetadataProvider extends MetadataProvider {
             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 => v.getName() === prop.name);
+        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;
+        });
         if (!property) {
             return { type: prop.type, optional: prop.nullable };
         }
@@ -146,7 +160,7 @@ export class TsMorphMetadataProvider extends 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,7 +1,7 @@
 {
   "name": "@mikro-orm/reflection",
   "type": "module",
-  "version": "7.0.0-dev.6",
+  "version": "7.0.0-dev.61",
   "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",
@@ -38,7 +38,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy",
@@ -50,13 +50,12 @@
     "access": "public"
   },
   "dependencies": {
-    "globby": "11.1.0",
-    "ts-morph": "25.0.1"
+    "ts-morph": "27.0.2"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.7"
+    "@mikro-orm/core": "^6.6.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.6"
+    "@mikro-orm/core": "7.0.0-dev.61"
   }
 }