Skip to content

fix: add import attribute type to resolved file cache key #12

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

Merged
merged 2 commits into from
Oct 24, 2025
Merged

fix: add import attribute type to resolved file cache key #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b81d2
add import attribute type to resolved file cache key
nathanwhit Oct 24, 2025
9430a5e
fmt
nathanwhit Oct 24, 2025
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
6 changes: 4 additions & 2 deletions internal/checker/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ type Program interface {
GetEmitModuleFormatOfFile(sourceFile ast.HasFileName) core.ModuleKind
GetEmitSyntaxForUsageLocation(sourceFile ast.HasFileName, usageLocation *ast.StringLiteralLike) core.ResolutionMode
GetImpliedNodeFormatForEmit(sourceFile ast.HasFileName) core.ModuleKind
GetResolvedModule(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
GetResolvedModule(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode, importAttributeType string) *module.ResolvedModule
GetResolvedModules() map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule]
GetSourceFileMetaData(path tspath.Path) ast.SourceFileMetaData
GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleReference string, specifier *ast.Node)
Expand All @@ -544,6 +544,8 @@ type Program interface {
GetProjectReferenceFromOutputDts(path tspath.Path) *tsoptions.SourceOutputAndProjectReference
GetRedirectForResolution(file ast.HasFileName) *tsoptions.ParsedCommandLine
CommonSourceDirectory() string

GetModuleLiteralImportAttributeType(node *ast.StringLiteralLike) string
}

type Host interface {
Expand Down Expand Up @@ -14731,7 +14733,7 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
mode = c.program.GetDefaultResolutionModeForFile(importingSourceFile)
}

resolvedModule := c.program.GetResolvedModule(importingSourceFile, moduleReference, mode)
resolvedModule := c.program.GetResolvedModule(importingSourceFile, moduleReference, mode, c.program.GetModuleLiteralImportAttributeType(contextSpecifier))

