Introducing EnvInjector! #45626

alxhub · 2022-04-14T01:07:58Z

This PR includes a couple commits which introduce the new EnvInjector concept. EnvInjector is a generalized version of NgModuleRef which represents the "module injector" (now renamed to "environment injector"). It's one of the primitives needed to support upcoming standalone components APIs.

packages/core/src/render3/interfaces/definition.ts

AndrewKushnir

Looks great 👍 Just left a few minor comments (none of them are blockers, we can update things in followup PRs).

goldens/public-api/core/index.md

packages/compiler-cli/src/ngtsc/annotations/directive/src/handler.ts

AndrewKushnir · 2022-04-15T04:36:32Z

packages/core/src/di/r3_injector.ts

+ * created by the framework.
+ */


Suggested change

* created by the framework.

*/

* created by the framework.

*

* @publicApi

*/

packages/core/src/di/r3_injector.ts

atscott

reviewed-for: public-api

goldens/public-api/core/index.md

atscott

reviewed-for: size-tracking

dylhunn

reviewed-for: public-api, size-tracking

jessicajaniuk

LGTM 🍪

Just a few non-blocking comments.

goldens/public-api/core/index.md

packages/core/src/di/interface/defs.ts

packages/core/src/di/scope.ts

jessicajaniuk · 2022-04-15T21:39:29Z

packages/core/src/di/r3_injector.ts


    // Make sure the INJECTOR token provides this injector.
    this.records.set(INJECTOR, makeRecord(undefined, this));

+    // And `EnvironmentInjector` if the current injector is supposed to be env-scoped.
+    if (scopes.has('env')) {


Here's another instance of env. Is there any way to make these not magic strings?

They're sort of by definition magic strings, since they're typically generated by the compiler.

packages/core/src/di/r3_injector.ts

packages/core/src/render3/ng_module_ref.ts

jessicajaniuk

reviewed-for: public-api, size-tracking

Previously there was a test ordering issue with the application_module_spec tests where the value of `getLocaleId()` depended on the order in which tests ran. Specifically, `setLocaleId()` lower-cases the current locale ID, so the measured value in a test depended on whether a previous test had called `setLocaleId()` (the difference between 'en-US' and 'en-us').

This commit implements the `importProvidersFrom` function that allows extracting a list of `Provider`s from a list of NgModule types. The R3Injector which implements DI at the "module" level for Angular is refactored to use this functionality under the hood. This commit also implements `INJECTOR_INITIALIZER`, a DI multi-provider token which is used to run initialization logic when an injector is created.

pkozlowski-opensource · 2022-04-15T23:21:37Z

packages/core/src/render3/index.ts

@@ -138,7 +138,7 @@ export {CssSelectorList, ProjectionSlots} from './interfaces/projection';
 export {
  setClassMetadata,
 } from './metadata';
-export {NgModuleFactory, NgModuleRef} from './ng_module_ref';
+export {NgModuleFactory, NgModuleRef, createEnvironmentInjector} from './ng_module_ref';


nit: import without usage?

This is an export :)

OMG, tired brain :-)

This commit exposes a new `EnvironmentInjector` abstraction, which generalizes the "module injector" concept to injectors that are not based on NgModules. An EnvironmentInjector is a conceptual analogue of an `NgModuleRef` - it represents an injector on the former "module" DI hierarchy in Angular (now renamed to the "environment injector hierarchy"). Environment injectors are created via the `createEnvironmentInjector` function from a list of `Provider`s. For backwards compatibility with current code using `NgModuleRef`, `EnvironmentInjector`s are wrapped by an adapter `NgModuleRef` implementation, so injecting `NgModuleRef` always returns the latest `EnvironmentInjector`, even if that injector was not based on an NgModule. Conversely, NgModule-based `NgModuleRef`s created via `createNgModuleRef` are _also_ `EnvironmentInjector`s.

This commit adds a new internal scope to `R3Injector` for `EnvironmentInjector`s specifically. This will allow us to scope services to the environment side of the injector hierarchy specifically, as opposed to the `'any'` scope which also includes view-side injectors created via `Injector.create`. For now, this functionality is not exposed publicly, but is available to use within `@angular/core` only.

atscott

reviewed-for: public-api

alxhub · 2022-04-16T00:36:51Z

Caretaker: this has all required approvals

dylhunn · 2022-04-18T16:28:45Z

This PR was merged into the repository by commit 3578e94.

This commit implements the `importProvidersFrom` function that allows extracting a list of `Provider`s from a list of NgModule types. The R3Injector which implements DI at the "module" level for Angular is refactored to use this functionality under the hood. This commit also implements `INJECTOR_INITIALIZER`, a DI multi-provider token which is used to run initialization logic when an injector is created. PR Close #45626

…#45626) This commit exposes a new `EnvironmentInjector` abstraction, which generalizes the "module injector" concept to injectors that are not based on NgModules. An EnvironmentInjector is a conceptual analogue of an `NgModuleRef` - it represents an injector on the former "module" DI hierarchy in Angular (now renamed to the "environment injector hierarchy"). Environment injectors are created via the `createEnvironmentInjector` function from a list of `Provider`s. For backwards compatibility with current code using `NgModuleRef`, `EnvironmentInjector`s are wrapped by an adapter `NgModuleRef` implementation, so injecting `NgModuleRef` always returns the latest `EnvironmentInjector`, even if that injector was not based on an NgModule. Conversely, NgModule-based `NgModuleRef`s created via `createNgModuleRef` are _also_ `EnvironmentInjector`s. PR Close #45626

