Always provide ModuleSpecifierGenerationHost to NodeBuilder

internal/checker/nodebuilder.go

@@ -7,9 +7,9 @@ import (
 )
 
 type NodeBuilder struct {
-	ctxStack  []*NodeBuilderContext
-	basicHost Host
-	impl      *NodeBuilderImpl
+	ctxStack []*NodeBuilderContext
+	host     Host
+	impl     *NodeBuilderImpl
 }
 
 // EmitContext implements NodeBuilderInterface.
@@ -20,6 +20,7 @@ func (b *NodeBuilder) EmitContext() *printer.EmitContext {
 func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebuilder.Flags, internalFlags nodebuilder.InternalFlags, tracker nodebuilder.SymbolTracker) {
 	b.ctxStack = append(b.ctxStack, b.impl.ctx)
 	b.impl.ctx = &NodeBuilderContext{
+		host:                     b.host,
 		tracker:                  tracker,
 		flags:                    flags,
 		internalFlags:            internalFlags,
@@ -32,14 +33,7 @@ func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebui
 		enclosingSymbolTypes:     make(map[ast.SymbolId]*Type),
 		remappedSymbolReferences: make(map[ast.SymbolId]*ast.Symbol),
 	}
-	// TODO: always provide this; see https://github.com/microsoft/typescript-go/pull/1588#pullrequestreview-3125218673
-	var moduleResolverHost Host
-	if tracker != nil {
-		moduleResolverHost = tracker.GetModuleSpecifierGenerationHost()
-	} else if internalFlags&nodebuilder.InternalFlagsDoNotIncludeSymbolChain != 0 {
-		moduleResolverHost = b.basicHost
-	}
-	tracker = NewSymbolTrackerImpl(b.impl.ctx, tracker, moduleResolverHost)
+	tracker = NewSymbolTrackerImpl(b.impl.ctx, tracker)
 	b.impl.ctx.tracker = tracker
 }
 
