fix(tsconfig): prioritize deno.json if it has compiler options (#30056)

libs/resolver/deno_json.rs

@@ -1114,6 +1114,12 @@ impl CompilerOptionsResolver {
   }
 
   pub fn for_specifier(&self, specifier: &Url) -> &CompilerOptionsData {
+    let workspace_data = self.workspace_configs.get_for_specifier(specifier);
+    if !workspace_data
+      .sources
+      .iter()
+      .any(|s| s.compiler_options.is_some())
+    {
       if let Ok(path) = url_to_file_path(specifier) {
         for ts_config in &self.ts_configs {
           if ts_config.filter.includes_path(&path) {
@@ -1121,13 +1127,21 @@ impl CompilerOptionsResolver {
           }
         }
       }
-    self.workspace_configs.get_for_specifier(specifier)
+    }
+    workspace_data
   }
 
   pub fn entry_for_specifier(
     &self,
     specifier: &Url,
   ) -> (CompilerOptionsKey, &CompilerOptionsData) {
+    let (scope, workspace_data) =
+      self.workspace_configs.entry_for_specifier(specifier);
+    if !workspace_data
+      .sources
+      .iter()
+      .any(|s| s.compiler_options.is_some())
+    {
       if let Ok(path) = url_to_file_path(specifier) {
         for (i, ts_config) in self.ts_configs.iter().enumerate() {
           if ts_config.filter.includes_path(&path) {
@@ -1138,8 +1152,11 @@ impl CompilerOptionsResolver {
           }
         }
       }
-    let (scope, data) = self.workspace_configs.entry_for_specifier(specifier);
+    }
-    (CompilerOptionsKey::WorkspaceConfig(scope.cloned()), data)
+    (
+      CompilerOptionsKey::WorkspaceConfig(scope.cloned()),
+      workspace_data,
+    )
   }
 
   pub fn entries(

tests/specs/check/tsconfig_deno_json_priority/deno.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "lib": ["esnext", "dom"]
+  }
+}

tests/specs/check/tsconfig_deno_json_priority/main.out

@@ -1,11 +1,6 @@
-TS2584 [ERROR]: Cannot find name 'document'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
-document.body.innerHTML = "<div>Hello</div>";
-~~~~~~~~
-    at file:///[WILDLINE]main.deno.ts:2:1
-
 TS2304 [ERROR]: Cannot find name 'Deno'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'deno.ns' or add a triple-slash directive to the top of your entrypoint (main file): /// <reference lib="deno.ns" />
 Deno.readTextFileSync("hello.txt");
 ~~~~
-    at file:///[WILDLINE]main.dom.ts:1:1
+    at file:///[WILDLINE]main.ts:1:1
 
 error: Type checking failed.

tests/specs/check/tsconfig_exclude/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_exclude/tsconfig.dom.json

@@ -0,0 +1,7 @@
+{
+  "exclude": ["*.deno.ts"],
+  "compilerOptions": {
+    "composite": true,
+    "lib": ["esnext", "dom"]
+  }
+}

tests/specs/check/tsconfig_exclude/tsconfig.json

@@ -1,6 +1,8 @@
 {
-  "exclude": ["*.deno.ts"],
   "compilerOptions": {
-    "lib": ["esnext", "dom"]
+    "lib": ["deno.window"]
-  }
+  },
+  "references": [
+    { "path": "tsconfig.dom.json" }
+  ]
 }

tests/specs/check/tsconfig_extends/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_extends/tsconfig.extends.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.dom.json",
+  "files": ["main.dom.ts"],
+  "compilerOptions": {
+    "composite": true
+  }
+}

tests/specs/check/tsconfig_extends/tsconfig.json

@@ -1,4 +1,8 @@
 {
-  "extends": "./tsconfig.dom.json",
+  "compilerOptions": {
-  "files": ["main.dom.ts"]
+    "lib": ["deno.window"]
+  },
+  "references": [
+    { "path": "tsconfig.extends.json" }
+  ]
 }

tests/specs/check/tsconfig_extends_array/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_extends_array/tsconfig.extends.json

