microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 10:58:20 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Add error when importing/exporting types in JS files (#49580)

Browse Source 
* Add error when importing/exporting types in JS files

* Ignore type-only imports, update other baselines

* Clean up
This commit is contained in:
Andrew Branch
2022-06-17 14:39:24 -07:00
committed by GitHub
parent 9f1983d8f4
commit 1213c35d57
10 changed files with 282 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/compiler/checker.ts
View File

@@ -40828,6 +40828,42 @@ namespace ts {
// otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
// in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
symbol = getMergedSymbol(symbol.exportSymbol || symbol);
// A type-only import/export will already have a grammar error in a JS file, so no need to issue more errors within
if (isInJSFile(node) && !(target.flags & SymbolFlags.Value) && !isTypeOnlyImportOrExportDeclaration(node)) {
const errorNode =
isImportOrExportSpecifier(node) ? node.propertyName || node.name :
isNamedDeclaration(node) ? node.name :
node;
Debug.assert(node.kind !== SyntaxKind.NamespaceExport);
if (node.kind === SyntaxKind.ExportSpecifier) {
const diag = error(errorNode, Diagnostics.Types_cannot_appear_in_export_declarations_in_JavaScript_files);
const alreadyExportedSymbol = getSourceFileOfNode(node).symbol?.exports?.get((node.propertyName || node.name).escapedText);
if (alreadyExportedSymbol === target) {
const exportingDeclaration = alreadyExportedSymbol.declarations?.find(isJSDocNode);
if (exportingDeclaration) {
addRelatedInfo(diag, createDiagnosticForNode(
exportingDeclaration,
Diagnostics._0_is_automatically_exported_here,
unescapeLeadingUnderscores(alreadyExportedSymbol.escapedName)));
}
}
}
else {
Debug.assert(node.kind !== SyntaxKind.VariableDeclaration);
const importDeclaration = findAncestor(node, or(isImportDeclaration, isImportEqualsDeclaration)) as ImportDeclaration | ImportEqualsDeclaration | undefined;
const moduleSpecifier = (importDeclaration && tryGetModuleSpecifierFromDeclaration(importDeclaration)?.text) ?? "...";
const importedIdentifier = unescapeLeadingUnderscores(isIdentifier(errorNode) ? errorNode.escapedText : symbol.escapedName);
error(
errorNode,
Diagnostics._0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation,
importedIdentifier,
`import("${moduleSpecifier}").${importedIdentifier}`);
}
return;
}
const excludedMeanings =
(symbol.flags & (SymbolFlags.Value | SymbolFlags.ExportValue) ? SymbolFlags.Value : 0) |
(symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |

14
src/compiler/diagnosticMessages.json
View File

@@ -3498,7 +3498,7 @@
"'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?": {
"category": "Error",
"code": 2842
},
},
"We can only write a type for '{0}' by adding a type for the entire parameter here.": {
"category": "Error",
"code": 2843
@@ -7405,5 +7405,17 @@
"A 'return' statement cannot be used inside a class static block.": {
"category": "Error",
"code": 18041
},
"'{0}' is a type and cannot be imported in JavaScript files. Use '{1}' in a JSDoc type annotation.": {
"category": "Error",
"code": 18042
},
"Types cannot appear in export declarations in JavaScript files.": {
"category": "Error",
"code": 18043
},
"'{0}' is automatically exported here.": {
"category": "Message",
"code": 18044
}
}