Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Guyllian Gomez (GGomez99) wants to merge 7 commits into
base:main
Choose a base branch
from
Open

Add Yarn PnP module resolution support #63919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcd18eb
Add Yarn PnP module resolution support
GGomez99 Aug 20, 2026
503ddb9
Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…
GGomez99 Aug 20, 2026
79228ed
Remove stray comment and fix duplicated word in PnP test description
GGomez99 Aug 21, 2026
60d67a8
Check DiscardFromLookup in pnpapi.FindLocator
GGomez99 Aug 28, 2026
1df1d27
Return a new pnpapi on RefreshManifest
GGomez99 Aug 28, 2026
d63a57e
Fix autoimport suggestion on aliased deps
GGomez99 Aug 28, 2026
568cafc
Merge branch 'main' into guyllian.gomez/yarn-pnp
GGomez99 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/vscode-typescript/src/client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

this.documentSelector = [
...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
...jsTsLanguageModes.map(language => ({
scheme: "untitled",
language,
})),
...jsTsLanguageModes.map(language => ({
scheme: "zip",
language,
})),
];
this.clientOptions = {
documentSelector: this.documentSelector,
Expand Down
17 changes: 16 additions & 1 deletion tsc/cmd/tsc/sys.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

"github.com/microsoft/TypeScript/tsc/internal/bundled"
"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/tspath"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
defaultLibraryPath string
cwd string
start time.Time
pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
}

var fs vfs.FS = osvfs.FS()

pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
if pnpApi != nil {
fs = pnpvfs.From(fs)
}

return &osSys{
cwd: tspath.NormalizePath(cwd),
fs: bundled.WrapFS(osvfs.FS()),
fs: bundled.WrapFS(fs),
defaultLibraryPath: bundled.LibPath(),
writer: os.Stdout,
start: time.Now(),
pnpApi: pnpApi,
}
}
13 changes: 12 additions & 1 deletion tsc/internal/api/server.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
"github.com/microsoft/TypeScript/tsc/internal/ipc"
"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/project"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
transport = t
}

fs := bundled.WrapFS(osvfs.FS())
var fs vfs.FS = osvfs.FS()

pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
if pnpApi != nil {
fs = pnpvfs.From(fs)
}

fs = bundled.WrapFS(fs)

// Wrap the base FS with callbackFS if callbacks are requested
var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
BackgroundCtx: ctx,
Logger: nil, // TODO: Add logging support
FS: fs,
PnpApi: pnpApi,
Options: &project.SessionOptions{
CurrentDirectory: s.options.Cwd,
DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down
4 changes: 2 additions & 2 deletions tsc/internal/checker/checker_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
fs = bundled.WrapFS(fs)

cd := "/"
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
fs := bundled.WrapFS(osvfs.FS())
rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down
2 changes: 1 addition & 1 deletion tsc/internal/compiler/contentmapper_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
}
return compiler.NewProgram(compiler.ProgramOptions{
Config: config,
Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
// Load files on the calling goroutine for deterministic diagnostics ordering.
SingleThreaded: core.TSTrue,
})
Expand Down
4 changes: 4 additions & 0 deletions tsc/internal/compiler/emitHost.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/module"
"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
"github.com/microsoft/TypeScript/tsc/internal/packagejson"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/printer"
"github.com/microsoft/TypeScript/tsc/internal/symlinks"
"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
GetCurrentDirectory() string
CommonSourceDirectory() string
IsEmitBlocked(file string) bool
PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
return host.program.IsEmitBlocked(file)
}
Expand Down
6 changes: 3 additions & 3 deletions tsc/internal/compiler/emit_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand Down
13 changes: 12 additions & 1 deletion tsc/internal/compiler/host.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/core"
"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
"github.com/microsoft/TypeScript/tsc/internal/parser"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
"github.com/microsoft/TypeScript/tsc/internal/tspath"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
// command line has no content mappers. The project owns transform identity and lifecycle state.
ContentMapperProject() contentmapper.Project
GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
fs vfs.FS
defaultLibraryPath string
extendedConfigCache tsoptions.ExtendedConfigCache
pnpApi *pnp.PnpApi
trace func(msg *diagnostics.Message, args ...any)
contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
fs vfs.FS,
defaultLibraryPath string,
extendedConfigCache tsoptions.ExtendedConfigCache,
pnpApi *pnp.PnpApi,
trace func(msg *diagnostics.Message, args ...any),
contentMapperProject contentmapper.Project,
) CompilerHost {
return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
currentDirectory string,
fs vfs.FS,
defaultLibraryPath string,
extendedConfigCache tsoptions.ExtendedConfigCache,
pnpApi *pnp.PnpApi,
trace func(msg *diagnostics.Message, args ...any),
contentMapperProject contentmapper.Project,
) CompilerHost {
if trace == nil {
trace = func(msg *diagnostics.Message, args ...any) {}
}

return &compilerHost{
currentDirectory: currentDirectory,
fs: fs,
defaultLibraryPath: defaultLibraryPath,
extendedConfigCache: extendedConfigCache,
trace: trace,
pnpApi: pnpApi,
contentMapperProject: contentMapperProject,
}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
h.trace(msg, args...)
}
Expand Down
6 changes: 6 additions & 0 deletions tsc/internal/compiler/program.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
"github.com/microsoft/TypeScript/tsc/internal/packagejson"
"github.com/microsoft/TypeScript/tsc/internal/parser"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/printer"
"github.com/microsoft/TypeScript/tsc/internal/scanner"
"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
return p.opts.Host.ContentMapperProject()
}
Expand Down
8 changes: 4 additions & 4 deletions tsc/internal/compiler/program_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
CompilerOptions: &opts,
},
},
Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
})

actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
CompilerOptions: &opts,
},
},
Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
})

// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
CompilerOptions: &opts,
},
},
Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
}

for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
b.Run("compiler", func(b *testing.B) {
rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
fs := bundled.WrapFS(osvfs.FS())
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
opts := compiler.ProgramOptions{
Expand Down
6 changes: 6 additions & 0 deletions tsc/internal/compiler/projectreferencedtsfakinghost.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/collections"
"github.com/microsoft/TypeScript/tsc/internal/core"
"github.com/microsoft/TypeScript/tsc/internal/module"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/symlinks"
"github.com/microsoft/TypeScript/tsc/internal/tspath"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
projectReferenceFileMapper *projectReferenceFileMapper
dtsDirectories collections.Set[tspath.Path]
Expand Down
10 changes: 10 additions & 0 deletions tsc/internal/core/compileroptions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
if options.TypeRoots != nil {
return options.TypeRoots, true
}
baseDir := options.GetBaseDirFromOptions(currentDirectory)

nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
var baseDir string
if options.ConfigFilePath != "" {
baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
panic("cannot get effective type roots without a config file path or current directory")
}
}
return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add Yarn PnP module resolution support#63919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Guyllian Gomez (GGomez99)
wants to merge
7
commits into

base:main
Choose a base branch

from

 Open


Add Yarn PnP module resolution support
#63919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
fcd18eb

Add Yarn PnP module resolution support


GGomez99 Aug 20, 2026
503ddb9

Skip PnP resolution for paths covered by ignorePatternData, fix pnp t…


GGomez99 Aug 20, 2026
79228ed

Remove stray comment and fix duplicated word in PnP test description


GGomez99 Aug 21, 2026
60d67a8

Check DiscardFromLookup in pnpapi.FindLocator


GGomez99 Aug 28, 2026
1df1d27

Return a new pnpapi on RefreshManifest


GGomez99 Aug 28, 2026
d63a57e

Fix autoimport suggestion on aliased deps


GGomez99 Aug 28, 2026
568cafc

Merge branch 'main' into guyllian.gomez/yarn-pnp


GGomez99 Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 8 additions & 1 deletion
packages/vscode-typescript/src/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

 this.documentSelector = [
 ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
 ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "untitled",
 language,
 })),
 ...jsTsLanguageModes.map(language => ({
 scheme: "zip",
 language,
 })),
 ];
 this.clientOptions = {
 documentSelector: this.documentSelector,
Expand Down

17 changes: 16 additions & 1 deletion
tsc/cmd/tsc/sys.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import (

	"github.com/microsoft/TypeScript/tsc/internal/bundled"
	"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
	"golang.org/x/term"
)

Expand All@@ -22,6 +24,7 @@ type osSys struct {
	defaultLibraryPath string
	cwd string
	start time.Time
	pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand DownExpand Up@@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
	return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
	return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
	return spawnProcess(command, dir, stderr)
}
Expand DownExpand Up@@ -128,11 +135,19 @@ func newSystem() *osSys {
 os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
	}

	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	return &osSys{
 cwd: tspath.NormalizePath(cwd),
 fs: bundled.WrapFS(osvfs.FS()),
 fs: bundled.WrapFS(fs),
 defaultLibraryPath: bundled.LibPath(),
 writer: os.Stdout,
 start: time.Now(),
 pnpApi: pnpApi,
	}
}

