Skip to content

Adds support for looking up past Blocks in expando objects #38031

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 3 commits into from
Apr 29, 2020
Merged

Adds support for looking up past Blocks in expando objects #38031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
277947c
Adds support for looking up past Blocks in expando objects
orta Apr 17, 2020
ee1ae84
Adds JS tests to validate the JS parsing also works
orta Apr 22, 2020
1c9ca2d
Get the top level block expando tests green
orta Apr 24, 2020
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
4 changes: 2 additions & 2 deletions src/compiler/binder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2974,7 +2974,7 @@ namespace ts {

function bindSpecialPropertyAssignment(node: BindablePropertyAssignmentExpression) {
// Class declarations in Typescript do not allow property declarations
const parentSymbol = lookupSymbolForPropertyAccess(node.left.expression);
const parentSymbol = lookupSymbolForPropertyAccess(node.left.expression, container) || lookupSymbolForPropertyAccess(node.left.expression, blockScopeContainer) ;
if (!isInJSFile(node) && !isFunctionSymbol(parentSymbol)) {
return;
}
Expand Down Expand Up @@ -3083,7 +3083,7 @@ namespace ts {
}

function bindPropertyAssignment(name: BindableStaticNameExpression, propertyAccess: BindableStaticAccessExpression, isPrototypeProperty: boolean, containerIsClass: boolean) {
let namespaceSymbol = lookupSymbolForPropertyAccess(name);
let namespaceSymbol = lookupSymbolForPropertyAccess(name, container) || lookupSymbolForPropertyAccess(name, blockScopeContainer);
const isToplevel = isTopLevelNamespaceAssignment(propertyAccess);
namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty, containerIsClass);
bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ namespace ts {

/**
* Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getExpandoInitializer).
* We treat the right hand side of assignments with container-like initalizers as declarations.
* We treat the right hand side of assignments with container-like initializers as declarations.
*/
export function getAssignedExpandoInitializer(node: Node | undefined): Expression | undefined {
if (node && node.parent && isBinaryExpression(node.parent) && node.parent.operatorToken.kind === SyntaxKind.EqualsToken) {
Expand Down
100 changes: 100 additions & 0 deletions tests/baselines/reference/topLevelBlockExpando.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
=== tests/cases/compiler/check.ts ===
// https://github.com/microsoft/TypeScript/issues/31972



// https://github.com/microsoft/TypeScript/issues/31972
interface Person {
>Person : Symbol(Person, Decl(check.ts, 0, 0))

first: string;
>first : Symbol(Person.first, Decl(check.ts, 5, 18))

last: string;
>last : Symbol(Person.last, Decl(check.ts, 6, 16))
}

{
const dice = () => Math.floor(Math.random() * 6);
>dice : Symbol(dice, Decl(check.ts, 11, 7))
>Math.floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))

dice.first = 'Rando';
>dice.first : Symbol(dice.first, Decl(check.ts, 11, 51))
>dice : Symbol(dice, Decl(check.ts, 11, 7))
>first : Symbol(dice.first, Decl(check.ts, 11, 51))

dice.last = 'Calrissian';
>dice.last : Symbol(dice.last, Decl(check.ts, 12, 23))
>dice : Symbol(dice, Decl(check.ts, 11, 7))
>last : Symbol(dice.last, Decl(check.ts, 12, 23))

const diceP: Person = dice;
>diceP : Symbol(diceP, Decl(check.ts, 14, 7))
>Person : Symbol(Person, Decl(check.ts, 0, 0))
>dice : Symbol(dice, Decl(check.ts, 11, 7))
}

=== tests/cases/compiler/check.js ===
// Creates a type { first:string, last: string }
/**
* @typedef {Object} Human - creates a new type named 'SpecialType'
* @property {string} first - a string property of SpecialType
* @property {string} last - a number property of SpecialType
*/

/**
* @param {Human} param used as a validation tool
*/
function doHumanThings(param) {}
>doHumanThings : Symbol(doHumanThings, Decl(check.js, 0, 0))
>param : Symbol(param, Decl(check.js, 10, 23))

const dice1 = () => Math.floor(Math.random() * 6);
>dice1 : Symbol(dice1, Decl(check.js, 12, 5), Decl(check.js, 12, 50))
>Math.floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))

// dice1.first = 'Rando';
dice1.last = 'Calrissian';
>dice1.last : Symbol(dice1.last, Decl(check.js, 12, 50))
>dice1 : Symbol(dice1, Decl(check.js, 12, 5), Decl(check.js, 12, 50))
>last : Symbol(dice1.last, Decl(check.js, 12, 50))

// doHumanThings(dice)

// but inside a block... you can't call a human
{
const dice2 = () => Math.floor(Math.random() * 6);
>dice2 : Symbol(dice2, Decl(check.js, 20, 7))
>Math.floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>floor : Symbol(Math.floor, Decl(lib.es5.d.ts, --, --))
>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))

dice2.first = 'Rando';
>dice2.first : Symbol(dice2.first, Decl(check.js, 20, 52))
>dice2 : Symbol(dice2, Decl(check.js, 20, 7))
>first : Symbol(dice2.first, Decl(check.js, 20, 52))