@@ -182,7 +176,7 @@ func NewNodeBuilder(ch *Checker, e *printer.EmitContext) *NodeBuilder {
 
 func NewNodeBuilderEx(ch *Checker, e *printer.EmitContext, idToSymbol map[*ast.IdentifierNode]*ast.Symbol) *NodeBuilder {
 	impl := newNodeBuilderImpl(ch, e, idToSymbol)
-	return &NodeBuilder{impl: impl, ctxStack: make([]*NodeBuilderContext, 0, 1), basicHost: ch.program}
+	return &NodeBuilder{impl: impl, ctxStack: make([]*NodeBuilderContext, 0, 1), host: ch.program}
 }
 
 func (c *Checker) getNodeBuilder() *NodeBuilder {

internal/checker/nodebuilderimpl.go

@@ -54,6 +54,7 @@ type NodeBuilderSymbolLinks struct {
 	specifierCache module.ModeAwareCache[string]
 }
 type NodeBuilderContext struct {
+	host                            Host
 	tracker                         nodebuilder.SymbolTracker
 	approximateLength               int
 	encounteredError                bool
@@ -1157,7 +1158,7 @@ func (b *NodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 			return stringutil.StripQuotes(symbol.Name)
 		}
 	}
-	if b.ctx.enclosingFile == nil || b.ctx.tracker.GetModuleSpecifierGenerationHost() == nil {
+	if b.ctx.enclosingFile == nil {
 		if isAmbientModuleSymbolName(symbol.Name) {
 			return stringutil.StripQuotes(symbol.Name)
 		}
@@ -1189,7 +1190,7 @@ func (b *NodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 	// just like how the declaration emitter does for the ambient module declarations - we can easily accomplish this
 	// using the `baseUrl` compiler option (which we would otherwise never use in declaration emit) and a non-relative
 	// specifier preference
-	host := b.ctx.tracker.GetModuleSpecifierGenerationHost()
+	host := b.ctx.host
 	specifierCompilerOptions := b.ch.compilerOptions
 	specifierPref := modulespecifiers.ImportModuleSpecifierPreferenceProjectRelative
 	endingPref := modulespecifiers.ImportModuleSpecifierEndingPreferenceNone

internal/checker/symboltracker.go

@@ -2,18 +2,16 @@ package checker
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/nodebuilder"
 )
 
 type SymbolTrackerImpl struct {
 	context            *NodeBuilderContext
 	inner              nodebuilder.SymbolTracker
 	DisableTrackSymbol bool
-	tchost             Host
 }
 
-func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.SymbolTracker, tchost Host) *SymbolTrackerImpl {
+func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.SymbolTracker) *SymbolTrackerImpl {
 	if tracker != nil {
 		for {
 			t, ok := tracker.(*SymbolTrackerImpl)
@@ -24,14 +22,7 @@ func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.Symbo
 		}
 	}
 
-	return &SymbolTrackerImpl{context, tracker, false, tchost}
-}
-
-func (this *SymbolTrackerImpl) GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost {
-	if this.inner == nil {
-		return this.tchost
-	}
-	return this.inner.GetModuleSpecifierGenerationHost()
+	return &SymbolTrackerImpl{context, tracker, false}
 }
 
 func (this *SymbolTrackerImpl) TrackSymbol(symbol *ast.Symbol, enclosingDeclaration *ast.Node, meaning ast.SymbolFlags) bool {

internal/fourslash/_scripts/failingTests.txt

@@ -423,7 +423,6 @@ TestLocalFunction
 TestMemberListInReopenedEnum
 TestMemberListInWithBlock
 TestMemberListOfExportedClass
-TestModuleReexportedIntoGlobalQuickInfo
 TestMultilineCommentBeforeOpenBrace
 TestMultiModuleFundule
 TestNgProxy1
@@ -472,7 +471,6 @@ TestQuickInfoFromContextualUnionType3
 TestQuickInfoFunctionKeyword
 TestQuickInfoGenerics
 TestQuickInfoGetterSetter
-TestQuickInfoImportNonunicodePath
 TestQuickInfoInInvalidIndexSignature
 TestQuickInfoInJsdocInTsFile1
 TestQuickInfoInOptionalChain

internal/nodebuilder/types.go

@@ -3,13 +3,10 @@ package nodebuilder
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 )
 
 // TODO: previously all symboltracker methods were optional, but now they're required.
 type SymbolTracker interface {
-	GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost
-
 	TrackSymbol(symbol *ast.Symbol, enclosingDeclaration *ast.Node, meaning ast.SymbolFlags) bool
 	ReportInaccessibleThisError()
 	ReportPrivateInBaseOfClassExpression(propertyName string)

internal/transformers/declarations/tracker.go

@@ -5,7 +5,6 @@ import (
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/diagnostics"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/printer"
 	"github.com/microsoft/typescript-go/internal/scanner"
 )
@@ -17,11 +16,6 @@ type SymbolTrackerImpl struct {
 	fallbackStack []*ast.Node
 }
 
-// GetModuleSpecifierGenerationHost implements checker.SymbolTracker.
-func (s *SymbolTrackerImpl) GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost {
-	return s.host
-}
-
 // PopErrorFallbackNode implements checker.SymbolTracker.
 func (s *SymbolTrackerImpl) PopErrorFallbackNode() {
 	s.fallbackStack = s.fallbackStack[:len(s.fallbackStack)-1]

testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types

@@ -17,10 +17,10 @@ export declare function styled(): Color;
 
 === file2.ts ===
 import { styled }  from "./file1";
->styled : () => import("color").default
+>styled : () => import("./color").default
 
 export const A = styled();
->A : import("color").default
->styled() : import("color").default
->styled : () => import("color").default
+>A : import("./color").default
+>styled() : import("./color").default
+>styled : () => import("./color").default
 

testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types

@@ -15,7 +15,7 @@ export default 2 + 2;
 >2 : 2
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
 === foo2.d.ts ===
 export = 2 + 2;

testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types

@@ -43,7 +43,7 @@ export function Timestamped<TBase extends Constructor>(Base: TBase) {
 === index.ts ===
 import { wrapClass, Timestamped } from "./wrapClass";
 >wrapClass : (param: any) => typeof Wrapped
->Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
+>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 
 export default wrapClass(0);
 >wrapClass(0) : typeof Wrapped
@@ -63,7 +63,7 @@ export class User {
 export class TimestampedUser extends Timestamped(User) {
 >TimestampedUser : TimestampedUser
 >Timestamped(User) : Timestamped.(Anonymous class) & User
->Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
+>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 >User : typeof User
 
     constructor() {

testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types.diff

@@ -19,7 +19,7 @@
  import { wrapClass, Timestamped } from "./wrapClass";
  >wrapClass : (param: any) => typeof Wrapped
 ->Timestamped : <TBase extends import("./wrapClass").Constructor>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & TBase
-+>Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
++>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 
  export default wrapClass(0);
  >wrapClass(0) : typeof Wrapped
@@ -30,7 +30,7 @@
 ->Timestamped(User) : Timestamped<typeof User>.(Anonymous class) & User
 ->Timestamped : <TBase extends import("./wrapClass").Constructor>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & TBase
 +>Timestamped(User) : Timestamped.(Anonymous class) & User
-+>Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
++>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
  >User : typeof User
 
      constructor() {

testdata/baselines/reference/submodule/compiler/augmentExportEquals3.types

@@ -2,17 +2,17 @@
 
 === file1.ts ===
 function foo() {}
->foo : typeof import("file1.ts")
+>foo : typeof import("./file1")
 
 namespace foo {
->foo : typeof import("file1.ts")
+>foo : typeof import("./file1")
 
     export var v = 1;
 >v : number
 >1 : 1
 }
 export = foo;
->foo : typeof import("file1.ts")
+>foo : typeof import("./file1")
 
 === file2.ts ===
 import x = require("./file1"); 

testdata/baselines/reference/submodule/compiler/augmentExportEquals4.types

@@ -2,17 +2,17 @@
 
 === file1.ts ===
 class foo {}
->foo : import("file1.ts")
+>foo : import("./file1")
 
 namespace foo {
->foo : typeof import("file1.ts")
+>foo : typeof import("./file1")
 
     export var v = 1;
 >v : number
 >1 : 1
 }
 export = foo;
->foo : import("file1.ts")
+>foo : import("./file1")
 
 === file2.ts ===
 import x = require("./file1"); 

testdata/baselines/reference/submodule/compiler/augmentExportEquals5.types

@@ -11,11 +11,11 @@ declare module "express" {
 >"express" : typeof import("express")
 
     function e(): e.Express;
->e : typeof import("express.d.ts")
+>e : typeof import("express")
 >e : any
 
     namespace e {
->e : typeof import("express.d.ts")
+>e : typeof import("express")
 
         interface IRoute {
             all(...handler: RequestHandler[]): IRoute;
@@ -101,7 +101,7 @@ declare module "express" {
     }
 
     export = e;
->e : typeof import("express.d.ts")
+>e : typeof import("express")
 }
 
 === augmentation.ts ===