From 12cd15c8677d2cb5cc9bf0ffdb7461ca1335d983 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 28 Apr 2020 10:42:24 -0700
Subject: [PATCH] this: undefined in modules (#37784)
It's always supposed to have been this way, but I was worried about how
breaky the change would be when adding globalThisType. This PR is
experiment to see how much.
Fixes #35882 maybe
---
src/compiler/checker.ts | 4 ++
...sxFactoryDeclarationsLocalTypes.errors.txt | 8 +++-
...neJsxFactoryDeclarationsLocalTypes.symbols | 1 -
...lineJsxFactoryDeclarationsLocalTypes.types | 2 +-
...InInvalidContextsExternalModule.errors.txt | 4 +-
...hisInInvalidContextsExternalModule.symbols | 1 -
.../thisInInvalidContextsExternalModule.types | 2 +-
.../reference/topLevelLambda4.errors.txt | 7 ++++
.../reference/topLevelLambda4.symbols | 3 --
.../baselines/reference/topLevelLambda4.types | 10 ++---
.../tsxAttributeResolution15.errors.txt | 6 +--
.../tsxAttributeResolution15.symbols | 1 -
.../reference/tsxAttributeResolution15.types | 2 +-
.../tsxSpreadAttributesResolution4.errors.txt | 40 +++++++++++++++++++
.../tsxSpreadAttributesResolution4.symbols | 1 -
.../tsxSpreadAttributesResolution4.types | 2 +-
16 files changed, 72 insertions(+), 22 deletions(-)
create mode 100644 tests/baselines/reference/topLevelLambda4.errors.txt
create mode 100644 tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 93276c42cb3..b0527ec70b2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21660,6 +21660,10 @@ namespace ts {
const fileSymbol = getSymbolOfNode(container);
return fileSymbol && getTypeOfSymbol(fileSymbol);
}
+ else if (container.externalModuleIndicator) {
+ // TODO: Maybe issue a better error than 'object is possibly undefined'
+ return undefinedType;
+ }
else if (includeGlobalThis) {
return getTypeOfSymbol(globalThisSymbol);
}
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
index a2d542ffb69..caced97b3e8 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt
@@ -1,3 +1,5 @@
+tests/cases/conformance/jsx/inline/component.tsx(4,136): error TS2609: JSX spread child must be an array type.
+tests/cases/conformance/jsx/inline/component.tsx(4,140): error TS2532: Object is possibly 'undefined'.
tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2741: Property '__predomBrand' is missing in type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' but required in type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
tests/cases/conformance/jsx/inline/index.tsx(21,22): error TS2786: 'MySFC' cannot be used as a JSX component.
Its return type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not a valid JSX element.
@@ -53,11 +55,15 @@ tests/cases/conformance/jsx/inline/index.tsx(24,48): error TS2322: Type 'import(
}
}
export function predom(): predom.JSX.Element;
-==== tests/cases/conformance/jsx/inline/component.tsx (0 errors) ====
+==== tests/cases/conformance/jsx/inline/component.tsx (2 errors) ====
/** @jsx predom */
import { predom } from "./renderer2"
export const MySFC = (props: {x: number, y: number, children?: predom.JSX.Element[]}) => {props.x} + {props.y} = {props.x + props.y}{...this.props.children}
;
+ ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2609: JSX spread child must be an array type.
+ ~~~~
+!!! error TS2532: Object is possibly 'undefined'.
export class MyClass implements predom.JSX.Element {
__predomBrand!: void;
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
index c53ac6b1948..25af733e40f 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
@@ -127,7 +127,6 @@ export const MySFC = (props: {x: number, y: number, children?: predom.JSX.Elemen
>props.y : Symbol(y, Decl(component.tsx, 3, 40))
>props : Symbol(props, Decl(component.tsx, 3, 22))
>y : Symbol(y, Decl(component.tsx, 3, 40))
->this : Symbol(globalThis)
>p : Symbol(predom.JSX.IntrinsicElements, Decl(renderer2.d.ts, 1, 19))
export class MyClass implements predom.JSX.Element {
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
index c9f7d4c2d8d..38bcc1898eb 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
@@ -99,7 +99,7 @@ export const MySFC = (props: {x: number, y: number, children?: predom.JSX.Elemen
>y : number
>this.props.children : any
>this.props : any
->this : typeof globalThis
+>this : undefined
>props : any
>children : any
>p : any
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
index 4cfd109b00e..18f0e314a8a 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
@@ -3,7 +3,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS2507: Type 'typeof globalThis' is not a constructor function type.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS2507: Type 'undefined' is not a constructor function type.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
@@ -58,7 +58,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
class ErrClass3 extends this {
~~~~
-!!! error TS2507: Type 'typeof globalThis' is not a constructor function type.
+!!! error TS2507: Type 'undefined' is not a constructor function type.
}
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols b/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols
index ad52fbdabeb..9cf261fa672 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols
@@ -69,7 +69,6 @@ genericFunc(undefined); // Should be an error
class ErrClass3 extends this {
>ErrClass3 : Symbol(ErrClass3, Decl(thisInInvalidContextsExternalModule.ts, 35, 29))
->this : Symbol(globalThis)
}
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.types b/tests/baselines/reference/thisInInvalidContextsExternalModule.types
index e6ad34c9a20..cbd78a8bce4 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.types
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.types
@@ -72,7 +72,7 @@ genericFunc(undefined); // Should be an error
class ErrClass3 extends this {
>ErrClass3 : ErrClass3
->this : typeof globalThis
+>this : undefined
}
diff --git a/tests/baselines/reference/topLevelLambda4.errors.txt b/tests/baselines/reference/topLevelLambda4.errors.txt
new file mode 100644
index 00000000000..4d70a3ffdda
--- /dev/null
+++ b/tests/baselines/reference/topLevelLambda4.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/compiler/topLevelLambda4.ts(1,22): error TS2532: Object is possibly 'undefined'.
+
+
+==== tests/cases/compiler/topLevelLambda4.ts (1 errors) ====
+ export var x = () => this.window;
+ ~~~~
+!!! error TS2532: Object is possibly 'undefined'.
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelLambda4.symbols b/tests/baselines/reference/topLevelLambda4.symbols
index 202d1bf90d5..a4f403a762f 100644
--- a/tests/baselines/reference/topLevelLambda4.symbols
+++ b/tests/baselines/reference/topLevelLambda4.symbols
@@ -1,7 +1,4 @@
=== tests/cases/compiler/topLevelLambda4.ts ===
export var x = () => this.window;
>x : Symbol(x, Decl(topLevelLambda4.ts, 0, 10))
->this.window : Symbol(window, Decl(lib.dom.d.ts, --, --))
->this : Symbol(globalThis)
->window : Symbol(window, Decl(lib.dom.d.ts, --, --))
diff --git a/tests/baselines/reference/topLevelLambda4.types b/tests/baselines/reference/topLevelLambda4.types
index 78546a181d3..76f2da1e120 100644
--- a/tests/baselines/reference/topLevelLambda4.types
+++ b/tests/baselines/reference/topLevelLambda4.types
@@ -1,8 +1,8 @@
=== tests/cases/compiler/topLevelLambda4.ts ===
export var x = () => this.window;
->x : () => Window & typeof globalThis
->() => this.window : () => Window & typeof globalThis
->this.window : Window & typeof globalThis
->this : typeof globalThis
->window : Window & typeof globalThis
+>x : () => any
+>() => this.window : () => any
+>this.window : any
+>this : undefined
+>window : any
diff --git a/tests/baselines/reference/tsxAttributeResolution15.errors.txt b/tests/baselines/reference/tsxAttributeResolution15.errors.txt
index 7ec97ba4675..ad4cee701ec 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.errors.txt
+++ b/tests/baselines/reference/tsxAttributeResolution15.errors.txt
@@ -1,6 +1,6 @@
tests/cases/conformance/jsx/file.tsx(11,21): error TS2322: Type '{ prop1: string; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'.
Property 'prop1' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'.
-tests/cases/conformance/jsx/file.tsx(14,44): error TS7017: Element implicitly has an 'any' type because type 'typeof globalThis' has no index signature.
+tests/cases/conformance/jsx/file.tsx(14,39): error TS2532: Object is possibly 'undefined'.
==== tests/cases/conformance/jsx/file.tsx (2 errors) ====
@@ -21,6 +21,6 @@ tests/cases/conformance/jsx/file.tsx(14,44): error TS7017: Element implicitly ha
// OK
let b = { this.textInput = input; }} />
- ~~~~~~~~~
-!!! error TS7017: Element implicitly has an 'any' type because type 'typeof globalThis' has no index signature.
+ ~~~~
+!!! error TS2532: Object is possibly 'undefined'.
let c =
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution15.symbols b/tests/baselines/reference/tsxAttributeResolution15.symbols
index c366c93cef1..5c91d12a103 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution15.symbols
@@ -31,7 +31,6 @@ let b = { this.textInput = input; }} />
>BigGreeter : Symbol(BigGreeter, Decl(file.tsx, 0, 32))
>ref : Symbol(ref, Decl(file.tsx, 13, 19))
>input : Symbol(input, Decl(file.tsx, 13, 26))
->this : Symbol(globalThis)
>input : Symbol(input, Decl(file.tsx, 13, 26))
let c =
diff --git a/tests/baselines/reference/tsxAttributeResolution15.types b/tests/baselines/reference/tsxAttributeResolution15.types
index 469f146cc45..a80a613cf46 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.types
+++ b/tests/baselines/reference/tsxAttributeResolution15.types
@@ -37,7 +37,7 @@ let b = { this.textInput = input; }} />
>input : BigGreeter
>this.textInput = input : BigGreeter
>this.textInput : any
->this : typeof globalThis
+>this : undefined
>textInput : any
>input : BigGreeter
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt b/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
new file mode 100644
index 00000000000..d0540d88494
--- /dev/null
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/jsx/file.tsx(32,45): error TS2532: Object is possibly 'undefined'.
+
+
+==== tests/cases/conformance/jsx/file.tsx (1 errors) ====
+ import React = require('react');
+
+ interface PoisonedProp {
+ x: string;
+ y: 2;
+ }
+
+ class Poisoned extends React.Component {
+ render() {
+ return Hello
;
+ }
+ }
+
+ const obj: PoisonedProp = {
+ x: "hello world",
+ y: 2
+ };
+
+ // OK
+ let p = ;
+
+ class EmptyProp extends React.Component<{}, {}> {
+ render() {
+ return Default hi
;
+ }
+ }
+
+ // OK
+ let j: any;
+ let e1 = ;
+ let e2 =
+ let e3 = { this.textInput = input; } }} />
+ ~~~~
+!!! error TS2532: Object is possibly 'undefined'.
+ let e4 =
+ let e5 =
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
index cb357c8a20d..e599665b156 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
@@ -79,7 +79,6 @@ let e3 = { this.textInput = input; } }} />
>EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
>ref : Symbol(ref, Decl(file.tsx, 31, 25))
>input : Symbol(input, Decl(file.tsx, 31, 32))
->this : Symbol(globalThis)
>input : Symbol(input, Decl(file.tsx, 31, 32))
let e4 =
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index 82173c0df83..cb0e4bc8186 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -89,7 +89,7 @@ let e3 = { this.textInput = input; } }} />
>input : EmptyProp
>this.textInput = input : EmptyProp
>this.textInput : any
->this : typeof globalThis
+>this : undefined
>textInput : any
>input : EmptyProp