@mikro-orm/decorators 7.0.5-dev.6 → 7.0.5-dev.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/decorators",
-  "version": "7.0.5-dev.6",
+  "version": "7.0.5-dev.7",
   "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",
@@ -52,7 +52,7 @@
     "@mikro-orm/core": "^7.0.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.5-dev.6",
+    "@mikro-orm/core": "7.0.5-dev.7",
     "reflect-metadata": "^0.1.0 || ^0.2.0"
   },
   "peerDependenciesMeta": {

package/utils.js

@@ -87,16 +87,20 @@ export function lookupPathFromDecorator(name, stack) {
     // Reflect.decorate() as well. Also when babel is used, we need to check
     // the `_applyDecoratedDescriptor` method instead.
     let line = stack.findIndex(line => /__decorate|Reflect\.decorate|_applyDecoratedDescriptor/.exec(line));
-    // bun does not have those lines at all, only the DecorateProperty/DecorateConstructor,
-    // but those are also present in node, so we need to check this only if they weren't found.
+    // Bun can skip decorator helper frames. Native ES decorators expose the entity
+    // path right after `bun:wrap`, while reflect-metadata stacks reach it via Reflect.js.
     if (line === -1) {
-        // here we handle bun which stack is different from nodejs so we search for reflect-metadata
-        // Different bun versions might have different stack traces. The "last index" works for both 1.2.6 and 1.2.7.
-        const reflectLine = stack.findLastIndex(line => line.replace(/\\/g, '/').includes('node_modules/reflect-metadata/Reflect.js'));
-        if (reflectLine === -1 || reflectLine + 2 >= stack.length || !stack[reflectLine + 1].includes('bun:wrap')) {
-            return name;
+        const bunWrapLine = stack.findLastIndex(stackLine => stackLine.includes('bun:wrap'));
+        if (bunWrapLine !== -1 && bunWrapLine + 1 < stack.length) {
+            line = bunWrapLine + 1;
+        }
+        else {
+            const reflectLine = stack.findLastIndex(stackLine => stackLine.replace(/\\/g, '/').includes('node_modules/reflect-metadata/Reflect.js'));
+            if (reflectLine === -1 || reflectLine + 2 >= stack.length || !stack[reflectLine + 1].includes('bun:wrap')) {
+                return name;
+            }
+            line = reflectLine + 2;
         }
-        line = reflectLine + 2;
     }
     if (stack[line].includes('Reflect.decorate')) {
         line++;
@@ -108,7 +112,7 @@ export function lookupPathFromDecorator(name, stack) {
         line++;
     }
     try {
-        const re = /\(.+\)/i.exec(stack[line]) ? /\((.*):\d+:\d+\)/ : /at\s*(.*):\d+:\d+$/;
+        const re = /\(.+\)/i.exec(stack[line]) ? /\((.*?)(?::\d+){1,2}\)/ : /at\s*(.*?)(?::\d+){1,2}$/;
         return stack[line].match(re)[1];
     }
     catch {