fix(migrations): do not incorrectly add todo for @Injectable or @Pipe #37732

devversion · 2020-06-25T11:32:46Z

As of v10, the undecorated-classes-with-decorated-fields migration
generally deals with undecorated classes using Angular features. We
intended to run this migation as part of v10 again as undecorated
classes with Angular features are no longer supported in planned v11.

The migration currently behaves incorrectly in some cases where an
@Injectable or @Pipe decorated classes uses the ngOnDestroy
lifecycle hook. We incorrectly add a TODO for those classes. This
commit fixes that.

Additionally, this change makes the migration more robust to
not migrate a class if it inherits from a component, pipe
injectable or non-abstract directive. We previously did not
need this as the undecorated-classes-with-di migration ran
before, but this is no longer the case.

Last, this commit fixes an issue where multiple TODO's could be
added. This happens when multiple Angular CLI build targets have
an overlap in source files. Multiple programs then capture the
same source file, causing the migration to detect an undecorated
class multiple times (i.e. adding a TODO twice).

Fixes #37726.

crisbeto

LGTM, aside from one comment.

packages/core/schematics/test/helpers.ts

mhevery

LGTM for integration/**
CLENUP:

Please add comment explaining the tests. Not obvious that no comment is what we are asserting.

mhevery

Reviewed-for: integration-test
CLEANUP:

Please add comment explaining the tests. Not obvious that no comment is what we are asserting.

@Injectable


        fix(migrations): do not incorrectly add todo for @Injectable or @pipe

As of v10, the `undecorated-classes-with-decorated-fields` migration generally deals with undecorated classes using Angular features. We intended to run this migation as part of v10 again as undecorated classes with Angular features are no longer supported in planned v11. The migration currently behaves incorrectly in some cases where an `@Injectable` or `@Pipe` decorated classes uses the `ngOnDestroy` lifecycle hook. We incorrectly add a TODO for those classes. This commit fixes that. Additionally, this change makes the migration more robust to not migrate a class if it inherits from a component, pipe injectable or non-abstract directive. We previously did not need this as the undecorated-classes-with-di migration ran before, but this is no longer the case. Last, this commit fixes an issue where multiple TODO's could be added. This happens when multiple Angular CLI build targets have an overlap in source files. Multiple programs then capture the same source file, causing the migration to detect an undecorated class multiple times (i.e. adding a TODO twice). Fixes #37726.

@Injectable


        fixup! fix(migrations): do not incorrectly add todo for @Injectable or …

…@pipe Fix regular expression for omitting empty line whitespace in tests

@Injectable


        fixup! fix(migrations): do not incorrectly add todo for @Injectable or …

…@pipe Add comment to integration test for clarity

mhevery

Reviewed-for: integration-tests

mhevery · 2020-06-25T19:14:52Z

presubmit

AndrewKushnir · 2020-06-25T21:18:56Z

FYI, presubmit looks good (only unrelated failures), so I'm forcing "green" g3 status. Thank you.

@Injectable


        fix(migrations): do not incorrectly add todo for @Injectable or @pipe (…

…#37732) As of v10, the `undecorated-classes-with-decorated-fields` migration generally deals with undecorated classes using Angular features. We intended to run this migation as part of v10 again as undecorated classes with Angular features are no longer supported in planned v11. The migration currently behaves incorrectly in some cases where an `@Injectable` or `@Pipe` decorated classes uses the `ngOnDestroy` lifecycle hook. We incorrectly add a TODO for those classes. This commit fixes that. Additionally, this change makes the migration more robust to not migrate a class if it inherits from a component, pipe injectable or non-abstract directive. We previously did not need this as the undecorated-classes-with-di migration ran before, but this is no longer the case. Last, this commit fixes an issue where multiple TODO's could be added. This happens when multiple Angular CLI build targets have an overlap in source files. Multiple programs then capture the same source file, causing the migration to detect an undecorated class multiple times (i.e. adding a TODO twice). Fixes #37726. PR Close #37732

@Injectable


        fix(migrations): do not incorrectly add todo for @Injectable or @pipe (…

…angular#37732) As of v10, the `undecorated-classes-with-decorated-fields` migration generally deals with undecorated classes using Angular features. We intended to run this migation as part of v10 again as undecorated classes with Angular features are no longer supported in planned v11. The migration currently behaves incorrectly in some cases where an `@Injectable` or `@Pipe` decorated classes uses the `ngOnDestroy` lifecycle hook. We incorrectly add a TODO for those classes. This commit fixes that. Additionally, this change makes the migration more robust to not migrate a class if it inherits from a component, pipe injectable or non-abstract directive. We previously did not need this as the undecorated-classes-with-di migration ran before, but this is no longer the case. Last, this commit fixes an issue where multiple TODO's could be added. This happens when multiple Angular CLI build targets have an overlap in source files. Multiple programs then capture the same source file, causing the migration to detect an undecorated class multiple times (i.e. adding a TODO twice). Fixes angular#37726. PR Close angular#37732

googlebot added the cla: yes label Jun 25, 2020

devversion requested a review from crisbeto Jun 25, 2020

devversion added comp: migrations PR action: review PR target: master & patch labels Jun 25, 2020

ngbot bot modified the milestone: needsTriage Jun 25, 2020

devversion force-pushed the devversion:fix/undecorated-classes-features-migration-incorrectly-adding-todo branch 2 times, most recently from 93d5b19 to 9d234eb Jun 25, 2020

devversion marked this pull request as ready for review Jun 25, 2020

pullapprove bot requested a review from mhevery Jun 25, 2020

crisbeto approved these changes Jun 25, 2020

View changes

packages/core/schematics/test/helpers.ts Outdated Show resolved Hide resolved

mhevery reviewed Jun 25, 2020

View changes

mhevery added the PR action: cleanup label Jun 25, 2020

mhevery approved these changes Jun 25, 2020

View changes

devversion added 3 commits Jun 25, 2020

fixup! fix(migrations): do not incorrectly add todo for @Injectable or …

Loading status checks…

cb69eba

…@pipe Fix regular expression for omitting empty line whitespace in tests

fixup! fix(migrations): do not incorrectly add todo for @Injectable or …

Loading status checks…

73b9455

…@pipe Add comment to integration test for clarity

devversion force-pushed the devversion:fix/undecorated-classes-features-migration-incorrectly-adding-todo branch from 179826c to 73b9455 Jun 25, 2020

devversion removed the PR action: cleanup label Jun 25, 2020

mhevery approved these changes Jun 25, 2020

View changes

devversion added PR action: merge and removed PR action: review labels Jun 25, 2020

AndrewKushnir closed this in d12cdb5 Jun 25, 2020

angular / angular

fix(migrations): do not incorrectly add todo for @Injectable or @Pipe #37732

fix(migrations): do not incorrectly add todo for @Injectable or @Pipe #37732

devversion commented Jun 25, 2020 •

edited

crisbeto left a comment

mhevery left a comment •

edited by devversion

mhevery left a comment •

edited by devversion

mhevery left a comment

mhevery commented Jun 25, 2020

AndrewKushnir commented Jun 25, 2020

angular / angular

Join GitHub today

fix(migrations): do not incorrectly add todo for @Injectable or @Pipe #37732

fix(migrations): do not incorrectly add todo for @Injectable or @Pipe #37732

Conversation

devversion commented Jun 25, 2020 • edited

crisbeto left a comment

mhevery left a comment • edited by devversion

mhevery left a comment • edited by devversion

mhevery left a comment

mhevery commented Jun 25, 2020

AndrewKushnir commented Jun 25, 2020

devversion commented Jun 25, 2020 •

edited

mhevery left a comment •

edited by devversion

mhevery left a comment •

edited by devversion