maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure that when import/export are used natively in the JS runtime that the check for alias symbol is re-applied - re comment in #26912

Browse source
This commit is contained in:
Orta Therox 2019-07-30 15:51:53 -04:00
parent 946a14f3f3
commit 8dd57061e1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compiler/checker.ts
View file

@ -29973,7 +29973,10 @@ namespace ts {
function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) {
const symbol = getSymbolOfNode(node);
const target = resolveAlias(symbol);
if (target !== unknownSymbol) {
const shouldSkipWithJSRequireTargets = !isInJSFile(node) && moduleKind !== ModuleKind.ES2015;
if (shouldSkipWithJSRequireTargets && target !== unknownSymbol) {
// For external modules symbol represents local symbol for an alias.
// This local symbol will merge any other local declarations (excluding other aliases)
// and symbol.flags will contains combined representation for all merged declaration.
@ -30004,9 +30007,7 @@ namespace ts {
function checkImportBinding(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier) {
checkCollisionWithRequireExportsInGeneratedCode(node, node.name!);
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name!);
if (!isInJSFile(node)) {
checkAliasSymbol(node);
}
checkAliasSymbol(node);
}
function checkImportDeclaration(node: ImportDeclaration) {