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

Jump to bottom

fix(ivy): identify all ESM5 decorated classes #27848

Closed
wants to merge 1 commit into from
Closed

fix(ivy): identify all ESM5 decorated classes #27848

wants to merge 1 commit into from

Conversation

petebacondarwin
Copy link
Member

@petebacondarwin petebacondarwin commented Dec 27, 2018 •
edited
Loading

TODO:

  • Fix up the commit message.

Fixes #27841

@petebacondarwin petebacondarwin added type: bug/fix state: WIP effort1: hours freq2: medium area: core Issues related to the framework runtime target: major This PR is targeted for the next major release comp: ivy risk: low labels Dec 27, 2018
@ngbot ngbot bot added this to the Backlog milestone Dec 27, 2018
@mary-poppins
Copy link

You can preview 1598e41 at https://pr27848-1598e41.ngbuilds.io/.

@mary-poppins
Copy link

You can preview e87a297 at https://pr27848-e87a297.ngbuilds.io/.

@mary-poppins
Copy link

You can preview da9bacf at https://pr27848-da9bacf.ngbuilds.io/.

@petebacondarwin petebacondarwin changed the title fix(ivy): WIP fix(ivy): identify all ESM5 decorated classes Dec 29, 2018
@petebacondarwin petebacondarwin added action: review The PR is still awaiting reviews from at least one requested reviewer and removed state: WIP labels Dec 29, 2018
@mary-poppins
Copy link

You can preview 40f2886 at https://pr27848-40f2886.ngbuilds.io/.

@alexzuza alexzuza mentioned this pull request Jan 1, 2019
Closed
@alan-agius4
Copy link
Contributor

Can confirm that this fixes both #27841 and #27794

@alan-agius4 alan-agius4 mentioned this pull request Jan 8, 2019
Closed
@alan-agius4 alan-agius4 mentioned this pull request Jan 8, 2019
Merged
4 tasks
@alexzuza alexzuza mentioned this pull request Jan 11, 2019
Closed
JoostK
JoostK reviewed Jan 11, 2019
View reviewed changes
packages/compiler-cli/src/ngcc/src/host/esm2015_host.ts
@@ -662,8 +662,10 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
*/
protected getHelperCall(statement: ts.Statement, helperName: string): ts.CallExpression|null {
if (ts.isExpressionStatement(statement)) {
const expression =
isAssignmentStatement(statement) ? statement.expression.right : statement.expression;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isAssignmentStatement has now gone unused it seems.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is used in Esm5ReflectionHost.

@petebacondarwin
fix(ivy): ngcc - identify all ESM5 decorated classes
d09190a 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841
@petebacondarwin petebacondarwin requested review from a team as code owners January 11, 2019 15:23
@mary-poppins
Copy link

You can preview d09190a at https://pr27848-d09190a.ngbuilds.io/.

@petebacondarwin petebacondarwin added action: merge The PR is ready for merge by the caretaker and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Jan 11, 2019
@alan-agius4 alan-agius4 mentioned this pull request Jan 11, 2019
Closed
@petebacondarwin petebacondarwin deleted the ngcc-find-esm5-decorated-classes branch January 11, 2019 20:38
kyliau pushed a commit to kyliau/angular that referenced this pull request Jan 11, 2019
@petebacondarwin @kyliau
fix(ivy): ngcc - identify all ESM5 decorated classes (angular#27848)
ed7f737 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841

PR Close angular#27848
@alexzuza alexzuza mentioned this pull request Jan 13, 2019
Closed
petebacondarwin added a commit to petebacondarwin/angular that referenced this pull request Jan 14, 2019
@petebacondarwin
fix(ivy): ngcc - identify all ESM5 decorated classes (angular#27848)
b424439 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841

PR Close angular#27848
wKoza pushed a commit to wKoza/angular that referenced this pull request Jan 18, 2019
@petebacondarwin @wKoza
fix(ivy): ngcc - identify all ESM5 decorated classes (angular#27848)
13e1d40 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841

PR Close angular#27848
wKoza pushed a commit to wKoza/angular that referenced this pull request Jan 18, 2019
@petebacondarwin @wKoza
fix(ivy): ngcc - identify all ESM5 decorated classes (angular#27848)
c99e9f2 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841

PR Close angular#27848
@JoostK JoostK mentioned this pull request Jan 25, 2019
Closed
ngfelixl pushed a commit to ngfelixl/angular that referenced this pull request Jan 28, 2019
@petebacondarwin @ngfelixl
fix(ivy): ngcc - identify all ESM5 decorated classes (angular#27848)
47aea79 
In ESM5 decorated classes can be indicated by calls to `__decorate()`.
Previously the `ReflectionHost.findDecoratedClasses()` call would identify
helper calls of the form:

```
SomeClass = tslib_1.__decorate(...);
```

But it was missing calls of the form:

```
SomeClass = SomeClass_1 = tslib_1.__decorate(...);
```

This form is common in `@NgModule()` decorations, where the class
being decorated is referenced inside the decorator or another
member.

This commit now ensures that a chain of assignments, of any length,
is now identified as a class decoration if it results in a call to
`__decorate()`.

Fixes angular#27841

PR Close angular#27848
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 14, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@JoostK JoostK JoostK left review comments

@alxhub alxhub alxhub approved these changes

@alan-agius4 alan-agius4 alan-agius4 approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker area: core Issues related to the framework runtime cla: yes effort1: hours freq2: medium risk: low target: major This PR is targeted for the next major release type: bug/fix
Projects
None yet
Milestone
Backlog
Development

Successfully merging this pull request may close these issues.

ngcc not running on all files (ESM5)
6 participants
@petebacondarwin @mary-poppins @alan-agius4 @JoostK @alxhub @googlebot