From 0ba91c5b034ddd8accb2c2646f7d1de5e3736fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=88=E9=9B=A8?= <228542279+qiyuhuating@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:19:45 +0800 Subject: [PATCH 1/3] Reject invalid wildcard export targets before entrypoint discovery --- tsc/internal/module/resolver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tsc/internal/module/resolver.go b/tsc/internal/module/resolver.go index 72cca1d035259..3de59be3d63f2 100644 --- a/tsc/internal/module/resolver.go +++ b/tsc/internal/module/resolver.go @@ -2527,6 +2527,10 @@ func (r *resolutionState) loadEntrypointsFromExportMap( loadEntrypointsFromTargetExports = func(subpath string, includeConditions *collections.Set[string], excludeConditions *collections.Set[string], exports packagejson.ExportsOrImports) { if exports.Type == packagejson.JSONValueTypeString && strings.HasPrefix(exports.AsString(), "./") { + partsAfterFirst := tspath.GetPathComponents(exports.AsString())[2:] + if slices.Contains(partsAfterFirst, "..") || slices.Contains(partsAfterFirst, ".") || slices.Contains(partsAfterFirst, "node_modules") { + return + } if strings.ContainsRune(exports.AsString(), '*') { if strings.IndexByte(exports.AsString(), '*') != strings.LastIndexByte(exports.AsString(), '*') { return @@ -2580,10 +2584,6 @@ func (r *resolutionState) loadEntrypointsFromExportMap( )) } } else { - partsAfterFirst := tspath.GetPathComponents(exports.AsString())[2:] - if slices.Contains(partsAfterFirst, "..") || slices.Contains(partsAfterFirst, ".") || slices.Contains(partsAfterFirst, "node_modules") { - return - } resolvedTarget := resolutionCandidateFromDirectoryPath(packageJson.PackageDirectory.AsDirectoryPath(), exports.AsString()) if result := r.loadFileNameFromPackageJSONField(r.extensions, resolvedTarget, exports.AsString()); result.isResolved() { entrypoints = append(entrypoints, r.resolver.createResolvedEntrypointHandlingSymlink( From 38a4ead0735ff133fa60ead412b8204529079209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=88=E9=9B=A8?= <228542279+qiyuhuating@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:20:22 +0800 Subject: [PATCH 2/3] Test wildcard export target containment and valid patterns --- tsc/internal/module/resolver_test.go | 75 ++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/tsc/internal/module/resolver_test.go b/tsc/internal/module/resolver_test.go index 4599e538c921e..506943f203ccd 100644 --- a/tsc/internal/module/resolver_test.go +++ b/tsc/internal/module/resolver_test.go @@ -785,6 +785,81 @@ func TestResolvedEntrypointCarriesPath(t *testing.T) { } } +func TestWildcardExportTargetContainment(t *testing.T) { + t.Parallel() + + for _, test := range []struct { + name string + target string + wantExtra bool + }{ + {name: "parent traversal", target: "./../../private/*.d.ts"}, + {name: "nested parent traversal", target: "./lib/../*.d.ts"}, + {name: "dot segment", target: "./lib/./*.d.ts"}, + {name: "nested node_modules", target: "./node_modules/*.d.ts"}, + {name: "valid pattern", target: "./lib/*.d.ts", wantExtra: true}, + } { + t.Run(test.name, func(t *testing.T) { + t.Parallel() + + fs := vfstest.FromMap(map[string]string{ + "/repo/src/main.ts": "", + "/repo/node_modules/pkg/package.json": `{"name":"pkg","exports":{".":"./index.d.ts","./*":"` + test.target + `"}}`, + "/repo/node_modules/pkg/index.d.ts": "export const index: number;", + "/repo/node_modules/pkg/lib/allowed.d.ts": "export const allowed: number;", + "/repo/node_modules/pkg/node_modules/inner.d.ts": "export const inner: number;", + "/repo/private/secret.d.ts": "export const secret: number;", + }, tspath.CaseSensitive) + host := &resolutionTestInputs{fs: fs, cwd: "/repo"} + options := &core.CompilerOptions{ + ModuleResolution: core.ModuleResolutionKindBundler, + Module: core.ModuleKindESNext, + Target: core.ScriptTargetESNext, + } + resolver := NewResolver(ResolverOptions{Host: host, CompilerOptions: options}) + resolved, _, _ := resolver.ResolveModuleName("pkg", "/repo/src/main.ts", core.ModuleKindESNext, nil) + if !resolved.IsResolved() { + t.Fatal("expected package root to resolve") + } + + var info *packagejson.InfoCacheEntry + resolver.PackageJsonCacheEntries(func(_ tspath.PathKey, entry *packagejson.InfoCacheEntry) bool { + if entry.Exists() { + info = entry + return false + } + return true + }) + if info == nil { + t.Fatal("expected package JSON cache entry") + } + + entrypoints := resolver.GetEntrypointsFromPackageJsonInfo(info, "pkg", false) + wantCount := 1 + if test.wantExtra { + wantCount++ + } + if len(entrypoints) != wantCount { + t.Fatalf("got %d entrypoints for target %q, want %d: %v", len(entrypoints), test.target, wantCount, entrypoints) + } + foundRoot, foundAllowed := false, false + for _, entrypoint := range entrypoints { + switch entrypoint.ModuleSpecifier.AsString() { + case "pkg": + foundRoot = true + case "pkg/allowed": + foundAllowed = true + default: + t.Errorf("unexpected entrypoint %q", entrypoint.ModuleSpecifier) + } + } + if !foundRoot || foundAllowed != test.wantExtra { + t.Errorf("entrypoints for target %q: root=%v, allowed=%v", test.target, foundRoot, foundAllowed) + } + }) + } +} + func TestDynamicExportPatternEntrypointUsesLogicalName(t *testing.T) { t.Parallel() From 60cde642138a5d048ae9391583799e2c3fc64b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=88=E9=9B=A8?= <228542279+qiyuhuating@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:21:46 +0800 Subject: [PATCH 3/3] Keep wildcard export regression fixture formatting consistent --- tsc/internal/module/resolver_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tsc/internal/module/resolver_test.go b/tsc/internal/module/resolver_test.go index 506943f203ccd..719407f586a13 100644 --- a/tsc/internal/module/resolver_test.go +++ b/tsc/internal/module/resolver_test.go @@ -802,14 +802,15 @@ func TestWildcardExportTargetContainment(t *testing.T) { t.Run(test.name, func(t *testing.T) { t.Parallel() - fs := vfstest.FromMap(map[string]string{ - "/repo/src/main.ts": "", - "/repo/node_modules/pkg/package.json": `{"name":"pkg","exports":{".":"./index.d.ts","./*":"` + test.target + `"}}`, - "/repo/node_modules/pkg/index.d.ts": "export const index: number;", - "/repo/node_modules/pkg/lib/allowed.d.ts": "export const allowed: number;", - "/repo/node_modules/pkg/node_modules/inner.d.ts": "export const inner: number;", - "/repo/private/secret.d.ts": "export const secret: number;", - }, tspath.CaseSensitive) + files := map[string]string{ + "/repo/src/main.ts": "", + } + files["/repo/node_modules/pkg/package.json"] = `{"name":"pkg","exports":{".":"./index.d.ts","./*":"` + test.target + `"}}` + files["/repo/node_modules/pkg/index.d.ts"] = "export const index: number;" + files["/repo/node_modules/pkg/lib/allowed.d.ts"] = "export const allowed: number;" + files["/repo/node_modules/pkg/node_modules/inner.d.ts"] = "export const inner: number;" + files["/repo/private/secret.d.ts"] = "export const secret: number;" + fs := vfstest.FromMap(files, tspath.CaseSensitive) host := &resolutionTestInputs{fs: fs, cwd: "/repo"} options := &core.CompilerOptions{ ModuleResolution: core.ModuleResolutionKindBundler,