@mikro-orm/reflection 7.0.0-dev.64 → 7.0.0-dev.66

package/TsMorphMetadataProvider.d.ts

@@ -12,6 +12,7 @@ export declare class TsMorphMetadataProvider extends MetadataProvider {
     private initPropertyType;
     private readTypeFromSource;
     private getSourceFile;
+    private stripRelativePath;
     private processWrapper;
     private initProject;
     private initSourceFiles;

package/TsMorphMetadataProvider.js

@@ -1,5 +1,5 @@
 import { ComputedPropertyName, ModuleKind, NoSubstitutionTemplateLiteral, Project, StringLiteral } from 'ts-morph';
-import { ConfigurationLoader, MetadataError, MetadataProvider, MetadataStorage, ReferenceKind, Utils, } from '@mikro-orm/core';
+import { MetadataError, MetadataProvider, MetadataStorage, ReferenceKind, Utils, } from '@mikro-orm/core';
 export class TsMorphMetadataProvider extends MetadataProvider {
     project;
     sources;
@@ -28,7 +28,7 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         }
     }
     extractType(prop) {
-        if (Utils.isString(prop.entity)) {
+        if (typeof prop.entity === 'string') {
             return prop.entity;
         }
         if (prop.entity) {
@@ -137,13 +137,16 @@ export class TsMorphMetadataProvider extends MetadataProvider {
             const outDirRelative = Utils.relativePath(outDir, baseDir);
             path = path.replace(new RegExp(`^${outDirRelative}`), '');
         }
-        path = Utils.stripRelativePath(path);
+        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`);
         }
         return source;
     }
+    stripRelativePath(str) {
+        return str.replace(/^(?:\.\.\/|\.\/)+/, '/');
+    }
     processWrapper(prop, wrapper) {
         // type can be sometimes in form of:
         // `'({ object?: Entity | undefined; } & import("...").Reference<Entity>)'`
@@ -163,9 +166,8 @@ export class TsMorphMetadataProvider extends MetadataProvider {
         }
     }
     initProject() {
-        const settings = ConfigurationLoader.getSettings();
         /* v8 ignore next */
-        const tsConfigFilePath = this.config.get('discovery').tsConfigPath ?? settings.tsConfigPath ?? './tsconfig.json';
+        const tsConfigFilePath = this.config.get('discovery').tsConfigPath ?? './tsconfig.json';
         try {
             this.project = new Project({
                 tsConfigFilePath: Utils.normalizePath(process.cwd(), tsConfigFilePath),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/reflection",
   "type": "module",
-  "version": "7.0.0-dev.64",
+  "version": "7.0.0-dev.66",
   "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.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.64"
+    "@mikro-orm/core": "7.0.0-dev.66"
   }
 }