-
Notifications
You must be signed in to change notification settings - Fork 0
36 dynamicmodule refactor #37
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.
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
Open
Evanion
wants to merge
3
commits into
main
Choose a base branch
from
36-dynamicmodule-refactor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Remove static generics from DynamicModule config/configAsync - Add createModuleConfig and createModuleConfigAsync helpers - Update tests for strict type safety and better DX
a55b684 to
c705650
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Module Provider Merging and Async Factory Type Issues
The createModuleConfig function introduces two issues:
- It fails to merge providers defined in the base
@Moduledecorator with the dynamically configured provider. Unlike the previous implementation, it only returns the new config provider, discarding existing module providers. - There is a type signature mismatch for async factory providers. When a
ProviderConfigObject<Promise<T>>is passed as a factory, the function's implementation returns a synchronousModuleConfiginstead of the expectedPromise<ModuleConfig>, violating its declared overload.
libs/core/src/dynamic-module.ts#L49-L131
core/libs/core/src/dynamic-module.ts
Lines 49 to 131 in c705650
| */ | |
| // Overload for sync configs (non-promise values) | |
| export function createModuleConfig<T>( | |
| moduleClass: { configToken: TokenType<T> }, | |
| config: T | ProviderConfigObject<T> | |
| ): ModuleConfig; | |
| // Overload for async configs (promises) | |
| export function createModuleConfig<T>( | |
| moduleClass: { configToken: TokenType<T> }, | |
| config: Promise<T> | ProviderConfigObject<Promise<T>> | |
| ): Promise<ModuleConfig>; | |
| // Implementation | |
| export function createModuleConfig<T>( | |
| moduleClass: { configToken: TokenType<T> }, | |
| config: | |
| | T | |
| | ProviderConfigObject<T> | |
| | Promise<T> | |
| | ProviderConfigObject<Promise<T>> | |
| ): ModuleConfig | Promise<ModuleConfig> { | |
| // If config is a factory provider | |
| if (isFactory(config)) { | |
| // Don't execute the factory here - let the DI container handle it | |
| // Just pass the factory configuration through with the token | |
| return { | |
| providers: [ | |
| { | |
| ...config, | |
| token: moduleClass.configToken, | |
| }, | |
| ], | |
| }; | |
| } | |
| // If config is a provider config (but not a factory) | |
| if (isProvider(config)) { | |
| // If useValue is a promise | |
| if ('useValue' in config && isPromise(config.useValue)) { | |
| return Promise.resolve(config.useValue).then((resolved) => ({ | |
| providers: [ | |
| { | |
| ...config, | |
| useValue: resolved, | |
| token: moduleClass.configToken, | |
| }, | |
| ], | |
| })); | |
| } | |
| // Otherwise, sync provider config | |
| return { | |
| providers: [ | |
| { | |
| ...config, | |
| token: moduleClass.configToken, | |
| }, | |
| ], | |
| }; | |
| } | |
| // If config is a Promise | |
| if (isPromise(config)) { | |
| return Promise.resolve(config).then((resolved) => ({ | |
| providers: [ | |
| { | |
| useValue: resolved, | |
| token: moduleClass.configToken, | |
| }, | |
| ], | |
| })); | |
| } | |
| // Otherwise, it's a plain config object | |
| return { | |
| providers: [ | |
| { | |
| useValue: config, | |
| token: moduleClass.configToken, | |
| }, | |
| ], | |
| }; | |
| } |
Was this report helpful? Give feedback by reacting with 👍 or 👎
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the DynamicModule feature to simplify creating new modules with config values, and better DX when consuming modules, with better typechecking