Do not register ambient classes to the TS scope (#10352)

This commit is contained in:
Nicolò Ribaudo
2019-08-21 00:22:47 +02:00
committed by Brian Ng
parent 11ed2e2bf5
commit 15aa511b8e
10 changed files with 468 additions and 8 deletions

View File

@@ -14,8 +14,9 @@ import {
BIND_TS_CONST_ENUM,
BIND_TS_TYPE,
BIND_TS_INTERFACE,
BIND_TS_FN_TYPE,
BIND_TS_AMBIENT,
BIND_TS_NAMESPACE,
BIND_CLASS,
} from "../../util/scopeflags";
import TypeScriptScopeHandler from "./scope";
@@ -1278,6 +1279,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
/* declarationPosition */ true,
);
case tt._class:
// While this is also set by tsParseExpressionStatement, we need to set it
// before parsing the class declaration to now how to register it in the scope.
nany.declare = true;
return this.parseClass(
nany,
/* isStatement */ true,
@@ -1552,7 +1556,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
checkFunctionStatementId(node: N.Function): void {
if (!node.body && node.id) {
this.checkLVal(node.id, BIND_TS_FN_TYPE, null, "function name");
this.checkLVal(node.id, BIND_TS_AMBIENT, null, "function name");
} else {
super.checkFunctionStatementId(...arguments);
}
@@ -1988,7 +1992,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return;
}
super.parseClassId(...arguments);
super.parseClassId(
node,
isStatement,
optionalId,
(node: any).declare ? BIND_TS_AMBIENT : BIND_CLASS,
);
const typeParameters = this.tsTryParseTypeParameters();
if (typeParameters) node.typeParameters = typeParameters;
}

View File

@@ -25,7 +25,7 @@ class TypeScriptScope extends Scope {
// classes (which are also in .lexical) and interface (which are also in .types)
classes: string[] = [];
// namespaces and bodyless-functions are too difficult to track,
// namespaces and ambient functions (or classes) are too difficult to track,
// especially without type analysis.
// We need to track them anyway, to avoid "X is not defined" errors
// when exporting them.