@mikro-orm/reflection 7.0.0-dev.1 → 7.0.0-dev.11

package/TsMorphMetadataProvider.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TsMorphMetadataProvider = void 0;
-const ts_morph_1 = require("ts-morph");
-const core_1 = require("@mikro-orm/core");
-class TsMorphMetadataProvider extends core_1.MetadataProvider {
+import { ModuleKind, Project } from 'ts-morph';
+import { MetadataError, MetadataProvider, MetadataStorage, ReferenceKind, Utils, ConfigurationLoader, } from '@mikro-orm/core';
+export class TsMorphMetadataProvider extends MetadataProvider {
     project;
     sources;
     useCache() {
@@ -33,11 +30,11 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         }
     }
     extractType(prop) {
-        if (core_1.Utils.isString(prop.entity)) {
+        if (Utils.isString(prop.entity)) {
             return prop.entity;
         }
         if (prop.entity) {
-            return core_1.Utils.className(prop.entity());
+            return Utils.className(prop.entity());
         }
         return prop.type;
     }
@@ -78,9 +75,9 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
     readTypeFromSource(meta, prop) {
         const source = this.getExistingSourceFile(meta.path);
         const cls = source.getClass(meta.className);
-        /* istanbul ignore next */
+        /* v8 ignore next 3 */
         if (!cls) {
-            throw new core_1.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`);
+            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);
@@ -94,7 +91,7 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         }
         if (tsType.isArray()) {
             prop.array = true;
-            /* istanbul ignore else */
+            /* v8 ignore next 3 */
             if (tsType.getArrayElementType().isEnum()) {
                 prop.items = tsType.getArrayElementType().getUnionTypes().map(t => t.getLiteralValueOrThrow());
             }
@@ -112,7 +109,7 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
             .replace(/\[]$/, '') // remove array suffix
             .replace(/\((.*)\)/, '$1'); // unwrap union types
         // keep the array suffix in the type, it is needed in few places in discovery and comparator (`prop.array` is used only for enum arrays)
-        if (prop.array && !type.includes(' | ') && prop.kind === core_1.ReferenceKind.SCALAR) {
+        if (prop.array && !type.includes(' | ') && prop.kind === ReferenceKind.SCALAR) {
             type += '[]';
         }
         return { type, optional };
@@ -125,13 +122,13 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         const outDir = this.project.getCompilerOptions().outDir;
         let path = tsPath;
         if (outDir != null) {
-            const outDirRelative = core_1.Utils.relativePath(outDir, baseDir);
+            const outDirRelative = Utils.relativePath(outDir, baseDir);
             path = path.replace(new RegExp(`^${outDirRelative}`), '');
         }
-        path = core_1.Utils.stripRelativePath(path);
+        path = Utils.stripRelativePath(path);
         const source = this.sources.find(s => s.getFilePath().endsWith(path));
         if (!source && validate) {
-            throw new core_1.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 '${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;
     }
@@ -154,24 +151,25 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         }
     }
     initProject() {
-        const settings = core_1.ConfigurationLoader.getSettings();
-        /* istanbul ignore next */
+        const settings = ConfigurationLoader.getSettings();
+        /* v8 ignore next */
         const tsConfigFilePath = this.config.get('discovery').tsConfigPath ?? settings.tsConfigPath ?? './tsconfig.json';
         try {
-            this.project = new ts_morph_1.Project({
-                tsConfigFilePath: core_1.Utils.normalizePath(process.cwd(), tsConfigFilePath),
+            this.project = new Project({
+                tsConfigFilePath: Utils.normalizePath(process.cwd(), tsConfigFilePath),
+                skipAddingFilesFromTsConfig: true,
                 compilerOptions: {
                     strictNullChecks: true,
-                    module: ts_morph_1.ModuleKind.Node16,
+                    module: ModuleKind.Node16,
                 },
             });
         }
         catch (e) {
             this.config.getLogger().warn('discovery', e.message);
-            this.project = new ts_morph_1.Project({
+            this.project = new Project({
                 compilerOptions: {
                     strictNullChecks: true,
-                    module: ts_morph_1.ModuleKind.Node16,
+                    module: ModuleKind.Node16,
                 },
             });
         }
@@ -182,11 +180,11 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         }
         this.sources = [];
         // All entity files are first required during the discovery, before we reach here, so it is safe to get the parts from the global
-        // metadata storage. We know the path thanks to the decorators being executed. In case we are running via ts-node, the extension
+        // metadata storage. We know the path thanks to the decorators being executed. In case we are running the TS code, the extension
         // will be already `.ts`, so no change is needed. `.js` files will get renamed to `.d.ts` files as they will be used as a source for
         // the ts-morph reflection.
-        for (const meta of core_1.Utils.values(core_1.MetadataStorage.getMetadata())) {
-            /* istanbul ignore next */
+        for (const meta of Utils.values(MetadataStorage.getMetadata())) {
+            /* v8 ignore next 3 */
             const path = meta.path.match(/\.[jt]s$/)
                 ? meta.path.replace(/\.js$/, '.d.ts')
                 : `${meta.path}.d.ts`; // when entities are bundled, their paths are just their names
@@ -197,4 +195,3 @@ class TsMorphMetadataProvider extends core_1.MetadataProvider {
         }
     }
 }
-exports.TsMorphMetadataProvider = TsMorphMetadataProvider;

package/index.d.ts

@@ -2,4 +2,4 @@
  * @packageDocumentation
  * @module reflection
  */
-export * from './TsMorphMetadataProvider';
+export * from './TsMorphMetadataProvider.js';

package/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @packageDocumentation
  * @module reflection
  */
-__exportStar(require("./TsMorphMetadataProvider"), exports);
+export * from './TsMorphMetadataProvider.js';

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@mikro-orm/reflection",
-  "version": "7.0.0-dev.1",
+  "type": "module",
+  "version": "7.0.0-dev.11",
   "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",
-  "typings": "index.d.ts",
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "require": "./index.js"
-    }
+    ".": "./index.js"
   },
   "repository": {
     "type": "git",
@@ -49,7 +41,7 @@
     "node": ">= 22.11.0"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
+    "build": "yarn clean && yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
@@ -62,9 +54,9 @@
     "ts-morph": "25.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.4.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.1"
+    "@mikro-orm/core": "7.0.0-dev.11"
   }
 }

package/index.mjs

@@ -1,4 +0,0 @@
-import mod from "./index.js";
-
-export default mod;
-export const TsMorphMetadataProvider = mod.TsMorphMetadataProvider;