fix typescript metadata for import identifiers (#6130)

* handle import identifiers

* a test

* handle dot case

2 files changed, 58 insertions, 6 deletions

diff --git a/src/js_parser.zig b/src/js_parser.zig
index 13e264251..449d1cbab 100644
--- a/src/js_parser.zig
+++ b/src/js_parser.zig
@@ -19556,6 +19556,15 @@ fn NewParser_(
 
                 .m_identifier => |ref| {
                     p.recordUsage(ref);
+                    if (p.is_import_item.contains(ref)) {
+                        return p.maybeDefinedHelper(p.newExpr(
+                            E.ImportIdentifier{
+                                .ref = ref,
+                            },
+                            logger.Loc.Empty,
+                        ));
+                    }
+
                     return p.maybeDefinedHelper(p.newExpr(
                         E.Identifier{ .ref = ref },
                         logger.Loc.Empty,
@@ -19588,12 +19597,21 @@ fn NewParser_(
                         i -= 1;
                     }
 
-                    current_expr.* = p.newExpr(
-                        E.Identifier{
-                            .ref = refs.items[0],
-                        },
-                        logger.Loc.Empty,
-                    );
+                    if (p.is_import_item.contains(refs.items[0])) {
+                        current_expr.* = p.newExpr(
+                            E.ImportIdentifier{
+                                .ref = refs.items[0],
+                            },
+                            logger.Loc.Empty,
+                        );
+                    } else {
+                        current_expr.* = p.newExpr(
+                            E.Identifier{
+                                .ref = refs.items[0],
+                            },
+                            logger.Loc.Empty,
+                        );
+                    }
 
                     const dot_identifier = current_expr.*;
                     var current_dot = dots;
diff --git a/test/bundler/bundler_decorator_metadata.test.ts b/test/bundler/bundler_decorator_metadata.test.ts
index 54bbdd6a5..10fee3c68 100644
--- a/test/bundler/bundler_decorator_metadata.test.ts
+++ b/test/bundler/bundler_decorator_metadata.test.ts
@@ -503,3 +503,37 @@ itBundled("decorator_metadata/TypeSerialization", {
     stdout: "true\n".repeat(212),
   },
 });
+
+itBundled("decorator_metadata/ImportIdentifiers", {
+  files: {
+    "/entry.ts": /* ts */ `
+        import "reflect-metadata";
+        import { Foo } from "./foo.js";
+
+        function d1() {}
+
+        @d1
+        class Bar {
+            constructor(foo: Foo) {}
+        }
+
+        console.log(Reflect.getMetadata("design:paramtypes", Bar)[0] === Foo);
+    `,
+    "/foo.js": /* js */ `
+        const f = () => "Foo";
+        module.exports[f()] = class Foo {};
+    `,
+    "/tsconfig.json": /* json */ `
+        {
+            "compilerOptions": {
+                "experimentalDecorators": true,
+                "emitDecoratorMetadata": true,
+            }
+        }
+    `,
+  },
+  install: ["reflect-metadata"],
+  run: {
+    stdout: "true\n",
+  },
+});