13 changes: 12 additions & 1 deletion
tsc/internal/api/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,11 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
	"github.com/microsoft/TypeScript/tsc/internal/ipc"
	"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/project"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
	"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand DownExpand Up@@ -74,7 +77,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
 transport = t
	}

	fs := bundled.WrapFS(osvfs.FS())
	var fs vfs.FS = osvfs.FS()

	pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
	if pnpApi != nil {
 fs = pnpvfs.From(fs)
	}

	fs = bundled.WrapFS(fs)

	// Wrap the base FS with callbackFS if callbacks are requested
	var callbackFS *callbackFS
Expand All@@ -87,6 +97,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
 BackgroundCtx: ctx,
 Logger: nil, // TODO: Add logging support
 FS: fs,
 PnpApi: pnpApi,
 Options: &project.SessionOptions{
 CurrentDirectory: s.options.Cwd,
 DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down

4 changes: 2 additions & 2 deletions
tsc/internal/checker/checker_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ foo.bar;`
	fs = bundled.WrapFS(fs)

	cd := "/"
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand DownExpand Up@@ -65,7 +65,7 @@ foo.bar;`
func BenchmarkNewChecker(b *testing.B) {
	fs := bundled.WrapFS(osvfs.FS())
	rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
	parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
	assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
	program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down

2 changes: 1 addition & 1 deletion
tsc/internal/compiler/contentmapper_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
	}
	return compiler.NewProgram(compiler.ProgramOptions{
 Config: config,
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
 Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
 // Load files on the calling goroutine for deterministic diagnostics ordering.
 SingleThreaded: core.TSTrue,
	})
Expand Down

4 changes: 4 additions & 0 deletions
tsc/internal/compiler/emitHost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All@@ -25,6 +26,7 @@ type EmitHost interface {
	GetCurrentDirectory() string
	CommonSourceDirectory() string
	IsEmitBlocked(file string) bool
	PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand DownExpand Up@@ -121,6 +123,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
	return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
	return host.program.IsEmitBlocked(file)
}
Expand Down

6 changes: 3 additions & 3 deletions
tsc/internal/compiler/emit_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
 OutDir: "/dev/out",
 }

 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

 p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand DownExpand Up@@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
 OutDir: "/dev/out",
	}

	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
	host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

	p := compiler.NewProgram(compiler.ProgramOptions{
 Config: &tsoptions.ParsedCommandLine{
Expand Down

13 changes: 12 additions & 1 deletion
tsc/internal/compiler/host.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All@@ -28,6 +29,7 @@ type CompilerHost interface {
	// command line has no content mappers. The project owns transform identity and lifecycle state.
	ContentMapperProject() contentmapper.Project
	GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
	PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All@@ -37,6 +39,7 @@ type compilerHost struct {
	fs vfs.FS
	defaultLibraryPath string
	extendedConfigCache tsoptions.ExtendedConfigCache
	pnpApi *pnp.PnpApi
	trace func(msg *diagnostics.Message, args ...any)
	contentMapperProject contentmapper.Project
}
Expand All@@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
	return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
	currentDirectory string,
	fs vfs.FS,
	defaultLibraryPath string,
	extendedConfigCache tsoptions.ExtendedConfigCache,
	pnpApi *pnp.PnpApi,
	trace func(msg *diagnostics.Message, args ...any),
	contentMapperProject contentmapper.Project,
) CompilerHost {
	if trace == nil {
 trace = func(msg *diagnostics.Message, args ...any) {}
	}

	return &compilerHost{
 currentDirectory: currentDirectory,
 fs: fs,
 defaultLibraryPath: defaultLibraryPath,
 extendedConfigCache: extendedConfigCache,
 trace: trace,
 pnpApi: pnpApi,
 contentMapperProject: contentMapperProject,
	}
}
Expand All@@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
	return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
	return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
	h.trace(msg, args...)
}
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/program.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
	"github.com/microsoft/TypeScript/tsc/internal/packagejson"
	"github.com/microsoft/TypeScript/tsc/internal/parser"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/printer"
	"github.com/microsoft/TypeScript/tsc/internal/scanner"
	"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand DownExpand Up@@ -134,6 +135,11 @@ func (p *Program) GetCurrentDirectory() string {
	return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
	return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
	return p.opts.Host.ContentMapperProject()
}
Expand Down

8 changes: 4 additions & 4 deletions
tsc/internal/compiler/program_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ func TestProgram(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 })

 actualFiles := []string{}
