fixes

Author: nathanwhit

internal/api/api.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
-	"runtime"
 	"sync"
 
 	"github.com/go-json-experiment/json"
@@ -64,10 +62,6 @@ func (api *API) HandleRequest(ctx context.Context, method string, payload []byte
 	if err != nil {
 		return nil, err
 	}
-	fmt.Fprintf(os.Stderr, "method: %s, params: %v\n", method, params)
-	defer func() {
-		fmt.Fprintf(os.Stderr, "done handling method: %s, params: %v\n", method, params)
-	}()
 
 	switch Method(method) {
 	case MethodRelease:
@@ -285,7 +279,6 @@ func (api *API) GetDiagnostics(ctx context.Context, projectId Handle[project.Pro
 
 	languageService := ls.NewLanguageService(project, snapshot.Converters())
 	diagnostics := languageService.GetDiagnostics(ctx)
-	fmt.Fprintf(os.Stderr, "diagnostics: %v\n", diagnostics)
 
 	api.symbolsMu.Lock()
 	defer api.symbolsMu.Unlock()
@@ -342,20 +335,12 @@ func (api *API) toPath(fileName string) tspath.Path {
 	return tspath.ToPath(fileName, api.session.GetCurrentDirectory(), api.session.FS().UseCaseSensitiveFileNames())
 }
 
-func stackTrace() string {
-	buf := make([]byte, 1024)
-	n := runtime.Stack(buf, false)
-	return string(buf[:n])
-}
-
 func encodeJSON(v any, err error) ([]byte, error) {
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "encodeJSON: %v\n", err)
 		return nil, err
 	}
 	b, err := json.Marshal(v)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "encodeJSON err: %v\n, v: %v\n; stackTrace: %v\n", err, v, stackTrace())
 		return nil, err
 	}
 	return b, nil

internal/api/server.go

@@ -6,7 +6,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"os"
 	"runtime/debug"
 	"strconv"
 	"strings"
@@ -175,9 +174,7 @@ func (h *hostWrapper) SessionOptions() *project.SessionOptions {
 
 // IsNodeSourceFile implements project.ProjectHost.
 func (h *hostWrapper) IsNodeSourceFile(path tspath.Path) bool {
-	fmt.Fprintf(os.Stderr, "host IsNodeSourceFile %s\n", path)
 	if h.server.CallbackEnabled(CallbackIsNodeSourceFile) {
-		fmt.Fprintf(os.Stderr, "IsNodeSourceFile callback %s\n", path)
 		result, err := h.server.call("isNodeSourceFile", path)
 		if err != nil {
 			panic(err)
@@ -187,11 +184,6 @@ func (h *hostWrapper) IsNodeSourceFile(path tspath.Path) bool {
 			if err := json.Unmarshal(result, &res); err != nil {
 				panic(err)
 			}
-			if res {
-				fmt.Fprintf(os.Stderr, "IsNodeSourceFile callback returning true %s\n", path)
-			} else {
-				fmt.Fprintf(os.Stderr, "IsNodeSourceFile callback returning false %s\n", path)
-			}
 			return res
 		}
 	}
@@ -219,9 +211,9 @@ func newResolverWrapper(inner module.ResolverInterface, server *Server) *resolve
 }
 
 type PackageJsonIfApplicable struct {
-	PackageDirectory string
-	DirectoryExists  bool
-	Contents         string
+	PackageDirectory string `json:"packageDirectory"`
+	DirectoryExists  bool   `json:"directoryExists"`
+	Contents         string `json:"contents"`
 }
 
 // GetPackageJsonScopeIfApplicable implements module.ResolverInterface.
@@ -265,11 +257,24 @@ func (r *resolverWrapper) GetPackageScopeForPath(directory string) *packagejson.
 			panic(err)
 		}
 		if len(result) > 0 {
-			var res packagejson.InfoCacheEntry
+			var res *PackageJsonIfApplicable
 			if err := json.Unmarshal(result, &res); err != nil {
 				panic(err)
 			}
-			return &res
+			if res == nil {
+				return nil
+			}
+			contents, err := packagejson.Parse([]byte(res.Contents))
+			if err != nil {
+				panic(err)
+			}
+			return &packagejson.InfoCacheEntry{
+				PackageDirectory: res.PackageDirectory,
+				DirectoryExists:  res.DirectoryExists,
+				Contents: &packagejson.PackageJson{
+					Fields: contents,
+				},
+			}
 		}
 	}
 	return r.inner.GetPackageScopeForPath(directory)

internal/ast/symbol.go

@@ -1,10 +1,8 @@
 package ast
 
 import (
-	"fmt"
 	"iter"
 	"maps"
-	"os"
 	"strings"
 	"sync/atomic"
 
@@ -199,16 +197,18 @@ func (c *CombinedSymbolTable) Each(fn func(name string, symbol *Symbol)) {
 
 // Find implements SymbolTable.
 func (c *CombinedSymbolTable) Find(predicate func(*Symbol) bool) *Symbol {
-	if c.firstTable.Find(predicate) != nil {
-		return c.firstTable.Find(predicate)
+	ret := c.firstTable.Find(predicate)
+	if ret != nil {
+		return ret
 	}
 	return c.secondTable.Find(predicate)
 }
 
 // Get implements SymbolTable.
 func (c *CombinedSymbolTable) Get(name string) *Symbol {
-	if c.firstTable.Get(name) != nil {
-		return c.firstTable.Get(name)
+	ret := c.firstTable.Get(name)
+	if ret != nil {
+		return ret
 	}
 	return c.secondTable.Get(name)
 }
@@ -225,29 +225,46 @@ func (c *CombinedSymbolTable) Get2(name string) (*Symbol, bool) {
 func (c *CombinedSymbolTable) Iter() iter.Seq2[string, *Symbol] {
 	seen := make(map[string]struct{})
 	return func(yield func(string, *Symbol) bool) {
-		c.firstTable.Iter()(func(name string, symbol *Symbol) bool {
+		for name, symbol := range c.firstTable.Iter() {
 			if _, ok := seen[name]; !ok {
 				seen[name] = struct{}{}
-				return yield(name, symbol)
+				if !yield(name, symbol) {
+					break
+				}
 			}
-			return true
-		})
-		c.secondTable.Iter()(func(name string, symbol *Symbol) bool {
+		}
+		for name, symbol := range c.secondTable.Iter() {
 			if _, ok := seen[name]; !ok {
 				seen[name] = struct{}{}
-				return yield(name, symbol)
+				if !yield(name, symbol) {
+					return
+				}
 			}
-			return true
-		})
+		}
 	}
 }
 
 // Keys implements SymbolTable.
 func (c *CombinedSymbolTable) Keys() iter.Seq[string] {
 	return func(yield func(string) bool) {
-		c.Iter()(func(name string, symbol *Symbol) bool {
-			return yield(name)
-		})
+		seen := make(map[string]struct{})
+		for name := range c.firstTable.Keys() {
+			if _, ok := seen[name]; !ok {
+				seen[name] = struct{}{}
+				if !yield(name) {
+					break
+				}
+			}
+		}
+
+		for name := range c.secondTable.Keys() {
+			if _, ok := seen[name]; !ok {
+				seen[name] = struct{}{}
+				if !yield(name) {
+					return
+				}
+			}
+		}
 	}
 }
 
@@ -336,6 +353,7 @@ var TypesNodeIgnorableNames = collections.NewSetFromItems(
 	"PerformanceEntry",
 	"PerformanceMark",
 	"PerformanceMeasure",
+	"QueuingStrategy",
 	"ReadableByteStreamController",
 	"ReadableStream",
 	"ReadableStreamBYOBReader",
@@ -366,13 +384,15 @@ type DenoForkContext struct {
 	nodeGlobals      SymbolTable
 	combinedGlobals  SymbolTable
 	mergeSymbol      func(target *Symbol, source *Symbol, unidirectional bool) *Symbol
+	getMergedSymbol  func(source *Symbol) *Symbol
 	isNodeSourceFile func(path tspath.Path) bool
 }
 
 func NewDenoForkContext(
 	globals SymbolTable,
 	nodeGlobals SymbolTable,
 	mergeSymbol func(target *Symbol, source *Symbol, unidirectional bool) *Symbol,
+	getMergedSymbol func(source *Symbol) *Symbol,
 	isNodeSourceFile func(path tspath.Path) bool,
 ) *DenoForkContext {
 	return &DenoForkContext{
@@ -383,6 +403,7 @@ func NewDenoForkContext(
 			secondTable: globals,
 		},
 		mergeSymbol:      mergeSymbol,
+		getMergedSymbol:  getMergedSymbol,
 		isNodeSourceFile: isNodeSourceFile,
 	}
 }
@@ -396,7 +417,6 @@ func (c *DenoForkContext) GetGlobalsForName(name string) SymbolTable {
 }
 
 func isTypesNodePkgPath(path tspath.Path) bool {
-	fmt.Fprintf(os.Stderr, "isTypesNodePkgPath %s\n", path)
 	return strings.HasSuffix(string(path), ".d.ts") && strings.Contains(string(path), "/@types/node/")
 }
 
@@ -414,14 +434,6 @@ func symbolHasAnyTypesNodePkgDecl(symbol *Symbol, hasNodeSourceFile func(*Node)
 }
 
 func (c *DenoForkContext) MergeGlobalSymbolTable(node *Node, source SymbolTable, unidirectional bool) {
-	name := ""
-	if node != nil {
-		decl := node.Name()
-		if decl != nil {
-			name = decl.Text()
-		}
-	}
-	fmt.Fprintf(os.Stderr, "MergeGlobalSymbolTable %s\n", name)
 	sourceFile := GetSourceFileOfNode(node)
 	isNodeFile := c.HasNodeSourceFile(node)
 	isTypesNodeSourceFile := isNodeFile && isTypesNodePkgPath(sourceFile.Path())
@@ -435,17 +447,18 @@ func (c *DenoForkContext) MergeGlobalSymbolTable(node *Node, source SymbolTable,
 		}
 		targetSymbol := target.Get(id)
 		if isTypesNodeSourceFile {
-			fmt.Fprintf(os.Stderr, "isTypesNodeSourceFile %s\n", id)
 		}
 		if isTypesNodeSourceFile && targetSymbol != nil && TypesNodeIgnorableNames.Has(id) && !symbolHasAnyTypesNodePkgDecl(targetSymbol, c.HasNodeSourceFile) {
-			fmt.Fprintf(os.Stderr, "ignoring %s\n", id)
 			continue
 		}
-		sym := sourceSymbol
+		var merged *Symbol
 		if targetSymbol != nil {
-			sym = c.mergeSymbol(targetSymbol, sourceSymbol, unidirectional)
+			merged = c.mergeSymbol(targetSymbol, sourceSymbol, unidirectional)
+		} else {
+			merged = c.getMergedSymbol(sourceSymbol)
 		}
-		target.Set(id, sym)
+
+		target.Set(id, merged)
 	}
 }
 

internal/binder/nameresolver.go

@@ -322,7 +322,8 @@ loop:
 		if !excludeGlobals {
 			if r.DenoContext.HasNodeSourceFile(lastLocation) {
 				result = r.lookup(r.NodeGlobals, name, meaning|ast.SymbolFlagsGlobalLookup)
-			} else {
+			}
+			if result == nil {
 				result = r.lookup(r.DenoGlobals, name, meaning|ast.SymbolFlagsGlobalLookup)
 			}
 		}

internal/checker/checker.go

@@ -928,11 +928,10 @@ func NewChecker(program Program) *Checker {
 	c.denoGlobalThisSymbol = c.newSymbolEx(ast.SymbolFlagsModule, "globalThis", ast.CheckFlagsReadonly)
 	c.denoGlobalThisSymbol.Exports = c.denoGlobals
 	c.denoGlobals.Set(c.denoGlobalThisSymbol.Name, c.denoGlobalThisSymbol)
-	c.denoForkContext = ast.NewDenoForkContext(c.denoGlobals, c.nodeGlobals, c.mergeSymbol, c.program.IsNodeSourceFile)
+	c.denoForkContext = ast.NewDenoForkContext(c.denoGlobals, c.nodeGlobals, c.mergeSymbol, c.getMergedSymbol, c.program.IsNodeSourceFile)
 	c.nodeGlobalThisSymbol = c.newSymbolEx(ast.SymbolFlagsModule, "globalThis", ast.CheckFlagsReadonly)
 	c.nodeGlobalThisSymbol.Exports = c.denoForkContext.CombinedGlobals()
 	c.nodeGlobals.Set(c.nodeGlobalThisSymbol.Name, c.nodeGlobalThisSymbol)
-	c.nodeGlobals.Set(c.nodeGlobalThisSymbol.Name, c.nodeGlobalThisSymbol)
 	c.resolveName = c.createNameResolver().Resolve
 	c.resolveNameForSymbolSuggestion = c.createNameResolverForSuggestion().Resolve
 	c.tupleTypes = make(map[string]*Type)
@@ -1281,6 +1280,7 @@ func (c *Checker) initializeChecker() {
 	for _, file := range c.files {
 		if !ast.IsExternalOrCommonJSModule(file) {
 			c.denoForkContext.MergeGlobalSymbolTable(&file.Node, file.Locals, false /*unidirectional*/)
+			// c.mergeSymbolTable(c.denoGlobals, file.Locals, false,)
 		}
 		c.patternAmbientModules = append(c.patternAmbientModules, file.PatternAmbientModules...)
 		augmentations = append(augmentations, file.ModuleAugmentations)
@@ -10871,7 +10871,9 @@ func (c *Checker) checkPropertyAccessExpressionOrQualifiedName(node *ast.Node, l
 				}
 				return c.anyType
 			}
+			// deno: ensure condition matches above
 			if leftType.symbol == c.nodeGlobalThisSymbol {
+				// deno: don't bother with errors like above for simplicity
 				return c.anyType
 			}
 			if right.Text() != "" && !c.checkAndReportErrorForExtendingInterface(node) {
@@ -14250,11 +14252,12 @@ func (c *Checker) canHaveSyntheticDefault(file *ast.Node, moduleSymbol *ast.Symb
 			// In Node.js, CommonJS modules always have a synthetic default when imported into ESM
 			return true
 		}
-		if usageMode == core.ModuleKindESNext && targetMode == core.ModuleKindESNext {
-			// No matter what the `module` setting is, if we're confident that both files
-			// are ESM, there cannot be a synthetic default.
-			return false
-		}
+		// deno: commented out for https://github.com/microsoft/TypeScript/issues/51321
+		// if usageMode == core.ModuleKindESNext && targetMode == core.ModuleKindESNext {
+		// 	// No matter what the `module` setting is, if we're confident that both files
+		// 	// are ESM, there cannot be a synthetic default.
+		// 	return false
+		// }
 	}
 	if !c.allowSyntheticDefaultImports {
 		return false
@@ -14922,7 +14925,7 @@ func (c *Checker) tryFindAmbientModule(moduleName string, withAugmentations bool
 		return nil
 	}
 	symbol := c.getSymbol(c.denoForkContext.CombinedGlobals(), "\""+moduleName+"\"", ast.SymbolFlagsValueModule)
-	// merged symbol is module declaration symbol combined with all augmentations
+	// module declaration symbol combined with all augmentations
 	if withAugmentations {
 		return c.getMergedSymbol(symbol)
 	}
@@ -14933,7 +14936,7 @@ func (c *Checker) GetAmbientModules(sourceFile *ast.SourceFile) []*ast.Symbol {
 	isNode := c.denoForkContext.HasNodeSourceFile(&sourceFile.Node)
 	if isNode {
 		c.nodeAmbientModulesOnce.Do(func() {
-			for sym, global := range c.nodeGlobals.Iter() {
+			for sym, global := range c.denoForkContext.CombinedGlobals().Iter() {
 				if strings.HasPrefix(sym, "\"") && strings.HasSuffix(sym, "\"") {
 					c.ambientModules = append(c.ambientModules, global)
 				}