Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forbid accessing block-scoped variables on globalThis #30510

Merged
merged 9 commits into from
Mar 25, 2019
Merged

Forbid accessing block-scoped variables on globalThis #30510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fac119
Forbid accessing const & let on globalThis
sandersn Mar 20, 2019
b2efd22
Disallow access of blockscoped vars on globalThis
sandersn Mar 20, 2019
4e0533a
Update baselines after lib.d.ts change
sandersn Mar 20, 2019
0404d65
Remove blockscoped vars from typeof globalThis
sandersn Mar 23, 2019
9a3881e
Update baselines
sandersn Mar 23, 2019
31e36a3
Better error for block-scoped usage on globalThis
sandersn Mar 24, 2019
7c76ced
Update fourslash tests
sandersn Mar 24, 2019
0d165f5
Fix semi-colon lint
sandersn Mar 24, 2019
18e8403
Don't copy so much when filtering blockscoped vars
sandersn Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7123,6 +7123,15 @@ namespace ts {
let stringIndexInfo: IndexInfo | undefined;
if (symbol.exports) {
members = getExportsOfSymbol(symbol);
if (symbol === globalThisSymbol) {
const varsOnly = createMap<Symbol>() as SymbolTable;
members.forEach(p => {
if (!(p.flags & SymbolFlags.BlockScoped)) {
varsOnly.set(p.escapedName, p);
}
});
members = varsOnly;
}
}
setStructuredTypeMembers(type, members, emptyArray, emptyArray, undefined, undefined);
if (symbol.flags & SymbolFlags.Class) {
Expand Down Expand Up @@ -9880,6 +9889,7 @@ namespace ts {
getNodeLinks(accessNode!).resolvedSymbol = prop;
}
}

const propType = getTypeOfSymbol(prop);
return accessExpression && getAssignmentTargetKind(accessExpression) !== AssignmentKind.Definite ?
getFlowTypeOfReference(accessExpression, propType) :
Expand Down Expand Up @@ -9923,7 +9933,10 @@ namespace ts {
return anyType;
}
if (accessExpression && !isConstEnumObjectType(objectType)) {
if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports!.has(propName) && (globalThisSymbol.exports!.get(propName)!.flags & SymbolFlags.BlockScoped)) {
error(accessExpression, Diagnostics.Property_0_does_not_exist_on_type_1, unescapeLeadingUnderscores(propName), typeToString(objectType));
}
else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
error(accessExpression, Diagnostics.Property_0_is_a_static_member_of_type_1, propName as string, typeToString(objectType));
}
Expand Down Expand Up @@ -19518,7 +19531,10 @@ namespace ts {
return anyType;
}
if (leftType.symbol === globalThisSymbol) {
if (noImplicitAny) {
if (globalThisSymbol.exports!.has(right.escapedText) && (globalThisSymbol.exports!.get(right.escapedText)!.flags & SymbolFlags.BlockScoped)) {
error(right, Diagnostics.Property_0_does_not_exist_on_type_1, unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
}
else if (noImplicitAny) {
error(right, Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
}
return anyType;
Expand Down
118 changes: 59 additions & 59 deletions src/harness/fourslash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4425,7 +4425,7 @@ namespace FourSlashInterface {
}
export namespace Completion {
const functionEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "function", kindModifiers: "declare" });
const constEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "const", kindModifiers: "declare" });
const varEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "var", kindModifiers: "declare" });
const moduleEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "module", kindModifiers: "declare" });
const keywordEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "keyword" });
const methodEntry = (name: string): ExpectedCompletionEntryObject => ({ name, kind: "method", kindModifiers: "declare" });
Expand All @@ -4448,48 +4448,48 @@ namespace FourSlashInterface {
typeEntry("PropertyKey"),
interfaceEntry("PropertyDescriptor"),
interfaceEntry("PropertyDescriptorMap"),
constEntry("Object"),
varEntry("Object"),
interfaceEntry("ObjectConstructor"),
constEntry("Function"),
varEntry("Function"),
interfaceEntry("FunctionConstructor"),
typeEntry("ThisParameterType"),
typeEntry("OmitThisParameter"),
interfaceEntry("CallableFunction"),
interfaceEntry("NewableFunction"),
interfaceEntry("IArguments"),
constEntry("String"),
varEntry("String"),
interfaceEntry("StringConstructor"),
constEntry("Boolean"),
varEntry("Boolean"),
interfaceEntry("BooleanConstructor"),
constEntry("Number"),
varEntry("Number"),
interfaceEntry("NumberConstructor"),
interfaceEntry("TemplateStringsArray"),
interfaceEntry("ImportMeta"),
constEntry("Math"),
constEntry("Date"),
varEntry("Math"),
varEntry("Date"),
interfaceEntry("DateConstructor"),
interfaceEntry("RegExpMatchArray"),
interfaceEntry("RegExpExecArray"),
constEntry("RegExp"),
varEntry("RegExp"),
interfaceEntry("RegExpConstructor"),
constEntry("Error"),
varEntry("Error"),
interfaceEntry("ErrorConstructor"),
constEntry("EvalError"),
varEntry("EvalError"),
interfaceEntry("EvalErrorConstructor"),
constEntry("RangeError"),
varEntry("RangeError"),
interfaceEntry("RangeErrorConstructor"),
constEntry("ReferenceError"),
varEntry("ReferenceError"),
interfaceEntry("ReferenceErrorConstructor"),
constEntry("SyntaxError"),
varEntry("SyntaxError"),
interfaceEntry("SyntaxErrorConstructor"),
constEntry("TypeError"),
varEntry("TypeError"),
interfaceEntry("TypeErrorConstructor"),
constEntry("URIError"),
varEntry("URIError"),
interfaceEntry("URIErrorConstructor"),
constEntry("JSON"),
varEntry("JSON"),
interfaceEntry("ReadonlyArray"),
interfaceEntry("ConcatArray"),
constEntry("Array"),
varEntry("Array"),
interfaceEntry("ArrayConstructor"),
interfaceEntry("TypedPropertyDescriptor"),
typeEntry("ClassDecorator"),
Expand All @@ -4513,30 +4513,30 @@ namespace FourSlashInterface {
typeEntry("ReturnType"),
typeEntry("InstanceType"),
interfaceEntry("ThisType"),
constEntry("ArrayBuffer"),
varEntry("ArrayBuffer"),
interfaceEntry("ArrayBufferTypes"),
typeEntry("ArrayBufferLike"),
interfaceEntry("ArrayBufferConstructor"),
interfaceEntry("ArrayBufferView"),
constEntry("DataView"),
varEntry("DataView"),
interfaceEntry("DataViewConstructor"),
constEntry("Int8Array"),
varEntry("Int8Array"),
interfaceEntry("Int8ArrayConstructor"),
constEntry("Uint8Array"),
varEntry("Uint8Array"),
interfaceEntry("Uint8ArrayConstructor"),
constEntry("Uint8ClampedArray"),
varEntry("Uint8ClampedArray"),
interfaceEntry("Uint8ClampedArrayConstructor"),
constEntry("Int16Array"),
varEntry("Int16Array"),
interfaceEntry("Int16ArrayConstructor"),
constEntry("Uint16Array"),
varEntry("Uint16Array"),
interfaceEntry("Uint16ArrayConstructor"),
constEntry("Int32Array"),
varEntry("Int32Array"),
interfaceEntry("Int32ArrayConstructor"),
constEntry("Uint32Array"),
varEntry("Uint32Array"),
interfaceEntry("Uint32ArrayConstructor"),
constEntry("Float32Array"),
varEntry("Float32Array"),
interfaceEntry("Float32ArrayConstructor"),
constEntry("Float64Array"),
varEntry("Float64Array"),
interfaceEntry("Float64ArrayConstructor"),
moduleEntry("Intl"),
];
Expand Down Expand Up @@ -4744,36 +4744,36 @@ namespace FourSlashInterface {
functionEntry("encodeURIComponent"),
functionEntry("escape"),
functionEntry("unescape"),
constEntry("NaN"),
constEntry("Infinity"),
constEntry("Object"),
constEntry("Function"),
constEntry("String"),
constEntry("Boolean"),
constEntry("Number"),
constEntry("Math"),
constEntry("Date"),
constEntry("RegExp"),
constEntry("Error"),
constEntry("EvalError"),
constEntry("RangeError"),
constEntry("ReferenceError"),
constEntry("SyntaxError"),
constEntry("TypeError"),
constEntry("URIError"),
constEntry("JSON"),
constEntry("Array"),
constEntry("ArrayBuffer"),
constEntry("DataView"),
constEntry("Int8Array"),
constEntry("Uint8Array"),
constEntry("Uint8ClampedArray"),
constEntry("Int16Array"),
constEntry("Uint16Array"),
constEntry("Int32Array"),
constEntry("Uint32Array"),
constEntry("Float32Array"),
constEntry("Float64Array"),
varEntry("NaN"),
varEntry("Infinity"),
varEntry("Object"),
varEntry("Function"),
varEntry("String"),
varEntry("Boolean"),
varEntry("Number"),
varEntry("Math"),
varEntry("Date"),
varEntry("RegExp"),
varEntry("Error"),
varEntry("EvalError"),
varEntry("RangeError"),
varEntry("ReferenceError"),
varEntry("SyntaxError"),
varEntry("TypeError"),
varEntry("URIError"),
varEntry("JSON"),
varEntry("Array"),
varEntry("ArrayBuffer"),
varEntry("DataView"),
varEntry("Int8Array"),
varEntry("Uint8Array"),
varEntry("Uint8ClampedArray"),
varEntry("Int16Array"),
varEntry("Uint16Array"),
varEntry("Int32Array"),
varEntry("Uint32Array"),
varEntry("Float32Array"),
varEntry("Float64Array"),
moduleEntry("Intl"),
];

Expand Down
Loading