@@ -0,0 +1,6 @@
+{
+  "extends": ["./tsconfig.dom_files.json", "./tsconfig.dom.json"],
+  "compilerOptions": {
+    "composite": true
+  }
+}

tests/specs/check/tsconfig_extends_array/tsconfig.json

@@ -1,3 +1,8 @@
 {
-  "extends": ["./tsconfig.dom_files.json", "./tsconfig.dom.json"]
+  "compilerOptions": {
+    "lib": ["deno.window"]
+  },
+  "references": [
+    { "path": "tsconfig.extends.json" }
+  ]
 }

tests/specs/check/tsconfig_extends_node_resolution/deno.json

@@ -1,6 +1,3 @@
 {
-  "nodeModulesDir": "manual",
+  "nodeModulesDir": "manual"
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
 }

tests/specs/check/tsconfig_extends_node_resolution/tsconfig.dom.json

@@ -0,0 +1,7 @@
+{
+  "extends": "foo/tsconfig.dom",
+  "files": ["main.dom.ts"],
+  "compilerOptions": {
+    "composite": true
+  }
+}

tests/specs/check/tsconfig_extends_node_resolution/tsconfig.json

@@ -1,4 +1,8 @@
 {
-  "extends": "foo/tsconfig.dom",
+  "compilerOptions": {
-  "files": ["main.dom.ts"]
+    "lib": ["deno.window"]
+  },
+  "references": [
+    { "path": "tsconfig.dom.json" }
+  ]
 }

tests/specs/check/tsconfig_files/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_files/tsconfig.json

@@ -1,6 +1,8 @@
 {
-  "files": ["main.dom.ts"],
   "compilerOptions": {
-    "lib": ["esnext", "dom"]
+    "lib": ["deno.window"]
-  }
+  },
+  "references": [
+    { "path": "tsconfig.dom.json" }
+  ]
 }

tests/specs/check/tsconfig_files_for_globals/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_files_for_globals/tsconfig.dom.json

@@ -0,0 +1,6 @@
+{
+  "files": ["main.dom.ts", "globals.d.ts"],
+  "compilerOptions": {
+    "composite": true
+  }
+}

tests/specs/check/tsconfig_files_for_globals/tsconfig.json

@@ -1,3 +1,8 @@
 {
-  "files": ["main.dom.ts", "globals.d.ts"]
+  "compilerOptions": {
+    "lib": ["deno.window"]
+  },
+  "references": [
+    { "path": "tsconfig.dom.json" }
+  ]
 }

tests/specs/check/tsconfig_include/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_include/tsconfig.dom.json

@@ -0,0 +1,6 @@
+{
+  "include": ["*.dom.ts"],
+  "compilerOptions": {
+    "lib": ["esnext", "dom"]
+  }
+}

tests/specs/check/tsconfig_include/tsconfig.json

@@ -1,6 +1,8 @@
 {
-  "include": ["*.dom.ts"],
   "compilerOptions": {
-    "lib": ["esnext", "dom"]
+    "lib": ["deno.window"]
-  }
+  },
+  "references": [
+    { "path": "tsconfig.dom.json" }
+  ]
 }

tests/specs/check/tsconfig_references/main.dom.ts

@@ -1,2 +0,0 @@
-Deno.readTextFileSync("hello.txt");
-document.body.innerHTML = "<div>Hello</div>";

tests/specs/check/tsconfig_references/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "files": [],
-  "references": [
-    { "path": "tsconfig.dom.json" }
-  ]
-}

tests/specs/check/tsconfig_references_dir/deno.json

@@ -1,5 +1 @@
-{
+{}
-  "compilerOptions": {
-    "lib": ["deno.window"]
-  }
-}

tests/specs/check/tsconfig_references_dir/tsconfig.dom.json

@@ -0,0 +1,9 @@
+{
+  "files": [],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    { "path": "tsconfig_dom" }
+  ]
+}

tests/specs/check/tsconfig_references_dir/tsconfig.json

@@ -1,6 +1,8 @@
 {
-  "files": [],
+  "compilerOptions": {
+    "lib": ["deno.window"]
+  },
   "references": [
-    { "path": "tsconfig_dom" }
+    { "path": "tsconfig.dom.json" }
   ]
 }