Mark any external pnp dependency as isExternalLibraryImport=true

Author: GGomez99

internal/module/resolver.go

@@ -475,9 +475,10 @@ func (r *resolutionState) resolveNodeLikeWorker() *ResolvedModule {
 	} else {
 		candidate := normalizePathForCJSResolution(r.containingDirectory, r.name)
 		resolved := r.nodeLoadModuleByRelativeName(r.extensions, candidate, false, true)
+
 		return r.createResolvedModule(
 			resolved,
-			resolved != nil && (tspath.IsExternalLibraryImport(resolved.path)),
+			r.isExternalLibraryImport(resolved),
 		)
 	}
 	return r.createResolvedModule(nil, false)
@@ -1089,7 +1090,8 @@ func (r *resolutionState) loadModuleFromSpecificNodeModulesDirectoryImpl(ext ext
 }
 
 func (r *resolutionState) createResolvedModuleHandlingSymlink(resolved *resolved) *ResolvedModule {
-	isExternalLibraryImport := resolved != nil && (tspath.IsExternalLibraryImport(resolved.path))
+	isExternalLibraryImport := r.isExternalLibraryImport(resolved)
+
 	if r.compilerOptions.PreserveSymlinks != core.TSTrue &&
 		isExternalLibraryImport &&
 		resolved.originalPath == "" &&
@@ -1137,7 +1139,8 @@ func (r *resolutionState) createResolvedTypeReferenceDirective(resolved *resolve
 		resolvedTypeReferenceDirective.ResolvedFileName = resolved.path
 		resolvedTypeReferenceDirective.Primary = primary
 		resolvedTypeReferenceDirective.PackageId = resolved.packageId
-		resolvedTypeReferenceDirective.IsExternalLibraryImport = tspath.IsExternalLibraryImport(resolved.path)
+
+		resolvedTypeReferenceDirective.IsExternalLibraryImport = r.isExternalLibraryImport(resolved)
 
 		if r.compilerOptions.PreserveSymlinks != core.TSTrue {
 			originalPath, resolvedFileName := r.getOriginalAndResolvedFileName(resolved.path)
@@ -1885,6 +1888,21 @@ func (r *resolutionState) conditionMatches(condition string) bool {
 	return false
 }
 
+func (r *resolutionState) isExternalLibraryImport(resolved *resolved) bool {
+	if resolved == nil {
+		return false
+	}
+
+	isExternalLibraryImport := strings.Contains(resolved.path, "/node_modules/")
+
+	pnpApi := r.resolver.host.PnpApi()
+	if pnpApi != nil && !isExternalLibraryImport {
+		isExternalLibraryImport = pnpApi.IsInPnpModule(resolved.path, r.containingDirectory)
+	}
+
+	return isExternalLibraryImport
+}
+
 func (r *resolutionState) getTraceFunc() func(string) {
 	if r.tracer != nil {
 		return r.tracer.write

internal/pnp/pnpapi.go

@@ -346,10 +346,10 @@ func (p *PnpApi) GetPackageLocationAbsolutePath(packageInfo *PackageInfo) string
 	return tspath.ResolvePath(p.manifest.dirPath, packageLocation)
 }
 
+// Checks if fromFileName and toFileName are in different pnp modules
 func (p *PnpApi) IsInPnpModule(fromFileName string, toFileName string) bool {
 	fromLocator, _ := p.FindLocator(fromFileName)
 	toLocator, _ := p.FindLocator(toFileName)
-	// The targeted filename is in a pnp module different from the requesting filename
 	return fromLocator != nil && toLocator != nil && fromLocator.Name != toLocator.Name
 }
 

internal/tspath/path.go

@@ -869,17 +869,6 @@ func IsExternalModuleNameRelative(moduleName string) bool {
 	return PathIsRelative(moduleName) || IsRootedDiskPath(moduleName)
 }
 
-func IsExternalLibraryImport(path string) bool {
-	// When PnP is enabled, some internal libraries can be resolved as virtual packages, which should be treated as external libraries
-	// Since these virtual pnp packages don't have a `/node_modules/` folder, we need to check for the presence of `/__virtual__/` in the path
-	// See https://yarnpkg.com/advanced/lexicon#virtual-package for more details
-	return strings.Contains(path, "/node_modules/") || isPnpVirtualPath(path)
-}
-
-func isPnpVirtualPath(path string) bool {
-	return strings.Contains(path, "/__virtual__/")
-}
-
 type ComparePathsOptions struct {
 	UseCaseSensitiveFileNames bool
 	CurrentDirectory          string