wip [ci skip]

Boshen · Boshen · commit 3e7003b5d1bb · 2025-11-21T17:38:17.000+08:00
diff --git a/fixtures/tsconfck/parse/solution/referenced-files/src/bar.ts b/fixtures/tsconfck/parse/solution/referenced-files/src/bar.ts
diff --git a/fixtures/tsconfck/parse/solution/referenced-files/src/foo.ts b/fixtures/tsconfck/parse/solution/referenced-files/src/foo.ts
diff --git a/fixtures/tsconfck/parse/solution/referenced-files/tsconfig.foo.json b/fixtures/tsconfck/parse/solution/referenced-files/tsconfig.foo.json
@@ -0,0 +1,3 @@
+{
+  "files": ["src/foo.ts"]
+}
diff --git a/fixtures/tsconfck/parse/solution/referenced-files/tsconfig.json b/fixtures/tsconfck/parse/solution/referenced-files/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "files": [],
+  "references": [{
+    "path": "./tsconfig.foo.json"
+  }]
+}
diff --git a/fixtures/tsconfck/parse/solution/referenced-include/src/bar.ts b/fixtures/tsconfck/parse/solution/referenced-include/src/bar.ts
diff --git a/fixtures/tsconfck/parse/solution/referenced-include/src/foo.ts b/fixtures/tsconfck/parse/solution/referenced-include/src/foo.ts
diff --git a/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.bar.json b/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.bar.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.foo.json b/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.foo.json
@@ -0,0 +1,3 @@
+{
+  "include": ["src/foo.ts"]
+}
diff --git a/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.json b/fixtures/tsconfck/parse/solution/referenced-include/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "files": [],
+  "references": [{
+    "path": "./tsconfig.foo.json"
+  }, {
+    "path": "./tsconfig.bar.json"
+  }]
+}
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "@napi-rs/wasm-runtime": "^1.0.7",
     "@types/node": "^24.9.1",
     "emnapi": "^1.6.0",
+    "tsconfck": "^3.1.6",
     "typescript": "^5.9.3",
     "vitest": "^4.0.0"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/tests/tsconfck.rs b/src/tests/tsconfck.rs