This commit adds a new internal scope to `R3Injector` for `EnvironmentInjector`s specifically. This will allow us to scope services to the environment side of the injector hierarchy specifically, as opposed to the `'any'` scope which also includes view-side injectors created via `Injector.create`. For now, this functionality is not exposed publicly, but is available to use within `@angular/core` only. PR Close #45626

angular-automatic-lock-bot · 2022-05-19T16:13:48Z

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.}

alxhub force-pushed the standalone-env branch from ee45cb9 to 842c465 Compare April 14, 2022 01:25

pkozlowski-opensource reviewed Apr 14, 2022

View reviewed changes

packages/core/src/render3/interfaces/definition.ts Outdated Show resolved Hide resolved

alxhub force-pushed the standalone-env branch 8 times, most recently from 424d469 to ba03f2f Compare April 14, 2022 22:22

pullapprove bot requested review from AndrewKushnir, atscott, dylhunn and jessicajaniuk April 14, 2022 22:22

alxhub force-pushed the standalone-env branch 3 times, most recently from ca6934c to ab2815d Compare April 15, 2022 00:07

alxhub added the target: minor This PR is targeted for the next minor release label Apr 15, 2022

AndrewKushnir approved these changes Apr 15, 2022

View reviewed changes

pullapprove bot requested a review from AndrewKushnir April 15, 2022 04:56

atscott requested changes Apr 15, 2022

View reviewed changes

goldens/public-api/core/index.md Show resolved Hide resolved

atscott approved these changes Apr 15, 2022

View reviewed changes

dylhunn approved these changes Apr 15, 2022

View reviewed changes

pullapprove bot requested a review from jelbourn April 15, 2022 20:57

jessicajaniuk reviewed Apr 15, 2022

View reviewed changes

pullapprove bot requested a review from jessicajaniuk April 15, 2022 21:45

jessicajaniuk approved these changes Apr 15, 2022

View reviewed changes

alxhub force-pushed the standalone-env branch 2 times, most recently from 9d8065d to dcae004 Compare April 15, 2022 22:46

alxhub force-pushed the standalone-env branch 2 times, most recently from e173bf1 to c72330f Compare April 15, 2022 23:02

pkozlowski-opensource reviewed Apr 15, 2022

View reviewed changes

alxhub force-pushed the standalone-env branch from c72330f to 280f5de Compare April 15, 2022 23:23

alxhub added 2 commits April 15, 2022 16:40

alxhub force-pushed the standalone-env branch from 280f5de to 7ac6540 Compare April 15, 2022 23:41

atscott approved these changes Apr 15, 2022

View reviewed changes

alxhub added the action: merge The PR is ready for merge by the caretaker label Apr 16, 2022

AndrewKushnir added the area: core Issues related to the framework runtime label Apr 16, 2022

ngbot bot added this to the Backlog milestone Apr 16, 2022

alxhub added the merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note label Apr 16, 2022

AndrewKushnir approved these changes Apr 16, 2022

View reviewed changes

AndrewKushnir requested review from amysorto and removed request for jelbourn and amysorto April 16, 2022 01:37

dylhunn closed this in a5a7fbc Apr 18, 2022

sync-by-unito bot mentioned this pull request May 1, 2022

build(deps-dev): bump @angular/language-service from 12.2.4 to 13.3.5 numbersprotocol/capture-lite#1575

Closed

angular-automatic-lock-bot bot locked and limited conversation to collaborators May 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introducing EnvInjector! #45626

Introducing EnvInjector! #45626

alxhub commented Apr 14, 2022 •

edited

AndrewKushnir left a comment

AndrewKushnir Apr 15, 2022

atscott left a comment

atscott left a comment

dylhunn left a comment

jessicajaniuk left a comment •

edited

jessicajaniuk Apr 15, 2022

alxhub Apr 15, 2022

jessicajaniuk left a comment

pkozlowski-opensource Apr 15, 2022

alxhub Apr 16, 2022

pkozlowski-opensource Apr 16, 2022

atscott left a comment

alxhub commented Apr 16, 2022

dylhunn commented Apr 18, 2022

angular-automatic-lock-bot bot commented May 19, 2022

Introducing EnvInjector! #45626

Introducing EnvInjector! #45626

Conversation

alxhub commented Apr 14, 2022 • edited

AndrewKushnir left a comment

Choose a reason for hiding this comment

AndrewKushnir Apr 15, 2022

Choose a reason for hiding this comment

atscott left a comment

Choose a reason for hiding this comment

atscott left a comment

Choose a reason for hiding this comment

dylhunn left a comment

Choose a reason for hiding this comment

jessicajaniuk left a comment • edited

Choose a reason for hiding this comment

jessicajaniuk Apr 15, 2022

Choose a reason for hiding this comment

alxhub Apr 15, 2022

Choose a reason for hiding this comment

jessicajaniuk left a comment

Choose a reason for hiding this comment

pkozlowski-opensource Apr 15, 2022

Choose a reason for hiding this comment

alxhub Apr 16, 2022

Choose a reason for hiding this comment

pkozlowski-opensource Apr 16, 2022

Choose a reason for hiding this comment

atscott left a comment

Choose a reason for hiding this comment

alxhub commented Apr 16, 2022

dylhunn commented Apr 18, 2022

angular-automatic-lock-bot bot commented May 19, 2022

alxhub commented Apr 14, 2022 •

edited

jessicajaniuk left a comment •

edited