Only include asset:///lib.node.d.ts when no @types/node package exists

Author: dsherret

internal/ast/symbol.go

@@ -3,10 +3,10 @@ package ast
 import (
 	"iter"
 	"maps"
-	"strings"
 	"sync/atomic"
 
 	"github.com/microsoft/typescript-go/internal/collections"
+	"github.com/microsoft/typescript-go/internal/deno"
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
@@ -350,17 +350,13 @@ func (c *DenoForkContext) GetGlobalsForName(name string) SymbolTable {
 	}
 }
 
-func isTypesNodePkgPath(path tspath.Path) bool {
-	return strings.HasSuffix(string(path), ".d.ts") && strings.Contains(string(path), "/@types/node/")
-}
-
 func symbolHasAnyTypesNodePkgDecl(symbol *Symbol, hasNodeSourceFile func(*Node) bool) bool {
 	if symbol == nil || symbol.Declarations == nil {
 		return false
 	}
 	for _, decl := range symbol.Declarations {
 		sourceFile := GetSourceFileOfNode(decl)
-		if sourceFile != nil && hasNodeSourceFile(decl) && isTypesNodePkgPath(sourceFile.Path()) {
+		if sourceFile != nil && hasNodeSourceFile(decl) && deno.IsTypesNodePkgPath(sourceFile.Path()) {
 			return true
 		}
 	}
@@ -370,7 +366,7 @@ func symbolHasAnyTypesNodePkgDecl(symbol *Symbol, hasNodeSourceFile func(*Node)
 func (c *DenoForkContext) MergeGlobalSymbolTable(node *Node, source SymbolTable, unidirectional bool) {
 	sourceFile := GetSourceFileOfNode(node)
 	isNodeFile := c.HasNodeSourceFile(node)
-	isTypesNodeSourceFile := isNodeFile && isTypesNodePkgPath(sourceFile.Path())
+	isTypesNodeSourceFile := isNodeFile && deno.IsTypesNodePkgPath(sourceFile.Path())
 
 	for id, sourceSymbol := range source.Iter() {
 		var target SymbolTable

internal/compiler/fileloader.go

@@ -104,6 +104,7 @@ func processAllProgramFiles(
 	}
 	loader.addProjectReferenceTasks(singleThreaded)
 	loader.resolver = loader.opts.Host.MakeResolver(loader.projectReferenceFileMapper.host, compilerOptions, opts.TypingsLocation, opts.ProjectName)
+	hadTypesNode := false
 	for index, rootFile := range rootFiles {
 		loader.addRootTask(rootFile, nil, &FileIncludeReason{kind: fileIncludeKindRootFile, data: index})
 	}
@@ -117,6 +118,12 @@ func processAllProgramFiles(
 			for index, lib := range compilerOptions.Lib {
 				if name, ok := tsoptions.GetLibFileName(lib); ok {
 					libFile := loader.pathForLibFile(name)
+					// deno: we skip loading the lib.node.d.ts file if the @types/node package has been loaded
+					// so defer loading this until after everything else
+					if libFile.path == "asset:///lib.node.d.ts" {
+						hadTypesNode = true
+						continue
+					}
 					loader.addRootTask(libFile.path, libFile, &FileIncludeReason{kind: fileIncludeKindLibFile, data: index})
 				}
 				// !!! error on unknown name

internal/deno/deno.go

@@ -0,0 +1,11 @@
+package deno
+
+import (
+	"strings"
+
+	"github.com/microsoft/typescript-go/internal/tspath"
+)
+
+func IsTypesNodePkgPath(path tspath.Path) bool {
+	return strings.HasSuffix(string(path), ".d.ts") && strings.Contains(string(path), "/@types/node/")
+}