fix(npm): allow resolving from package.json when an import map exists (#17905)

8 files changed, 54 insertions, 0 deletions

diff --git a/cli/tests/integration/check_tests.rs b/cli/tests/integration/check_tests.rs
index 021a536c4..1273fbdce 100644
--- a/cli/tests/integration/check_tests.rs
+++ b/cli/tests/integration/check_tests.rs
@@ -251,3 +251,13 @@ itest!(package_json_fail_check {
   copy_temp_dir: Some("package_json/basic"),
   exit_code: 1,
 });
+
+itest!(package_json_with_deno_json {
+  args: "check --quiet main.ts",
+  output: "package_json/deno_json/main.check.out",
+  cwd: Some("package_json/deno_json/"),
+  copy_temp_dir: Some("package_json/deno_json/"),
+  envs: env_vars_for_npm_tests_no_sync_download(),
+  http_server: true,
+  exit_code: 1,
+});
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index d89142c21..4b7869ef6 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -2793,6 +2793,15 @@ itest!(package_json_auto_discovered_for_npm_binary {
   http_server: true,
 });
 
+itest!(package_json_with_deno_json {
+  args: "run --quiet -A main.ts",
+  output: "package_json/deno_json/main.out",
+  cwd: Some("package_json/deno_json/"),
+  copy_temp_dir: Some("package_json/deno_json/"),
+  envs: env_vars_for_npm_tests_no_sync_download(),
+  http_server: true,
+});
+
 itest!(wasm_streaming_panic_test {
   args: "run run/wasm_streaming_panic_test.js",
   output: "run/wasm_streaming_panic_test.js.out",
diff --git a/cli/tests/testdata/package_json/deno_json/deno.json b/cli/tests/testdata/package_json/deno_json/deno.json
new file mode 100644
index 000000000..8a89da280
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/deno.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "other": "./other.ts"
+  }
+}
diff --git a/cli/tests/testdata/package_json/deno_json/main.check.out b/cli/tests/testdata/package_json/deno_json/main.check.out
new file mode 100644
index 000000000..53b6869c0
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/main.check.out
@@ -0,0 +1,11 @@
+error: TS2322 [ERROR]: Type 'number' is not assignable to type 'string'.
+const _strValue1: string = NUMBER_VALUE;
+      ~~~~~~~~~~
+    at file:///[WILDCARD]/main.ts:8:7
+
+TS2322 [ERROR]: Type 'number' is not assignable to type 'string'.
+const _strValue2: string = test.getValue();
+      ~~~~~~~~~~
+    at file:///[WILDCARD]/main.ts:9:7
+
+Found 2 errors.
diff --git a/cli/tests/testdata/package_json/deno_json/main.out b/cli/tests/testdata/package_json/deno_json/main.out
new file mode 100644
index 000000000..1191247b6
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/main.out
@@ -0,0 +1,2 @@
+1
+2
diff --git a/cli/tests/testdata/package_json/deno_json/main.ts b/cli/tests/testdata/package_json/deno_json/main.ts
new file mode 100644
index 000000000..7768ff3fc
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/main.ts
@@ -0,0 +1,9 @@
+import { NUMBER_VALUE } from "other";
+import * as test from "@denotest/esm-basic";
+
+test.setValue(2);
+console.log(test.getValue());
+
+// these should cause type errors
+const _strValue1: string = NUMBER_VALUE;
+const _strValue2: string = test.getValue();
diff --git a/cli/tests/testdata/package_json/deno_json/other.ts b/cli/tests/testdata/package_json/deno_json/other.ts
new file mode 100644
index 000000000..997d84adf
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/other.ts
@@ -0,0 +1,3 @@
+console.log(1);
+
+export const NUMBER_VALUE = 1;
diff --git a/cli/tests/testdata/package_json/deno_json/package.json b/cli/tests/testdata/package_json/deno_json/package.json
new file mode 100644
index 000000000..54ca824d6
--- /dev/null
+++ b/cli/tests/testdata/package_json/deno_json/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@denotest/esm-basic": "*"
+  }
+}