feat: implement tsconfig include/exclude/files matching

Cargo.toml

@@ -78,6 +78,7 @@ name = "resolver"
 
 [dependencies]
 cfg-if = "1"
+fast-glob = "1.0.0"
 indexmap = { version = "2", features = ["serde"] }
 json-strip-comments = "3"
 once_cell = "1" # Use `std::sync::OnceLock::get_or_try_init` when it is stable.

fixtures/tsconfig/cases/absolute_patterns/excluded/file.ts

@@ -0,0 +1 @@
+export const excluded = "excluded";

fixtures/tsconfig/cases/absolute_patterns/src/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/absolute_patterns/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "include": ["src/**/*.ts"],
+  "exclude": ["excluded"]
+}

fixtures/tsconfig/cases/case_sensitivity/src/index.ts

@@ -0,0 +1 @@
+export const upper = "upper";

fixtures/tsconfig/cases/case_sensitivity/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["src/**/*.ts"]
+}

fixtures/tsconfig/cases/character_set_patterns/App.ts

@@ -0,0 +1 @@
+export const app2 = "app2";

fixtures/tsconfig/cases/character_set_patterns/Button.ts

@@ -0,0 +1 @@
+export const button2 = "button2";

fixtures/tsconfig/cases/character_set_patterns/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["*.ts"]
+}

fixtures/tsconfig/cases/complex_patterns/src/deep/nested/test/component.spec.ts

@@ -0,0 +1 @@
+export const component = "component";

fixtures/tsconfig/cases/complex_patterns/src/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/complex_patterns/src/test/unit.spec.ts

@@ -0,0 +1 @@
+export const spec = "spec";

fixtures/tsconfig/cases/complex_patterns/src/test/unit.test.ts

@@ -0,0 +1 @@
+export const test = "test";

fixtures/tsconfig/cases/complex_patterns/src/utils/helper.ts

@@ -0,0 +1 @@
+export const utils = "utils";

fixtures/tsconfig/cases/complex_patterns/src/utils/test/helper.spec.ts

@@ -0,0 +1 @@
+export const helper = "helper";

fixtures/tsconfig/cases/complex_patterns/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["src/**/test/**/*.spec.ts"]
+}

fixtures/tsconfig/cases/configdir_syntax/dist/output.js

@@ -0,0 +1 @@
+// Built file

fixtures/tsconfig/cases/configdir_syntax/index.ts

@@ -0,0 +1 @@
+export const index = 'index';

fixtures/tsconfig/cases/configdir_syntax/log.ts

@@ -0,0 +1 @@
+export const log = console.log.bind(console);

fixtures/tsconfig/cases/configdir_syntax/src/index.ts

@@ -0,0 +1 @@
+export const src = 'src';

fixtures/tsconfig/cases/configdir_syntax/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "include": ["${configDir}/*.ts"],
+  "exclude": ["dist"],
+  "compilerOptions": {
+    "paths": {
+      "~/*": ["${configDir}/*"]
+    }
+  }
+}

fixtures/tsconfig/cases/empty_files_no_include/index.ts

@@ -0,0 +1 @@
+export const index = 'index';

fixtures/tsconfig/cases/empty_files_no_include/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "files": []
+}

fixtures/tsconfig/cases/empty_include/index.ts

@@ -0,0 +1 @@
+export const index = 'index';

fixtures/tsconfig/cases/empty_include/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": []
+}

fixtures/tsconfig/cases/exclude_basic/src/helper.ts

@@ -0,0 +1 @@
+export const helper = 'helper';

fixtures/tsconfig/cases/exclude_basic/src/index.test.ts

@@ -0,0 +1 @@
+export const test = 'test';

fixtures/tsconfig/cases/exclude_basic/src/index.ts

@@ -0,0 +1,3 @@
+import { helper } from '@/helper';
+
+export { helper };

fixtures/tsconfig/cases/exclude_basic/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "include": ["**/*.ts"],
+  "exclude": ["**/*.test.ts"],
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    }
+  }
+}