@@ -58,27 +58,32 @@ fn solution() {
 fn part_of_solution() {
     let root = super::fixture_root().join("tsconfck").join("parse").join("solution");
 
-    let data = [
-        ("simple", "src/foo.ts", "src/tsconfig.json"),
-        ("simple", "tests/foo.ts", "tests/tsconfig.json"),
-        ("mixed", "src/bar.mts", "tsconfig.src.json"),
-        ("mixed", "src/baz.cts", "tsconfig.src.json"),
-        ("mixed", "src/foo.ts", "tsconfig.src.json"),
-        ("mixed", "src/foo.spec.ts", "tsconfig.test.json"),
-        ("referenced-extends-original", "src/foo.ts", "src/tsconfig.src.json"),
-        ("referenced-extends-original", "tests/foo.test.ts", "tests/tsconfig.test.json"),
-        ("referenced-with-configDir", "src/foo.ts", "tsconfig.src.json"),
-        (
-            "referenced-with-configDir-and-extends",
-            "packages/foo/src/foo.ts",
-            "packages/foo/tsconfig.foo.json",
-        ),
-        ("referenced-with-implicit-globs", "src/foo.ts", "tsconfig.src.json"),
-        ("referenced-with-implicit-globs", "tests/foo.test.ts", "tsconfig.test.json"),
+    let pass = [
+        // ("simple", "src/foo.ts", "src/tsconfig.json"),
+        // ("simple", "tests/foo.ts", "tests/tsconfig.json"),
+        // ("mixed", "src/bar.mts", "tsconfig.src.json"),
+        // ("mixed", "src/baz.cts", "tsconfig.src.json"),
+        // ("mixed", "src/foo.ts", "tsconfig.src.json"),
+        // ("mixed", "src/foo.spec.ts", "tsconfig.test.json"),
+        // ("referenced-extends-original", "src/foo.ts", "src/tsconfig.src.json"),
+        // ("referenced-extends-original", "tests/foo.test.ts", "tests/tsconfig.test.json"),
+        // ("referenced-with-configDir", "src/foo.ts", "tsconfig.src.json"),
+        // (
+        // "referenced-with-configDir-and-extends",
+        // "packages/foo/src/foo.ts",
+        // "packages/foo/tsconfig.foo.json",
+        // ),
+        // ("referenced-with-implicit-globs", "src/foo.ts", "tsconfig.src.json"),
+        // ("referenced-with-implicit-globs", "tests/foo.test.ts", "tsconfig.test.json"),
+        // not part of tsconfck
+        // ("referenced-files", "src/foo.ts", "tsconfig.foo.json"),
+        // ("referenced-files", "src/bar.ts", "tsconfig.json"), // not included
+        ("referenced-include", "src/foo.ts", "tsconfig.foo.json"),
+        // ("referenced-include", "src/bar.ts", "tsconfig.bar.json"),
     ];
 
     let resolver = Resolver::default();
-    for (dir, specifier, expected) in data {
+    for (dir, specifier, expected) in pass {
         let dir = root.join(dir);
         let tsconfig = resolver.find_tsconfig(dir.join(specifier)).unwrap().unwrap();
         assert_eq!(tsconfig.path.clone(), dir.join(expected));
diff --git a/src/tests/tsconfig_extends.rs b/src/tests/tsconfig_extends.rs
@@ -24,7 +24,7 @@ fn test_extend_tsconfig() {
     let resolution = resolver.resolve_tsconfig(&f).expect("resolved");
 
     // Should inherit tsconfig from parent
-    assert_eq!(resolution.files, Some(vec!["files".to_string()]));
+    assert_eq!(resolution.files, Some(vec![f.join("files")]));
     assert_eq!(resolution.include, Some(vec![f.join("include")]));
     assert_eq!(resolution.exclude, Some(vec![f.join("exclude")]));
 
diff --git a/src/tsconfig.rs b/src/tsconfig.rs
@@ -11,6 +11,7 @@ use serde::Deserialize;
 
 use crate::{TsconfigReferences, path::PathUtil};
 
+// Allow list: <https://github.com/microsoft/TypeScript/issues/57485#issuecomment-2027787456>
 const TEMPLATE_VARIABLE: &str = "${configDir}";
 
 pub type CompilerOptionsPathsMap = IndexMap<String, Vec<String>, BuildHasherDefault<FxHasher>>;
@@ -36,7 +37,7 @@ pub struct TsConfig {
     pub path: PathBuf,
 
     #[serde(default)]
-    pub files: Option<Vec<String>>,
+    pub files: Option<Vec<PathBuf>>,
 
     #[serde(default)]
     pub include: Option<Vec<PathBuf>>,
@@ -297,6 +298,21 @@ impl TsConfig {
 
         let config_dir = self.directory().to_path_buf();
 
+        // Substitute template variable in `tsconfig.files`.
+        if let Some(files) = self.files.take() {
+            self.files = Some(
+                files
+                    .into_iter()
+                    .map(|file| {
+                        file.to_string_lossy().strip_prefix(TEMPLATE_VARIABLE).map_or_else(
+                            || config_dir.normalize_with(file.clone()),
+                            |stripped_path| config_dir.join(stripped_path.trim_start_matches('/')),
+                        )
+                    })
+                    .collect(),
+            );
+        }
+
         // Substitute template variable in `tsconfig.include`.
         if let Some(includes) = self.include.take() {
             self.include = Some(
diff --git a/src/tsconfig_resolver.rs b/src/tsconfig_resolver.rs
@@ -77,64 +77,78 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
     }
 
     fn is_file_included_in_tsconfig(path: &Path, tsconfig: &TsConfig) -> bool {
+        const DEFAULT_INCLUDE: &[&str] = &["**/*"];
+        const DEFAULT_EXCLUDE: &[&str] = &["node_modules", "bower_components", "jspm_packages"];
+        // 1. Check files array (highest priority - overrides exclude)
         if tsconfig
             .files
             .as_ref()
             .is_some_and(|files| files.iter().any(|file| Path::new(file) == path))
         {
             return true;
         }
-        let mut is_included = false;
-        if let Some(includes) = &tsconfig.include {
-            for include in includes {
-                if Self::is_glob_match(include, path, tsconfig) {
-                    is_included = true;
-                    break;
-                }
+        // 2. Check include patterns (default to ["**/*"] if no files and no include)
+        let is_included = match &tsconfig.include {
+            Some(include_patterns) => {
+                let include_patterns = include_patterns
+                    .iter()
+                    .map(|path| path.to_string_lossy().to_string())
+                    .collect::<Vec<_>>();
+                Self::is_glob_match(path, &include_patterns, tsconfig)
             }
-        }
-        if is_included {
-            let mut is_excluded = false;
-            if let Some(excludes) = &tsconfig.exclude {
-                for exclude in excludes {
-                    if Self::is_glob_match(exclude, path, tsconfig) {
-                        is_excluded = true;
-                        break;
-                    }
-                }
+            None => {
+                tsconfig.files.is_none() && Self::is_glob_match(path, DEFAULT_INCLUDE, tsconfig)
             }
-            return !is_excluded;
-        }
-        false
-    }
-
-    fn is_glob_match(pattern: &Path, path: &Path, tsconfig: &TsConfig) -> bool {
-        let pattern = pattern.to_string_lossy();
-        // Special case: **/* matches everything
-        if pattern == "**/*" {
-            return true;
-        }
-        // Normalize pattern: add implicit /**/* for directory patterns
-        // Find the part after the last '/' to check if it looks like a directory
-        let after_last_slash =
-            pattern.rsplit('/').next().map_or_else(|| pattern.clone(), Cow::Borrowed);
-        let needs_implicit_glob = !after_last_slash.contains(['.', '*', '?']);
-        let pattern = if needs_implicit_glob {
-            Cow::Owned(format!(
-                "{pattern}{}",
-                if pattern.ends_with('/') { "**/*" } else { "/**/*" }
-            ))
-        } else {
-            pattern
         };
-        // Fast check: if pattern ends with *, filename must have valid extension
-        if pattern.ends_with('*') && !Self::is_file_extension_allowed_in_tsconfig(path, tsconfig) {
+        if !is_included {
             return false;
         }
-        // dbg!(pattern, path);
-        // if pattern.contains('*')
-        let path = path.to_string_lossy();
-        fast_glob::glob_match(pattern.as_ref(), path.as_ref())
+        // 3. Check exclude patterns (default excludes node_modules, etc.)
+        let is_excluded = match &tsconfig.exclude {
+            Some(exclude_patterns) => {
+                let exclude_patterns = exclude_patterns
+                    .iter()
+                    .map(|path| path.to_string_lossy().to_string())
+                    .collect::<Vec<_>>();
+                Self::is_glob_match(path, &exclude_patterns, tsconfig)
+            }
+            None => Self::is_glob_match(path, DEFAULT_EXCLUDE, tsconfig),
+        };
+        !is_excluded
+    }
+
+    fn is_glob_match<S: AsRef<str>>(path: &Path, patterns: &[S], tsconfig: &TsConfig) -> bool {
+        let path_str = path.to_string_lossy();
+        patterns.into_iter().any(|pattern| {
+            let pattern = pattern.as_ref();
+
+            if pattern == path_str {
+                return true;
+            }
+            // Special case: **/* matches everything
+            if pattern == "**/*" {
+                return true;
+            }
+            // Normalize pattern: add implicit /**/* for directory patterns
+            // Find the part after the last '/' to check if it looks like a directory
+            let after_last_slash = pattern.rsplit('/').next().unwrap_or(pattern);
+            let needs_implicit_glob = !after_last_slash.contains(['.', '*', '?']);
+            let pattern = if needs_implicit_glob {
+                Cow::Owned(format!(
+                    "{pattern}{}",
+                    if pattern.ends_with('/') { "**/*" } else { "/**/*" }
+                ))
+            } else {
+                Cow::Borrowed(pattern)
+            };
+            // Fast check: if pattern ends with *, filename must have valid extension
+            if pattern.ends_with('*')
+                && !Self::is_file_extension_allowed_in_tsconfig(&path, tsconfig)
+            {
+                return false;
+            }
+            fast_glob::glob_match(pattern.as_ref(), path_str.as_ref())
+        })
     }
 
     fn is_file_extension_allowed_in_tsconfig(path: &Path, tsconfig: &TsConfig) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "files": ["src/foo.ts"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "include": ["src/foo.ts"]`
	`3`	`+}`