var resolutionDiagnostic *diagnostics.Message
if errorNode != nil && resolvedModule.IsResolved() {
Expand Down
10 changes: 7 additions & 3 deletions internal/compiler/fileloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,15 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(t *parseTask) {

var kind *string = nil
if ast.IsStringLiteralLike(entry) {
kind = getModuleLiteralImportKind(entry)
kind = getModuleLiteralImportAttributeType(entry)
}
importAttributeType := ""
if kind != nil {
importAttributeType = *kind
}
mode := getModeForUsageLocation(file.FileName(), meta, entry, optionsForFile)
resolvedModule, trace := p.resolver.ResolveModuleName(moduleName, fileName, kind, mode, redirect)
resolutionsInFile[module.ModeAwareCacheKey{Name: moduleName, Mode: mode}] = resolvedModule
resolutionsInFile[module.ModeAwareCacheKey{Name: moduleName, Mode: mode, ImportAttributeType: importAttributeType}] = resolvedModule
resolutionsTrace = append(resolutionsTrace, trace...)

if !resolvedModule.IsResolved() {
Expand Down Expand Up @@ -783,7 +787,7 @@ func getRawTypeValue(node *ast.Node) *string {
return nil
}

func getModuleLiteralImportKind(node *ast.StringLiteralLike) *string {
func getModuleLiteralImportAttributeType(node *ast.StringLiteralLike) *string {
parent := node.Parent
if parent == nil {
return nil
Expand Down
14 changes: 11 additions & 3 deletions internal/compiler/program.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,14 @@ func (p *Program) GetDenoForkContextInfo() ast.DenoForkContextInfo {
return p.Host().GetDenoForkContextInfo()
}

func (p *Program) GetModuleLiteralImportAttributeType(node *ast.StringLiteralLike) string {
t := getModuleLiteralImportAttributeType(node)
if t != nil {
return *t
}
return ""
}

var _ checker.Program = (*Program)(nil)

/** This should have similar behavior to 'processSourceFile' without diagnostics or mutation. */
Expand Down Expand Up @@ -385,9 +393,9 @@ func (p *Program) GetTypeCheckerForFile(ctx context.Context, file *ast.SourceFil
return p.checkerPool.GetCheckerForFile(ctx, file)
}

func (p *Program) GetResolvedModule(file ast.HasFileName, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
func (p *Program) GetResolvedModule(file ast.HasFileName, moduleReference string, mode core.ResolutionMode, importAttributeType string) *module.ResolvedModule {
if resolutions, ok := p.resolvedModules[file.Path()]; ok {
if resolved, ok := resolutions[module.ModeAwareCacheKey{Name: moduleReference, Mode: mode}]; ok {
if resolved, ok := resolutions[module.ModeAwareCacheKey{Name: moduleReference, Mode: mode, ImportAttributeType: importAttributeType}]; ok {
return resolved
}
}
Expand All @@ -399,7 +407,7 @@ func (p *Program) GetResolvedModuleFromModuleSpecifier(file ast.HasFileName, mod
panic("moduleSpecifier must be a StringLiteralLike")
}
mode := p.GetModeForUsageLocation(file, moduleSpecifier)
return p.GetResolvedModule(file, moduleSpecifier.Text(), mode)
return p.GetResolvedModule(file, moduleSpecifier.Text(), mode, p.GetModuleLiteralImportAttributeType(moduleSpecifier))
}

func (p *Program) GetResolvedModules() map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule] {
Expand Down
2 changes: 1 addition & 1 deletion internal/module/resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func doCall(t *testing.T, resolver *module.Resolver, call functionCall, skipLoca

errorMessageArgs := []any{call.args.Name, call.args.ContainingFile}
if call.call == "resolveModuleName" {
resolved, _ := resolver.ResolveModuleName(call.args.Name, call.args.ContainingFile, core.ModuleKind(call.args.ResolutionMode), redirectedReference)
resolved, _ := resolver.ResolveModuleName(call.args.Name, call.args.ContainingFile, nil, core.ModuleKind(call.args.ResolutionMode), redirectedReference)
assert.Check(t, resolved != nil, "ResolveModuleName should not return nil", errorMessageArgs)
if expectedResolvedModule, ok := call.returnValue["resolvedModule"].(map[string]any); ok {
assert.Check(t, resolved.IsResolved(), errorMessageArgs)
Expand Down
5 changes: 3 additions & 2 deletions internal/module/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ type ResolutionHost interface {
}

type ModeAwareCacheKey struct {
Name string
Mode core.ResolutionMode
Name string
Mode core.ResolutionMode
ImportAttributeType string
}

type ResolvedProjectReference interface {
Expand Down
12 changes: 8 additions & 4 deletions internal/transformers/tstransforms/importelision_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type fakeProgram struct {
files []*ast.SourceFile
getEmitModuleFormatOfFile func(sourceFile ast.HasFileName) core.ModuleKind
getImpliedNodeFormatForEmit func(sourceFile ast.HasFileName) core.ModuleKind
getResolvedModule func(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
getResolvedModule func(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode, importAttributeType string) *module.ResolvedModule
getSourceFile func(FileName string) *ast.SourceFile
getSourceFileForResolvedModule func(FileName string) *ast.SourceFile
}
Expand Down Expand Up @@ -133,8 +133,8 @@ func (p *fakeProgram) GetModeForUsageLocation(sourceFile ast.HasFileName, locati
return p.getEmitModuleFormatOfFile(sourceFile)
}

func (p *fakeProgram) GetResolvedModule(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
return p.getResolvedModule(currentSourceFile, moduleReference, mode)
func (p *fakeProgram) GetResolvedModule(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode, importAttributeType string) *module.ResolvedModule {
return p.getResolvedModule(currentSourceFile, moduleReference, mode, importAttributeType)
}

func (p *fakeProgram) GetSourceFile(FileName string) *ast.SourceFile {
Expand Down Expand Up @@ -173,6 +173,10 @@ func (p *fakeProgram) GetDenoForkContextInfo() ast.DenoForkContextInfo {
return ast.DenoForkContextInfo{}
}

func (p *fakeProgram) GetModuleLiteralImportAttributeType(node *ast.StringLiteralLike) string {
return ""
}

func TestImportElision(t *testing.T) {
t.Parallel()
data := []struct {
Expand Down Expand Up @@ -243,7 +247,7 @@ func TestImportElision(t *testing.T) {
}
return nil
},
getResolvedModule: func(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
getResolvedModule: func(currentSourceFile ast.HasFileName, moduleReference string, mode core.ResolutionMode, importAttributeType string) *module.ResolvedModule {
if currentSourceFile == file && moduleReference == "other" {
return &module.ResolvedModule{
ResolvedFileName: "other.ts",
Expand Down