From 0e60bb9cf701fea3864403e6851abad86bc0b65d Mon Sep 17 00:00:00 2001
From: Marvin Hagemeister <marvin@deno.com>
Date: Fri, 18 Oct 2024 21:45:05 +0200
Subject: fix(info): resolve workspace member mappings (#26350)

This PR fixes the issue where mapped specifiers in a workspace member
would never be found. Only mapped paths from the workspace root would
resolve.

This was caused by always passing the workspace root url to the import
map resolver instead of the workspace member one.

Fixes https://github.com/denoland/deno/issues/26138
Fixes https://github.com/denoland/fresh/issues/2615

---------

Signed-off-by: Marvin Hagemeister <marvinhagemeister50@gmail.com>
Co-authored-by: David Sherret <dsherret@users.noreply.github.com>
---
 tests/specs/info/import_map/__test__.jsonc               | 10 +++++++---
 tests/specs/info/workspace_member/__test__.jsonc         | 16 ++++++++++++++++
 tests/specs/info/workspace_member/deno.json              |  3 +++
 .../info/workspace_member/info_workspace_member.out      |  6 ++++++
 .../info/workspace_member/info_workspace_member_sub.out  |  6 ++++++
 tests/specs/info/workspace_member/member/deno.json       |  5 +++++
 tests/specs/info/workspace_member/member/sub/file.ts     |  1 +
 7 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 tests/specs/info/workspace_member/__test__.jsonc
 create mode 100644 tests/specs/info/workspace_member/deno.json
 create mode 100644 tests/specs/info/workspace_member/info_workspace_member.out
 create mode 100644 tests/specs/info/workspace_member/info_workspace_member_sub.out
 create mode 100644 tests/specs/info/workspace_member/member/deno.json
 create mode 100644 tests/specs/info/workspace_member/member/sub/file.ts

(limited to 'tests')

diff --git a/tests/specs/info/import_map/__test__.jsonc b/tests/specs/info/import_map/__test__.jsonc
index 725276925..7aba603e0 100644
--- a/tests/specs/info/import_map/__test__.jsonc
+++ b/tests/specs/info/import_map/__test__.jsonc
@@ -1,5 +1,9 @@
 {
-  "args": "info preact/debug",
-  "output": "with_import_map.out",
-  "exitCode": 0
+  "steps": [
+    {
+      "args": "info preact/debug",
+      "output": "with_import_map.out",
+      "exitCode": 0
+    }
+  ]
 }
diff --git a/tests/specs/info/workspace_member/__test__.jsonc b/tests/specs/info/workspace_member/__test__.jsonc
new file mode 100644
index 000000000..d13d3b03e
--- /dev/null
+++ b/tests/specs/info/workspace_member/__test__.jsonc
@@ -0,0 +1,16 @@
+{
+  "tests": {
+    "member_folder": {
+      "args": "info --quiet foo",
+      "cwd": "member",
+      "output": "info_workspace_member.out",
+      "exitCode": 0
+    },
+    "member_folder_sub": {
+      "args": "info --quiet foo",
+      "cwd": "member/sub",
+      "output": "info_workspace_member_sub.out",
+      "exitCode": 0
+    }
+  }
+}
diff --git a/tests/specs/info/workspace_member/deno.json b/tests/specs/info/workspace_member/deno.json
new file mode 100644
index 000000000..f88028aea
--- /dev/null
+++ b/tests/specs/info/workspace_member/deno.json
@@ -0,0 +1,3 @@
+{
+  "workspace": ["./member"]
+}
diff --git a/tests/specs/info/workspace_member/info_workspace_member.out b/tests/specs/info/workspace_member/info_workspace_member.out
new file mode 100644
index 000000000..e0dc0b675
--- /dev/null
+++ b/tests/specs/info/workspace_member/info_workspace_member.out
@@ -0,0 +1,6 @@
+local: [WILDCARD]file.ts
+type: TypeScript
+dependencies: 0 unique
+size: [WILDCARD]
+
+file://[WILDCARD]/member/sub/file.ts ([WILDCARD])
diff --git a/tests/specs/info/workspace_member/info_workspace_member_sub.out b/tests/specs/info/workspace_member/info_workspace_member_sub.out
new file mode 100644
index 000000000..e0dc0b675
--- /dev/null
+++ b/tests/specs/info/workspace_member/info_workspace_member_sub.out
@@ -0,0 +1,6 @@
+local: [WILDCARD]file.ts
+type: TypeScript
+dependencies: 0 unique
+size: [WILDCARD]
+
+file://[WILDCARD]/member/sub/file.ts ([WILDCARD])
diff --git a/tests/specs/info/workspace_member/member/deno.json b/tests/specs/info/workspace_member/member/deno.json
new file mode 100644
index 000000000..66aac2904
--- /dev/null
+++ b/tests/specs/info/workspace_member/member/deno.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "foo": "./sub/file.ts"
+  }
+}
diff --git a/tests/specs/info/workspace_member/member/sub/file.ts b/tests/specs/info/workspace_member/member/sub/file.ts
new file mode 100644
index 000000000..cb0ff5c3b
--- /dev/null
+++ b/tests/specs/info/workspace_member/member/sub/file.ts
@@ -0,0 +1 @@
+export {};
-- 
cgit v1.2.3