fixtures/tsconfig/cases/extends_paths/my-app/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/extends_paths/my-app/message.ts

@@ -0,0 +1 @@
+export const message = "message";

fixtures/tsconfig/cases/extends_paths/my-app/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["./"]
+}

fixtures/tsconfig/cases/extends_paths/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./my-app/*"]
+    }
+  },
+  "include": [],
+  "references": [{ "path": "./my-app/" }]
+}

fixtures/tsconfig/cases/files_priority/other.ts

@@ -0,0 +1 @@
+export const other = 'other';

fixtures/tsconfig/cases/files_priority/test.ts

@@ -0,0 +1 @@
+export const test = 'test';

fixtures/tsconfig/cases/files_priority/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "files": ["test.ts"],
+  "exclude": ["test.ts"]
+}

fixtures/tsconfig/cases/globstar_patterns/index.js

@@ -0,0 +1 @@
+export const js = 'js';

fixtures/tsconfig/cases/globstar_patterns/index.ts

@@ -0,0 +1 @@
+export const index = 'index';

fixtures/tsconfig/cases/globstar_patterns/src/index.ts

@@ -0,0 +1 @@
+export const src = 'src';

fixtures/tsconfig/cases/globstar_patterns/src/utils/deep/nested/file.ts

@@ -0,0 +1 @@
+export const file = 'file';

fixtures/tsconfig/cases/globstar_patterns/src/utils/helper.ts

@@ -0,0 +1 @@
+export const helper = 'helper';

fixtures/tsconfig/cases/globstar_patterns/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["**/*.ts"]
+}

fixtures/tsconfig/cases/include_basic/dist/output.js

@@ -0,0 +1 @@
+// Built file

fixtures/tsconfig/cases/include_basic/src/index.ts

@@ -0,0 +1,3 @@
+import { helper } from '@/utils/helper';
+
+export { helper };

fixtures/tsconfig/cases/include_basic/src/utils/helper.ts

@@ -0,0 +1 @@
+export const helper = 'helper';

fixtures/tsconfig/cases/include_basic/test.ts

@@ -0,0 +1 @@
+export const test = 'test';

fixtures/tsconfig/cases/include_basic/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    }
+  }
+}

fixtures/tsconfig/cases/include_exclude_extends/base-tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "include": ["**/*.ts"],
+  "exclude": ["**/*.test.ts"]
+}

fixtures/tsconfig/cases/include_exclude_extends/lib/utils.ts

@@ -0,0 +1 @@
+export const utils = 'utils';

fixtures/tsconfig/cases/include_exclude_extends/src/index.test.ts

@@ -0,0 +1 @@
+export const test = 'test';

fixtures/tsconfig/cases/include_exclude_extends/src/index.ts

@@ -0,0 +1 @@
+export const index = 'index';

fixtures/tsconfig/cases/include_exclude_extends/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./base-tsconfig.json",
+  "include": ["src/**/*.ts"]
+}

fixtures/tsconfig/cases/monorepo_patterns/packages/pkg-a/dist/index.js

@@ -0,0 +1 @@
+// dist

fixtures/tsconfig/cases/monorepo_patterns/packages/pkg-a/src/index.ts

@@ -0,0 +1 @@
+export const pkgA = "pkgA";

fixtures/tsconfig/cases/monorepo_patterns/packages/pkg-a/test.ts

@@ -0,0 +1 @@
+export const test = "test";

fixtures/tsconfig/cases/monorepo_patterns/packages/pkg-b/src/utils.ts

@@ -0,0 +1 @@
+export const pkgB = "pkgB";

fixtures/tsconfig/cases/monorepo_patterns/packages/pkg-c/src/deep/nested/file.ts

@@ -0,0 +1 @@
+export const pkgC = "pkgC";

fixtures/tsconfig/cases/monorepo_patterns/shared/utils.ts

@@ -0,0 +1 @@
+export const shared = "shared";

fixtures/tsconfig/cases/monorepo_patterns/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["packages/*/src/**/*"]
+}

