WIP

Author: andrewbranch

internal/checker/checker.go

@@ -535,7 +535,6 @@ type Program interface {
 	GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleReference string, specifier *ast.Node)
 	GetImportHelpersImportSpecifier(path tspath.Path) *ast.Node
 	GetModeForUsageLocation(sourceFile *ast.SourceFile, location *ast.Node) core.ResolutionMode
-	GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode
 }
 
 type Host interface {
@@ -5115,11 +5114,13 @@ func (c *Checker) checkImportAttributes(declaration *ast.Node) {
 			message = diagnostics.Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_nodenext_or_preserve
 		}
 		c.grammarErrorOnNode(node, message)
+		return
 	}
 	if isTypeOnly {
 		c.grammarErrorOnNode(node, core.IfElse(isImportAttributes,
 			diagnostics.Import_attributes_cannot_be_used_with_type_only_imports_or_exports,
 			diagnostics.Import_assertions_cannot_be_used_with_type_only_imports_or_exports))
+		return
 	}
 	if override != core.ResolutionModeNone {
 		c.grammarErrorOnNode(node, diagnostics.X_resolution_mode_can_only_be_set_for_type_only_imports)
@@ -14315,7 +14316,7 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 		mode             core.ResolutionMode
 	)
 
-	if ast.IsStringLiteralLike(location) || ast.IsModuleDeclaration(location.Parent) && location.Parent.AsModuleDeclaration().Name() == location {
+	if ast.IsStringLiteralLike(location) || location.Parent != nil && ast.IsModuleDeclaration(location.Parent) && location.Parent.AsModuleDeclaration().Name() == location {
 		contextSpecifier = location
 	} else if ast.IsModuleDeclaration(location) {
 		contextSpecifier = location.AsModuleDeclaration().Name()
@@ -14930,7 +14931,7 @@ func (c *Checker) getFullyQualifiedName(symbol *ast.Symbol, containingLocation *
 	if symbol.Parent != nil {
 		return c.getFullyQualifiedName(symbol.Parent, containingLocation) + "." + c.symbolToString(symbol)
 	}
-	return c.symbolToString(symbol) // !!!
+	return c.symbolToStringEx(symbol, containingLocation, ast.SymbolFlagsAll, SymbolFormatFlagsDoNotIncludeSymbolChain|SymbolFormatFlagsAllowAnyNodeKind, nil /*writer*/)
 }
 
 func (c *Checker) getExportsOfSymbol(symbol *ast.Symbol) ast.SymbolTable {

internal/checker/nodebuilderimpl.go

@@ -1074,11 +1074,9 @@ func (b *nodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 	contextFile := b.ctx.enclosingFile
 	resolutionMode := overrideImportMode
 	if resolutionMode == core.ResolutionModeNone && originalModuleSpecifier != nil {
-		// !!! import resolution mode support
-		// resolutionMode = b.ch.host.GetModeForUsageLocation(contextFile, originalModuleSpecifier)
+		resolutionMode = b.ch.program.GetModeForUsageLocation(contextFile, originalModuleSpecifier)
 	} else if resolutionMode == core.ResolutionModeNone && contextFile != nil {
-		// !!! import resolution mode support
-		// resolutionMode = b.ch.host.GetDefaultResolutionModeForFile(contextFile)
+		resolutionMode = b.ch.program.GetDefaultResolutionModeForFile(contextFile)
 	}
 	cacheKey := module.ModeAwareCacheKey{Name: string(contextFile.Path()), Mode: resolutionMode}
 	links := b.symbolLinks.Get(symbol)

internal/compiler/emitHost.go

@@ -40,6 +40,10 @@ type emitHost struct {
 	program *Program
 }
 
+func (host *emitHost) GetDefaultResolutionModeForFile(file modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
+	return host.program.GetDefaultResolutionModeForFile(file)
+}
+
 func (host *emitHost) FileExists(path string) bool {
 	return host.program.FileExists(path)
 }

internal/compiler/fileloader.go

@@ -12,6 +12,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/module"
+	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/tsoptions"
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
@@ -467,7 +468,7 @@ func getModeForTypeReferenceDirectiveInFile(ref *ast.FileReference, file *ast.So
 	}
 }
 
-func getDefaultResolutionModeForFile(file *ast.SourceFile, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
+func getDefaultResolutionModeForFile(file modulespecifiers.SourceFileForSpecifierGeneration, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
 	if importSyntaxAffectsModuleResolution(options) {
 		return ast.GetImpliedNodeFormatForEmitWorker(file.FileName(), options, meta)
 	} else {

internal/compiler/program.go

@@ -72,6 +72,11 @@ type Program struct {
 	unsupportedExtensions []string
 }
 
+// GetCommonSourceDirectory implements checker.Program.
+func (p *Program) GetCommonSourceDirectory() string {
+	return getCommonSourceDirectory(p.compilerOptions, p.files)
+}
+
 // FileExists implements checker.Program.
 func (p *Program) FileExists(path string) bool {
 	return p.host.FS().FileExists(path)
@@ -749,7 +754,7 @@ func (p *Program) GetModeForUsageLocation(sourceFile *ast.SourceFile, location *
 	return getModeForUsageLocation(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], location, p.compilerOptions)
 }
 
-func (p *Program) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+func (p *Program) GetDefaultResolutionModeForFile(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
 	return getDefaultResolutionModeForFile(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], p.compilerOptions)
 }
 

internal/modulespecifiers/specifiers.go

@@ -563,7 +563,7 @@ func processEnding(
 	if tspath.FileExtensionIsOneOf(fileName, []string{tspath.ExtensionMts, tspath.ExtensionCts}) && tsPriority < jsPriority {
 		return fileName
 	}
-	if tspath.IsDeclarationFileName(fileName) {
+	if tspath.FileExtensionIsOneOf(fileName, []string{tspath.ExtensionDmts, tspath.ExtensionMts, tspath.ExtensionDcts, tspath.ExtensionCts}) {
 		inputExt := tspath.GetDeclarationFileExtension(fileName)
 		ext := getJsExtensionForDeclarationFileExtension(inputExt)
 		return tspath.RemoveExtension(fileName, inputExt) + ext
@@ -660,6 +660,7 @@ func tryGetModuleNameAsNodeModule(
 			pkgJsonResults := tryDirectoryWithPackageJson(
 				*parts,
 				pathObj,
+				importingSourceFile,
 				host,
 				overrideMode,
 				options,
@@ -669,8 +670,6 @@ func tryGetModuleNameAsNodeModule(
 			packageRootPath := pkgJsonResults.packageRootPath
 			blockedByExports := pkgJsonResults.blockedByExports
 			verbatimFromExports := pkgJsonResults.verbatimFromExports
-			// !!! classic resolution is dead?
-			// if options.GetModuleResolutionKind() != core.ModuleResolutionKindClassic {
 			if blockedByExports {
 				return "" // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
 			}
@@ -729,6 +728,7 @@ type pkgJsonDirAttemptResult struct {
 func tryDirectoryWithPackageJson(
 	parts NodeModulePathParts,
 	pathObj ModulePath,
+	importingSourceFile SourceFileForSpecifierGeneration,
 	host ModuleSpecifierGenerationHost,
 	overrideMode core.ResolutionMode,
 	options *core.CompilerOptions,
@@ -752,10 +752,9 @@ func tryDirectoryWithPackageJson(
 	}
 
 	importMode := overrideMode
-	// !!! TODO: real resolutionMode support
-	// if importMode == core.ResolutionModeNone {
-	// 	importMode =  getDefaultResolutionModeForFile(importingSourceFile, host, options);
-	// }
+	if importMode == core.ResolutionModeNone {
+		importMode = host.GetDefaultResolutionModeForFile(importingSourceFile)
+	}
 
 	var packageJsonContent *packagejson.PackageJson
 	if packageJson != nil {
@@ -868,7 +867,7 @@ func tryGetModuleNameFromExports(
 	exports packagejson.ExportsOrImports,
 	conditions []string,
 ) string {
-	if exports.Type == packagejson.JSONValueTypeObject && allKeysStartWithDot(exports.AsObject()) {
+	if exports.IsSubpaths() {
 		// sub-mappings
 		// 3 cases:
 		// * directory mappings (legacyish, key ends with / (technically allows index/extension resolution under cjs mode))

internal/modulespecifiers/types.go

@@ -46,6 +46,7 @@ type ModuleSpecifierGenerationHost interface {
 	// GetModuleResolutionCache() any // !!! TODO: adapt new resolution cache model
 	// GetSymlinkCache() any // !!! TODO: adapt new resolution cache model
 	// GetFileIncludeReasons() any // !!! TODO: adapt new resolution cache model
+	GetCommonSourceDirectory() string
 	GetGlobalTypingsCacheLocation() string
 	UseCaseSensitiveFileNames() bool
 	GetCurrentDirectory() string
@@ -58,6 +59,7 @@ type ModuleSpecifierGenerationHost interface {
 
 	GetNearestAncestorDirectoryWithPackageJson(dirname string) string
 	GetPackageJsonInfo(pkgJsonPath string) PackageJsonInfo
+	GetDefaultResolutionModeForFile(file SourceFileForSpecifierGeneration) core.ResolutionMode
 }
 
 type ImportModuleSpecifierPreference string

internal/transformers/importelision_test.go

@@ -19,7 +19,7 @@ type fakeProgram struct {
 	singleThreaded              bool
 	compilerOptions             *core.CompilerOptions
 	files                       []*ast.SourceFile
-	getEmitModuleFormatOfFile   func(sourceFile *ast.SourceFile) core.ModuleKind
+	getEmitModuleFormatOfFile   func(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ModuleKind
 	getImpliedNodeFormatForEmit func(sourceFile *ast.SourceFile) core.ModuleKind
 	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
 	getSourceFile               func(FileName string) *ast.SourceFile
@@ -89,7 +89,7 @@ func (p *fakeProgram) GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) co
 	return p.getImpliedNodeFormatForEmit(sourceFile)
 }
 
-func (p *fakeProgram) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+func (p *fakeProgram) GetDefaultResolutionModeForFile(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
 	return p.getEmitModuleFormatOfFile(sourceFile)
 }
 
@@ -173,7 +173,7 @@ func TestImportElision(t *testing.T) {
 				singleThreaded:  true,
 				compilerOptions: compilerOptions,
 				files:           files,
-				getEmitModuleFormatOfFile: func(sourceFile *ast.SourceFile) core.ModuleKind {
+				getEmitModuleFormatOfFile: func(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ModuleKind {
 					return core.ModuleKindESNext
 				},
 				getImpliedNodeFormatForEmit: func(sourceFile *ast.SourceFile) core.ModuleKind {

testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports8.errors.txt

@@ -1,4 +1,4 @@
-a.ts(1,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.d.ts (0 errors) ====
@@ -9,6 +9,6 @@ a.ts(1,10): error TS2305: Module '"b"' has no exported member 'default'.
 ==== a.ts (1 errors) ====
     import { default as Foo } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
     Foo.bar();
     Foo.foo();

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.js")
+>Foo : typeof import("./foo")
 
 === foo2.d.ts ===
 export = 2 + 2;