Skip to content

Fix crash with Object.defineProperty for imported alias (--allowJs) #35198

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

Merged
merged 1 commit into from
Nov 20, 2019
Merged

Fix crash with Object.defineProperty for imported alias (--allowJs) #35198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/compiler/binder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,7 +2752,7 @@ namespace ts {

function bindObjectDefinePrototypeProperty(node: BindableObjectDefinePropertyCall) {
const namespaceSymbol = lookupSymbolForPropertyAccess((node.arguments[0] as PropertyAccessExpression).expression as EntityNameExpression);
if (namespaceSymbol) {
if (namespaceSymbol && namespaceSymbol.valueDeclaration) {
// Ensure the namespace symbol becomes class-like
addDeclarationToSymbol(namespaceSymbol, namespaceSymbol.valueDeclaration, SymbolFlags.Class);
}
Expand Down
11 changes: 8 additions & 3 deletions tests/baselines/reference/importAliasModuleExports.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
tests/cases/conformance/salsa/main.js(2,13): error TS2339: Property 'foo' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(3,13): error TS2339: Property 'func' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(3,38): error TS2339: Property '_func' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(5,9): error TS2339: Property 'foo' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(6,9): error TS2339: Property 'func' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(6,9): error TS2339: Property 'foo' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(7,9): error TS2339: Property 'func' does not exist on type 'Alias'.
tests/cases/conformance/salsa/main.js(8,9): error TS2339: Property 'def' does not exist on type 'Alias'.


==== tests/cases/conformance/salsa/mod1.js (0 errors) ====
Expand All @@ -11,7 +12,7 @@ tests/cases/conformance/salsa/main.js(6,9): error TS2339: Property 'func' does n
}
module.exports = Alias;

==== tests/cases/conformance/salsa/main.js (5 errors) ====
==== tests/cases/conformance/salsa/main.js (6 errors) ====
import A from './mod1'
A.prototype.foo = 0
~~~
Expand All @@ -21,11 +22,15 @@ tests/cases/conformance/salsa/main.js(6,9): error TS2339: Property 'func' does n
!!! error TS2339: Property 'func' does not exist on type 'Alias'.
~~~~~
!!! error TS2339: Property '_func' does not exist on type 'Alias'.
Object.defineProperty(A.prototype, "def", { value: 0 });
new A().bar
new A().foo
~~~
!!! error TS2339: Property 'foo' does not exist on type 'Alias'.
new A().func()
~~~~
!!! error TS2339: Property 'func' does not exist on type 'Alias'.
new A().def
~~~
!!! error TS2339: Property 'def' does not exist on type 'Alias'.

12 changes: 12 additions & 0 deletions tests/baselines/reference/importAliasModuleExports.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ A.prototype.func = function() { this._func = 0; }
>prototype : Symbol(A.prototype)
>this : Symbol(A, Decl(mod1.js, 0, 0))

Object.defineProperty(A.prototype, "def", { value: 0 });
>Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
>A.prototype : Symbol(A.prototype)
>A : Symbol(A, Decl(main.js, 0, 6))
>prototype : Symbol(A.prototype)
>value : Symbol(value, Decl(main.js, 3, 43))

new A().bar
>new A().bar : Symbol(A.bar, Decl(mod1.js, 0, 13))
>A : Symbol(A, Decl(main.js, 0, 6))
Expand All @@ -37,3 +46,6 @@ new A().foo
new A().func()
>A : Symbol(A, Decl(main.js, 0, 6))

new A().def
>A : Symbol(A, Decl(main.js, 0, 6))

19 changes: 19 additions & 0 deletions tests/baselines/reference/importAliasModuleExports.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ A.prototype.func = function() { this._func = 0; }
>_func : any
>0 : 0

Object.defineProperty(A.prototype, "def", { value: 0 });
>Object.defineProperty(A.prototype, "def", { value: 0 }) : any
>Object.defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
>Object : ObjectConstructor
>defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
>A.prototype : A
>A : typeof A
>prototype : A
>"def" : "def"
>{ value: 0 } : { value: number; }
>value : number
>0 : 0

new A().bar
>new A().bar : () => number
>new A() : A
Expand All @@ -59,3 +72,9 @@ new A().func()
>A : typeof A
>func : any

new A().def
>new A().def : any
>new A() : A
>A : typeof A
>def : any

2 changes: 2 additions & 0 deletions tests/cases/conformance/salsa/importAliasModuleExports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module.exports = Alias;
import A from './mod1'
A.prototype.foo = 0
A.prototype.func = function() { this._func = 0; }
Object.defineProperty(A.prototype, "def", { value: 0 });
new A().bar
new A().foo
new A().func()
new A().def