fixtures/tsconfig/cases/outdir_exclude/dist/index.d.ts

@@ -0,0 +1 @@
+// Declaration

fixtures/tsconfig/cases/outdir_exclude/dist/index.js

@@ -0,0 +1 @@
+// Built

fixtures/tsconfig/cases/outdir_exclude/src/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/outdir_exclude/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "include": ["**/*.ts", "**/*.js", "**/*.d.ts"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
+}

fixtures/tsconfig/cases/paths_outside_root/my-app/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/paths_outside_root/my-app/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "exclude": ["dist"],
+  "compilerOptions": {
+    "paths": {
+      "~utils/*": ["../my-utils/*"]
+    }
+  }
+}

fixtures/tsconfig/cases/paths_outside_root/my-utils/log.ts

@@ -0,0 +1 @@
+export const log = console.log.bind(console);

fixtures/tsconfig/cases/wildcard_patterns/index.ts

@@ -0,0 +1 @@
+export const root = "root";

fixtures/tsconfig/cases/wildcard_patterns/src/helper.ts

@@ -0,0 +1 @@
+export const helper = "helper";

fixtures/tsconfig/cases/wildcard_patterns/src/index.ts

@@ -0,0 +1 @@
+export const index = "index";

fixtures/tsconfig/cases/wildcard_patterns/src/utils/helper.ts

@@ -0,0 +1 @@
+export const nested = "nested";

fixtures/tsconfig/cases/wildcard_patterns/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["src/*.ts"]
+}

fixtures/tsconfig/cases/with_baseurl/dist/output.js

@@ -0,0 +1 @@
+// Built file

fixtures/tsconfig/cases/with_baseurl/index.ts

@@ -0,0 +1,4 @@
+import { log } from '~/log';
+import { log as log2 } from 'log';
+
+export { log, log2 };

fixtures/tsconfig/cases/with_baseurl/log.ts

@@ -0,0 +1 @@
+export const log = console.log.bind(console);

fixtures/tsconfig/cases/with_baseurl/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "exclude": ["dist"],
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./*"]
+    }
+  }
+}

fixtures/tsconfig/cases/without_baseurl/bower_components/lib.ts

@@ -0,0 +1 @@
+export const lib = 'lib';

fixtures/tsconfig/cases/without_baseurl/dist/output.js

@@ -0,0 +1 @@
+// Built file

fixtures/tsconfig/cases/without_baseurl/index.ts

@@ -0,0 +1,3 @@
+import { log } from './log';
+
+export { log };

fixtures/tsconfig/cases/without_baseurl/jspm_packages/mod.ts

@@ -0,0 +1 @@
+export const mod = 'mod';

fixtures/tsconfig/cases/without_baseurl/log.ts

@@ -0,0 +1 @@
+export const log = console.log.bind(console);

fixtures/tsconfig/cases/without_baseurl/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "exclude": ["dist"],
+  "compilerOptions": {
+    "paths": {
+      "~/*": ["./*"]
+    }
+  }
+}

src/lib.rs

@@ -1479,6 +1479,14 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
             }
         };
 
+        // Check if the importer file matches the tsconfig's include/exclude patterns
+        // Only check for actual files, not directories (directories are used when there's no specific importer)
+        // If the importer doesn't match, don't use this tsconfig's path mappings
+        let is_file = cached_path.meta(&self.cache.fs).is_some_and(|m| m.is_file);
+        if is_file && !tsconfig.matches_file(cached_path.path()) {
+            return Ok(None);
+        }
+
         let paths = tsconfig.resolve(cached_path.path(), specifier);
         for path in paths {
             let resolved_path = self.cache.value(&path);

src/tests/mod.rs

@@ -26,6 +26,8 @@ mod simple;
 mod symlink;
 mod tsconfig_discovery;
 mod tsconfig_extends;
+mod tsconfig_file_matcher;
+mod tsconfig_include_exclude;
 mod tsconfig_paths;
 mod tsconfig_project_references;
 #[cfg(target_os = "windows")]