dice2.last = 'Calrissian';
>dice2.last : Symbol(dice2.last, Decl(check.js, 21, 24))
>dice2 : Symbol(dice2, Decl(check.js, 20, 7))
>last : Symbol(dice2.last, Decl(check.js, 21, 24))

doHumanThings(dice2)
>doHumanThings : Symbol(doHumanThings, Decl(check.js, 0, 0))
>dice2 : Symbol(dice2, Decl(check.js, 20, 7))
}

123 changes: 123 additions & 0 deletions tests/baselines/reference/topLevelBlockExpando.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
=== tests/cases/compiler/check.ts ===
// https://github.com/microsoft/TypeScript/issues/31972



// https://github.com/microsoft/TypeScript/issues/31972
interface Person {
first: string;
>first : string

last: string;
>last : string
}

{
const dice = () => Math.floor(Math.random() * 6);
>dice : { (): number; first: string; last: string; }
>() => Math.floor(Math.random() * 6) : { (): number; first: string; last: string; }
>Math.floor(Math.random() * 6) : number
>Math.floor : (x: number) => number
>Math : Math
>floor : (x: number) => number
>Math.random() * 6 : number
>Math.random() : number
>Math.random : () => number
>Math : Math
>random : () => number
>6 : 6

dice.first = 'Rando';
>dice.first = 'Rando' : "Rando"
>dice.first : string
>dice : { (): number; first: string; last: string; }
>first : string
>'Rando' : "Rando"

dice.last = 'Calrissian';
>dice.last = 'Calrissian' : "Calrissian"
>dice.last : string
>dice : { (): number; first: string; last: string; }
>last : string
>'Calrissian' : "Calrissian"

const diceP: Person = dice;
>diceP : Person
>dice : { (): number; first: string; last: string; }
}

=== tests/cases/compiler/check.js ===
// Creates a type { first:string, last: string }
/**
* @typedef {Object} Human - creates a new type named 'SpecialType'
* @property {string} first - a string property of SpecialType
* @property {string} last - a number property of SpecialType
*/

/**
* @param {Human} param used as a validation tool
*/
function doHumanThings(param) {}
>doHumanThings : (param: Human) => void
>param : Human

const dice1 = () => Math.floor(Math.random() * 6);
>dice1 : { (): number; last: string; }
>() => Math.floor(Math.random() * 6) : { (): number; last: string; }
>Math.floor(Math.random() * 6) : number
>Math.floor : (x: number) => number
>Math : Math
>floor : (x: number) => number
>Math.random() * 6 : number
>Math.random() : number
>Math.random : () => number
>Math : Math
>random : () => number
>6 : 6

// dice1.first = 'Rando';
dice1.last = 'Calrissian';
>dice1.last = 'Calrissian' : "Calrissian"
>dice1.last : string
>dice1 : { (): number; last: string; }
>last : string
>'Calrissian' : "Calrissian"

// doHumanThings(dice)

// but inside a block... you can't call a human
{
const dice2 = () => Math.floor(Math.random() * 6);
>dice2 : { (): number; first: string; last: string; }
>() => Math.floor(Math.random() * 6) : { (): number; first: string; last: string; }
>Math.floor(Math.random() * 6) : number
>Math.floor : (x: number) => number
>Math : Math
>floor : (x: number) => number
>Math.random() * 6 : number
>Math.random() : number
>Math.random : () => number
>Math : Math
>random : () => number
>6 : 6

dice2.first = 'Rando';
>dice2.first = 'Rando' : "Rando"
>dice2.first : string
>dice2 : { (): number; first: string; last: string; }
>first : string
>'Rando' : "Rando"

dice2.last = 'Calrissian';
>dice2.last = 'Calrissian' : "Calrissian"
>dice2.last : string
>dice2 : { (): number; first: string; last: string; }
>last : string
>'Calrissian' : "Calrissian"

doHumanThings(dice2)
>doHumanThings(dice2) : void
>doHumanThings : (param: Human) => void
>dice2 : { (): number; first: string; last: string; }
}

49 changes: 49 additions & 0 deletions tests/cases/compiler/topLevelBlockExpando.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// https://github.com/microsoft/TypeScript/issues/31972

// @allowJs: true
// @noEmit: true
// @checkJs: true

// @filename: check.ts

// https://github.com/microsoft/TypeScript/issues/31972
interface Person {
first: string;
last: string;
}

{
const dice = () => Math.floor(Math.random() * 6);
dice.first = 'Rando';
dice.last = 'Calrissian';
const diceP: Person = dice;
}

// @filename: check.js

// Creates a type { first:string, last: string }
/**
* @typedef {Object} Human - creates a new type named 'SpecialType'
* @property {string} first - a string property of SpecialType
* @property {string} last - a number property of SpecialType
*/

/**
* @param {Human} param used as a validation tool
*/
function doHumanThings(param) {}

const dice1 = () => Math.floor(Math.random() * 6);
// dice1.first = 'Rando';
dice1.last = 'Calrissian';

// doHumanThings(dice)

// but inside a block... you can't call a human
{
const dice2 = () => Math.floor(Math.random() * 6);
dice2.first = 'Rando';
dice2.last = 'Calrissian';

doHumanThings(dice2)
}