Expand DownExpand Up@@ -291,7 +291,7 @@ func TestIncludeProcessorDiagnosticsWithMissingFileCasing(t *testing.T) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("/", fs, bundled.LibPath(), nil, nil, nil, nil),
	})

	// GetProgramDiagnostics triggers getDiagnostics which processes all
Expand DownExpand Up@@ -333,7 +333,7 @@ func BenchmarkNewProgram(b *testing.B) {
 CompilerOptions: &opts,
 },
 },
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil),
 Host: compiler.NewCompilerHost("c:/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil),
 }

 for b.Loop() {
Expand All@@ -345,7 +345,7 @@ func BenchmarkNewProgram(b *testing.B) {
	b.Run("compiler", func(b *testing.B) {
 rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
 fs := bundled.WrapFS(osvfs.FS())
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
 host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
 parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), nil, nil, host, nil)
 assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
 opts := compiler.ProgramOptions{
Expand Down

6 changes: 6 additions & 0 deletions
tsc/internal/compiler/projectreferencedtsfakinghost.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import (
	"github.com/microsoft/TypeScript/tsc/internal/collections"
	"github.com/microsoft/TypeScript/tsc/internal/core"
	"github.com/microsoft/TypeScript/tsc/internal/module"
	"github.com/microsoft/TypeScript/tsc/internal/pnp"
	"github.com/microsoft/TypeScript/tsc/internal/symlinks"
	"github.com/microsoft/TypeScript/tsc/internal/tspath"
	"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand DownExpand Up@@ -43,6 +44,11 @@ func (h *projectReferenceDtsFakingHost) GetCurrentDirectory() string {
	return h.host.GetCurrentDirectory()
}

// PnpApi implements module.ResolutionHost.
func (h *projectReferenceDtsFakingHost) PnpApi() *pnp.PnpApi {
	return h.host.PnpApi()
}

type projectReferenceDtsFakingVfs struct {
	projectReferenceFileMapper *projectReferenceFileMapper
	dtsDirectories collections.Set[tspath.Path]
Expand Down

10 changes: 10 additions & 0 deletions
tsc/internal/core/compileroptions.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,13 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
	if options.TypeRoots != nil {
 return options.TypeRoots, true
	}
	baseDir := options.GetBaseDirFromOptions(currentDirectory)

	nmTypes, nmFromConfig := options.GetNodeModulesTypeRoots(baseDir)
	return nmTypes, nmFromConfig
}

func (options *CompilerOptions) GetBaseDirFromOptions(currentDirectory string) string {
	var baseDir string
	if options.ConfigFilePath != "" {
 baseDir = tspath.GetDirectoryPath(options.ConfigFilePath)
Expand All@@ -313,7 +320,10 @@ func (options *CompilerOptions) GetEffectiveTypeRoots(currentDirectory string) (
 panic("cannot get effective type roots without a config file path or current directory")
 }
	}
	return baseDir
}

func (options *CompilerOptions) GetNodeModulesTypeRoots(baseDir string) (result []string, fromConfig bool) {
	typeRoots := make([]string, 0, strings.Count(baseDir, "/"))
	tspath.ForEachAncestorDirectory(baseDir, func(dir string) (any, bool) {
 typeRoots = append(typeRoots, tspath.CombinePaths(dir, "node_modules", "@types"))
Expand Down
Loading