Reparse @import as synthetic type-only import declaration

internal/api/encoder/encoder.go

@@ -459,7 +459,7 @@ func getChildrenPropertyMask(node *ast.Node) uint8 {
 	case ast.KindImportEqualsDeclaration:
 		n := node.AsImportEqualsDeclaration()
 		return (boolToByte(n.Modifiers() != nil) << 0) | (boolToByte(n.Name() != nil) << 1) | (boolToByte(n.ModuleReference != nil) << 2)
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		n := node.AsImportDeclaration()
 		return (boolToByte(n.Modifiers() != nil) << 0) | (boolToByte(n.ImportClause != nil) << 1) | (boolToByte(n.ModuleSpecifier != nil) << 2) | (boolToByte(n.Attributes != nil) << 3)
 	case ast.KindImportSpecifier:
@@ -468,7 +468,7 @@ func getChildrenPropertyMask(node *ast.Node) uint8 {
 	case ast.KindImportClause:
 		n := node.AsImportClause()
 		return (boolToByte(n.Name() != nil) << 0) | (boolToByte(n.NamedBindings != nil) << 1)
-	case ast.KindExportAssignment:
+	case ast.KindExportAssignment, ast.KindJSExportAssignment:
 		n := node.AsExportAssignment()
 		return (boolToByte(n.Modifiers() != nil) << 0) | (boolToByte(n.Expression != nil) << 1)
 	case ast.KindNamespaceExportDeclaration:

internal/ast/ast.go

@@ -751,12 +751,10 @@ func (n *Node) Children() *NodeList {
 
 func (n *Node) ModuleSpecifier() *Expression {
 	switch n.Kind {
-	case KindImportDeclaration:
+	case KindImportDeclaration, KindJSImportDeclaration:
 		return n.AsImportDeclaration().ModuleSpecifier
 	case KindExportDeclaration:
 		return n.AsExportDeclaration().ModuleSpecifier
-	case KindJSDocImportTag:
-		return n.AsJSDocImportTag().ModuleSpecifier
 	}
 	panic("Unhandled case in Node.ModuleSpecifier: " + n.Kind.String())
 }
@@ -4036,13 +4034,21 @@ type ImportDeclaration struct {
 	Attributes      *ImportAttributesNode // ImportAttributesNode. Optional
 }
 
-func (f *NodeFactory) NewImportDeclaration(modifiers *ModifierList, importClause *ImportClauseNode, moduleSpecifier *Expression, attributes *ImportAttributesNode) *Node {
+func (f *NodeFactory) newImportOrJSImportDeclaration(kind Kind, modifiers *ModifierList, importClause *ImportClauseNode, moduleSpecifier *Expression, attributes *ImportAttributesNode) *Node {
 	data := &ImportDeclaration{}
 	data.modifiers = modifiers
 	data.ImportClause = importClause
 	data.ModuleSpecifier = moduleSpecifier
 	data.Attributes = attributes
-	return f.newNode(KindImportDeclaration, data)
+	return f.newNode(kind, data)
+}
+
+func (f *NodeFactory) NewImportDeclaration(modifiers *ModifierList, importClause *ImportClauseNode, moduleSpecifier *Expression, attributes *ImportAttributesNode) *Node {
+	return f.newImportOrJSImportDeclaration(KindImportDeclaration, modifiers, importClause, moduleSpecifier, attributes)
+}
+
+func (f *NodeFactory) NewJSImportDeclaration(modifiers *ModifierList, importClause *ImportClauseNode, moduleSpecifier *Expression, attributes *ImportAttributesNode) *Node {
+	return f.newImportOrJSImportDeclaration(KindJSImportDeclaration, modifiers, importClause, moduleSpecifier, attributes)
 }
 
 func (f *NodeFactory) UpdateImportDeclaration(node *ImportDeclaration, modifiers *ModifierList, importClause *ImportClauseNode, moduleSpecifier *Expression, attributes *ImportAttributesNode) *Node {

internal/ast/kind.go

@@ -381,6 +381,7 @@ const (
 	KindJSTypeAliasDeclaration
 	KindJSExportAssignment
 	KindCommonJSExport
+	KindJSImportDeclaration
 	// Transformation nodes
 	KindNotEmittedStatement
 	KindPartiallyEmittedExpression

internal/ast/utilities.go

@@ -646,6 +646,7 @@ func isDeclarationStatementKind(kind Kind) bool {
 		KindEnumDeclaration,
 		KindModuleDeclaration,
 		KindImportDeclaration,
+		KindJSImportDeclaration,
 		KindImportEqualsDeclaration,
 		KindExportDeclaration,
 		KindExportAssignment,
@@ -1036,7 +1037,7 @@ func CanHaveIllegalDecorators(node *Node) bool {
 		KindMissingDeclaration, KindVariableStatement,
 		KindInterfaceDeclaration, KindTypeAliasDeclaration,
 		KindEnumDeclaration, KindModuleDeclaration,
-		KindImportEqualsDeclaration, KindImportDeclaration,
+		KindImportEqualsDeclaration, KindImportDeclaration, KindJSImportDeclaration,
 		KindNamespaceExportDeclaration, KindExportDeclaration,
 		KindExportAssignment:
 		return true
@@ -1081,6 +1082,7 @@ func CanHaveModifiers(node *Node) bool {
 		KindModuleDeclaration,
 		KindImportEqualsDeclaration,
 		KindImportDeclaration,
+		KindJSImportDeclaration,
 		KindExportAssignment,
 		KindExportDeclaration:
 		return true
@@ -1662,7 +1664,7 @@ func IsAnyImportOrReExport(node *Node) bool {
 }
 
 func IsAnyImportSyntax(node *Node) bool {
-	return NodeKindIs(node, KindImportDeclaration, KindImportEqualsDeclaration)
+	return NodeKindIs(node, KindImportDeclaration, KindJSImportDeclaration, KindImportEqualsDeclaration)
 }
 
 func IsJsonSourceFile(file *SourceFile) bool {
@@ -1675,12 +1677,10 @@ func IsInJsonFile(node *Node) bool {
 
 func GetExternalModuleName(node *Node) *Expression {
 	switch node.Kind {
-	case KindImportDeclaration:
+	case KindImportDeclaration, KindJSImportDeclaration:
 		return node.AsImportDeclaration().ModuleSpecifier
 	case KindExportDeclaration:
 		return node.AsExportDeclaration().ModuleSpecifier
-	case KindJSDocImportTag:
-		return node.AsJSDocImportTag().ModuleSpecifier
 	case KindImportEqualsDeclaration:
 		if node.AsImportEqualsDeclaration().ModuleReference.Kind == KindExternalModuleReference {
 			return node.AsImportEqualsDeclaration().ModuleReference.AsExternalModuleReference().Expression
@@ -1701,7 +1701,7 @@ func GetExternalModuleName(node *Node) *Expression {
 
 func GetImportAttributes(node *Node) *Node {
 	switch node.Kind {
-	case KindImportDeclaration:
+	case KindImportDeclaration, KindJSImportDeclaration:
 		return node.AsImportDeclaration().Attributes
 	case KindExportDeclaration:
 		return node.AsExportDeclaration().Attributes
@@ -2053,6 +2053,7 @@ func GetMeaningFromDeclaration(node *Node) SemanticMeaning {
 		KindImportSpecifier,
 		KindImportEqualsDeclaration,
 		KindImportDeclaration,
+		KindJSImportDeclaration,
 		KindExportAssignment,
 		KindJSExportAssignment,
 		KindExportDeclaration:
@@ -2168,7 +2169,7 @@ func getModuleInstanceStateWorker(node *Node, ancestors []*Node, visited map[Nod
 		if IsEnumConst(node) {
 			return ModuleInstanceStateConstEnumOnly
 		}
-	case KindImportDeclaration, KindImportEqualsDeclaration:
+	case KindImportDeclaration, KindJSImportDeclaration, KindImportEqualsDeclaration:
 		if !HasSyntacticModifier(node, ModifierFlagsExport) {
 			return ModuleInstanceStateNonInstantiated
 		}
@@ -2339,7 +2340,7 @@ func GetFirstIdentifier(node *Node) *Node {
 
 func GetNamespaceDeclarationNode(node *Node) *Node {
 	switch node.Kind {
-	case KindImportDeclaration:
+	case KindImportDeclaration, KindJSImportDeclaration:
 		importClause := node.AsImportDeclaration().ImportClause
 		if importClause != nil && importClause.AsImportClause().NamedBindings != nil && IsNamespaceImport(importClause.AsImportClause().NamedBindings) {
 			return importClause.AsImportClause().NamedBindings
@@ -2361,15 +2362,13 @@ func ModuleExportNameIsDefault(node *Node) bool {
 	return node.Text() == InternalSymbolNameDefault
 }
 
-func IsDefaultImport(node *Node /*ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration | JSDocImportTag*/) bool {
-	var importClause *Node
+func IsDefaultImport(node *Node /*ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration*/) bool {
 	switch node.Kind {
-	case KindImportDeclaration:
-		importClause = node.AsImportDeclaration().ImportClause
-	case KindJSDocImportTag:
-		importClause = node.AsJSDocImportTag().ImportClause
+	case KindImportDeclaration, KindJSImportDeclaration:
+		importClause := node.AsImportDeclaration().ImportClause
+		return importClause != nil && importClause.AsImportClause().name != nil
 	}
-	return importClause != nil && importClause.AsImportClause().name != nil
+	return false
 }
 
 func GetImpliedNodeFormatForFile(path string, packageJsonType string) core.ModuleKind {
@@ -2554,13 +2553,6 @@ func ForEachDynamicImportOrRequireCall(
 			if cb(node, node.AsImportTypeNode().Argument.AsLiteralTypeNode().Literal) {
 				return true
 			}
-		} else if includeTypeSpaceImports && node.Kind == KindJSDocImportTag {
-			moduleNameExpr := GetExternalModuleName(node)
-			if moduleNameExpr != nil && IsStringLiteral(moduleNameExpr) && moduleNameExpr.Text() != "" {
-				if cb(node, moduleNameExpr) {
-					return true
-				}
-			}
 		}
 		// skip past import/require
 		lastIndex += size

internal/checker/checker.go

@@ -2205,7 +2205,7 @@ func (c *Checker) checkSourceElementWorker(node *ast.Node) {
 		c.checkEnumMember(node)
 	case ast.KindModuleDeclaration:
 		c.checkModuleDeclaration(node)
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		c.checkImportDeclaration(node)
 	case ast.KindImportEqualsDeclaration:
 		c.checkImportEqualsDeclaration(node)
@@ -4898,7 +4898,7 @@ func (c *Checker) checkModuleAugmentationElement(node *ast.Node) {
 			break
 		}
 		fallthrough
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		c.grammarErrorOnFirstToken(node, diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module)
 	case ast.KindBindingElement, ast.KindVariableDeclaration:
 		name := node.Name()
@@ -5080,14 +5080,10 @@ func isExclusivelyTypeOnlyImportOrExport(node *ast.Node) bool {
 	switch node.Kind {
 	case ast.KindExportDeclaration:
 		return node.AsExportDeclaration().IsTypeOnly
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		if importClause := node.AsImportDeclaration().ImportClause; importClause != nil {
 			return importClause.AsImportClause().IsTypeOnly
 		}
-	case ast.KindJSDocImportTag:
-		if importClause := node.AsJSDocImportTag().ImportClause; importClause != nil {
-			return importClause.AsImportClause().IsTypeOnly
-		}
 	}
 	return false
 }
@@ -14173,7 +14169,7 @@ func (c *Checker) getModuleSpecifierForImportOrExport(node *ast.Node) *ast.Node
 
 func getModuleSpecifierFromNode(node *ast.Node) *ast.Node {
 	switch node.Kind {
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		return node.AsImportDeclaration().ModuleSpecifier
 	case ast.KindExportDeclaration:
 		return node.AsExportDeclaration().ModuleSpecifier
@@ -29387,7 +29383,7 @@ func (c *Checker) getSymbolAtLocation(node *ast.Node, ignoreErrors bool) *ast.Sy
 		// 3). Require in Javascript
 		// 4). type A = import("./f/*gotToDefinitionHere*/oo")
 		if (ast.IsExternalModuleImportEqualsDeclaration(grandParent) && getExternalModuleImportEqualsDeclarationExpression(grandParent) == node) ||
-			((parent.Kind == ast.KindImportDeclaration || parent.Kind == ast.KindExportDeclaration) && parent.AsImportDeclaration().ModuleSpecifier == node) ||
+			((parent.Kind == ast.KindImportDeclaration || parent.Kind == ast.KindJSImportDeclaration || parent.Kind == ast.KindExportDeclaration) && parent.AsImportDeclaration().ModuleSpecifier == node) ||
 			ast.IsVariableDeclarationInitializedToRequire(grandParent) ||
 			(ast.IsLiteralTypeNode(parent) && ast.IsLiteralImportTypeNode(grandParent) && grandParent.AsImportTypeNode().Argument == parent) {
 			return c.resolveExternalModuleName(node, node, ignoreErrors)

internal/checker/grammarchecks.go

@@ -547,7 +547,7 @@ func (c *Checker) checkGrammarModifiers(node *ast.Node /*Union[HasModifiers, Has
 			return c.grammarErrorOnNode(lastAsync, diagnostics.X_0_modifier_cannot_appear_on_a_constructor_declaration, "async")
 		}
 		return false
-	} else if (node.Kind == ast.KindImportDeclaration || node.Kind == ast.KindImportEqualsDeclaration) && flags&ast.ModifierFlagsAmbient != 0 {
+	} else if (node.Kind == ast.KindImportDeclaration || node.Kind == ast.KindJSImportDeclaration || node.Kind == ast.KindImportEqualsDeclaration) && flags&ast.ModifierFlagsAmbient != 0 {
 		return c.grammarErrorOnNode(lastDeclare, diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare")
 	} else if node.Kind == ast.KindParameter && (flags&ast.ModifierFlagsParameterPropertyModifier != 0) && ast.IsBindingPattern(node.Name()) {
 		return c.grammarErrorOnNode(node, diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern)
@@ -598,6 +598,7 @@ func (c *Checker) findFirstIllegalModifier(node *ast.Node) *ast.Node {
 		ast.KindIndexSignature,
 		ast.KindModuleDeclaration,
 		ast.KindImportDeclaration,
+		ast.KindJSImportDeclaration,
 		ast.KindImportEqualsDeclaration,
 		ast.KindExportDeclaration,
 		ast.KindExportAssignment,
@@ -2021,7 +2022,7 @@ func (c *Checker) checkGrammarTopLevelElementForRequiredDeclareModifier(node *as
 	//     export_opt   AmbientDeclaration
 	//
 	// TODO: The spec needs to be amended to reflect this grammar.
-	if node.Kind == ast.KindInterfaceDeclaration || node.Kind == ast.KindTypeAliasDeclaration || node.Kind == ast.KindImportDeclaration || node.Kind == ast.KindImportEqualsDeclaration || node.Kind == ast.KindExportDeclaration || node.Kind == ast.KindExportAssignment || node.Kind == ast.KindJSExportAssignment || node.Kind == ast.KindNamespaceExportDeclaration || ast.HasSyntacticModifier(node, ast.ModifierFlagsAmbient|ast.ModifierFlagsExport|ast.ModifierFlagsDefault) {
+	if node.Kind == ast.KindInterfaceDeclaration || node.Kind == ast.KindTypeAliasDeclaration || node.Kind == ast.KindImportDeclaration || node.Kind == ast.KindJSImportDeclaration || node.Kind == ast.KindImportEqualsDeclaration || node.Kind == ast.KindExportDeclaration || node.Kind == ast.KindExportAssignment || node.Kind == ast.KindJSExportAssignment || node.Kind == ast.KindNamespaceExportDeclaration || ast.HasSyntacticModifier(node, ast.ModifierFlagsAmbient|ast.ModifierFlagsExport|ast.ModifierFlagsDefault) {
 		return false
 	}
 

internal/ls/utilities.go

@@ -20,7 +20,7 @@ func isInString(file *ast.SourceFile, position int, previousToken *ast.Node) boo
 
 func tryGetImportFromModuleSpecifier(node *ast.StringLiteralLike) *ast.Node {
 	switch node.Parent.Kind {
-	case ast.KindImportDeclaration, ast.KindExportDeclaration, ast.KindJSDocImportTag:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration, ast.KindExportDeclaration:
 		return node.Parent
 	case ast.KindExternalModuleReference:
 		return node.Parent.Parent

internal/parser/reparser.go

@@ -115,7 +115,16 @@ func (p *Parser) reparseTags(parent *ast.Node, jsDoc []*ast.Node) {
 				typeAlias.Loc = core.NewTextRange(tag.Pos(), tag.End())
 				typeAlias.Flags = p.contextFlags | ast.NodeFlagsReparsed
 				p.reparseList = append(p.reparseList, typeAlias)
-				// !!! @overload and other unattached tags (@callback, @import et al) support goes here
+			case ast.KindJSDocImportTag:
+				importTag := tag.AsJSDocImportTag()
+				importClause := importTag.ImportClause.Clone(&p.factory)
+				importClause.Flags |= ast.NodeFlagsReparsed
+				importClause.AsImportClause().IsTypeOnly = true
+				importDeclaration := p.factory.NewJSImportDeclaration(importTag.Modifiers(), importClause, importTag.ModuleSpecifier, importTag.Attributes)
+				importDeclaration.Loc = core.NewTextRange(tag.Pos(), tag.End())
+				importDeclaration.Flags = p.contextFlags | ast.NodeFlagsReparsed
+				p.reparseList = append(p.reparseList, importDeclaration)
+				// !!! @overload and other unattached tags (@callback et al) support goes here
 			}
 			if !isLast {
 				continue

internal/printer/namegenerator.go

@@ -158,7 +158,7 @@ func (g *NameGenerator) generateNameForNode(node *ast.Node, privateName bool, fl
 			panic("Generated name for a module or enum cannot be private and may have neither a prefix nor suffix")
 		}
 		return g.generateNameForModuleOrEnum(node)
-	case ast.KindImportDeclaration, ast.KindExportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration, ast.KindExportDeclaration:
 		if privateName || len(prefix) > 0 || len(suffix) > 0 {
 			panic("Generated name for an import or export cannot be private and may have neither a prefix nor suffix")
 		}

internal/printer/printer.go

@@ -3953,7 +3953,7 @@ func (p *Printer) emitStatement(node *ast.Statement) {
 		p.emitNamespaceExportDeclaration(node.AsNamespaceExportDeclaration())
 	case ast.KindImportEqualsDeclaration:
 		p.emitImportEqualsDeclaration(node.AsImportEqualsDeclaration())
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		p.emitImportDeclaration(node.AsImportDeclaration())
 	case ast.KindExportAssignment, ast.KindJSExportAssignment:
 		p.emitExportAssignment(node.AsExportAssignment())
@@ -5605,7 +5605,7 @@ func (p *Printer) generateNames(node *ast.Node) {
 		}
 	case ast.KindObjectBindingPattern, ast.KindArrayBindingPattern:
 		p.generateAllNames(node.AsBindingPattern().Elements)
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		p.generateNames(node.AsImportDeclaration().ImportClause)
 	case ast.KindImportClause:
 		p.generateNameIfNeeded(node.AsImportClause().Name())

internal/transformers/commonjsmodule.go

@@ -63,6 +63,8 @@ func (tx *CommonJSModuleTransformer) visitTopLevel(node *ast.Node) *ast.Node {
 	switch node.Kind {
 	case ast.KindImportDeclaration:
 		node = tx.visitTopLevelImportDeclaration(node.AsImportDeclaration())
+	case ast.KindJSImportDeclaration:
+		node = nil
 	case ast.KindImportEqualsDeclaration:
 		node = tx.visitTopLevelImportEqualsDeclaration(node.AsImportEqualsDeclaration())
 	case ast.KindExportDeclaration:

internal/transformers/esmodule.go

@@ -39,6 +39,8 @@ func (tx *ESModuleTransformer) visit(node *ast.Node) *ast.Node {
 		node = tx.visitSourceFile(node.AsSourceFile())
 	case ast.KindImportDeclaration:
 		node = tx.visitImportDeclaration(node.AsImportDeclaration())
+	case ast.KindJSImportDeclaration:
+		node = nil
 	case ast.KindImportEqualsDeclaration:
 		node = tx.visitImportEqualsDeclaration(node.AsImportEqualsDeclaration())
 	case ast.KindExportAssignment:

internal/transformers/esnext.go

@@ -368,6 +368,7 @@ func (tx *ESNextTransformer) transformUsingDeclarations(statementsIn []*ast.Stat
 
 		switch node.Kind {
 		case ast.KindImportDeclaration,
+			ast.KindJSImportDeclaration,
 			ast.KindImportEqualsDeclaration,
 			ast.KindExportDeclaration,
 			ast.KindFunctionDeclaration:

internal/transformers/externalmoduleinfo.go

@@ -47,11 +47,12 @@ func (c *externalModuleInfoCollector) collect() *externalModuleInfo {
 	hasImportDefault := false
 	for _, node := range c.sourceFile.Statements.Nodes {
 		switch node.Kind {
-		case ast.KindImportDeclaration:
+		case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 			// import "mod"
 			// import x from "mod"
 			// import * as x from "mod"
 			// import { x, y } from "mod"
+			// @import versions of above
 			n := node.AsImportDeclaration()
 			c.addExternalImport(node)
 			if !hasImportStar && getImportNeedsImportStarHelper(n) {

internal/transformers/importelision.go

@@ -28,7 +28,7 @@ func (tx *ImportElisionTransformer) visit(node *ast.Node) *ast.Node {
 			return nil
 		}
 		return tx.visitor.VisitEachChild(node)
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		if !tx.isElisionBlocked(node) {
 			n := node.AsImportDeclaration()
 			// Do not elide a side-effect only import declaration.
@@ -166,7 +166,7 @@ func (tx *ImportElisionTransformer) isElisionBlocked(node *ast.Node /*ImportDecl
 	}
 
 	switch node.Kind {
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		n := node.AsImportDeclaration()
 		p := parsed.AsImportDeclaration()
 		if n.ImportClause != p.ImportClause {

internal/transformers/typeeraser.go

@@ -255,7 +255,7 @@ func (tx *TypeEraserTransformer) visit(node *ast.Node) *ast.Node {
 		}
 		return tx.visitor.VisitEachChild(node)
 
-	case ast.KindImportDeclaration:
+	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
 		n := node.AsImportDeclaration()
 		if n.ImportClause == nil {
 			// Do not elide a side-effect only import declaration.