@mikro-orm/reflection 7.0.0-dev.106 → 7.0.0-dev.108

package/TsMorphMetadataProvider.js

@@ -1,6 +1,7 @@
 import { extname } from 'node:path';
 import { ComputedPropertyName, ModuleKind, NoSubstitutionTemplateLiteral, Project, StringLiteral } from 'ts-morph';
 import { MetadataError, MetadataProvider, MetadataStorage, RawQueryFragment, ReferenceKind, Type, Utils, } from '@mikro-orm/core';
+import { fs } from '@mikro-orm/core/fs-utils';
 export class TsMorphMetadataProvider extends MetadataProvider {
     project;
     sources;
@@ -139,13 +140,13 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         let path = tsPath;
         /* v8 ignore next */
         if (outDir != null) {
-            const outDirRelative = Utils.relativePath(outDir, baseDir);
+            const outDirRelative = fs.relativePath(outDir, baseDir);
             path = path.replace(new RegExp(`^${outDirRelative}`), '');
         }
         path = this.stripRelativePath(path);
         const source = this.sources.find(s => s.getFilePath().endsWith(path));
         if (!source && validate) {
-            throw new MetadataError(`Source file '${tsPath}' not found. Check your 'entitiesTs' option and verify you have 'compilerOptions.declaration' enabled in your 'tsconfig.json'. If you are using webpack, see https://bit.ly/35pPDNn`);
+            throw new MetadataError(`Source file '${fs.relativePath(tsPath, baseDir)}' not found. Check your 'entitiesTs' option and verify you have 'compilerOptions.declaration' enabled in your 'tsconfig.json'. If you are using webpack, see https://bit.ly/35pPDNn`);
         }
         return source;
     }
@@ -175,7 +176,7 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         const tsConfigFilePath = this.config.get('discovery').tsConfigPath ?? './tsconfig.json';
         try {
             this.project = new Project({
-                tsConfigFilePath: Utils.normalizePath(process.cwd(), tsConfigFilePath),
+                tsConfigFilePath: fs.normalizePath(process.cwd(), tsConfigFilePath),
                 skipAddingFilesFromTsConfig: true,
                 compilerOptions: {
                     strictNullChecks: true,
@@ -247,6 +248,7 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         ].forEach(key => delete copy[key]);
         // base entity without properties might not have path, but nothing to cache there
         if (meta.path) {
+            meta.path = fs.relativePath(meta.path, this.config.get('baseDir'));
             this.config.getMetadataCacheAdapter().set(this.getCacheKey(meta), copy, meta.path);
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/reflection",
   "type": "module",
-  "version": "7.0.0-dev.106",
+  "version": "7.0.0-dev.108",
   "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",
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.106"
+    "@mikro-orm/core": "7.0.0-dev.108"
   }
 }