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(core): mutation bug in getDependenciesFromInjectable #52450

Closed
wants to merge 1 commit into from
Closed

fix(core): mutation bug in getDependenciesFromInjectable #52450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 15 additions & 16 deletions packages/core/src/render3/util/injector_discovery_utils.ts
View file
Open in desktop
Expand Up @@ -57,26 +57,32 @@ export function getDependenciesFromInjectable<T>(
const resolutionPath = getInjectorResolutionPath(injector);

const dependencies = unformattedDependencies.map(dep => {
// injectedIn contains private fields, so we omit it from the response
const formattedDependency: Omit<InjectedService, 'injectedIn'> = {
value: dep.value,
};

// convert injection flags to booleans
const flags = dep.flags as InternalInjectFlags;
dep.flags = {
formattedDependency.flags = {
optional: (InternalInjectFlags.Optional & flags) === InternalInjectFlags.Optional,
host: (InternalInjectFlags.Host & flags) === InternalInjectFlags.Host,
self: (InternalInjectFlags.Self & flags) === InternalInjectFlags.Self,
skipSelf: (InternalInjectFlags.SkipSelf & flags) === InternalInjectFlags.SkipSelf,
};


// find the injector that provided the dependency
for (let i = 0; i < resolutionPath.length; i++) {
const injectorToCheck = resolutionPath[i];

// if skipSelf is true we skip the first injector
if (i === 0 && dep.flags.skipSelf) {
if (i === 0 && formattedDependency.flags.skipSelf) {
continue;
}

// host only applies to NodeInjectors
if (dep.flags.host && injectorToCheck instanceof EnvironmentInjector) {
if (formattedDependency.flags.host && injectorToCheck instanceof EnvironmentInjector) {
break;
}

Expand All @@ -88,36 +94,29 @@ export function getDependenciesFromInjectable<T>(
// in the resolution path by using the host flag. This is done to make sure that we've found
// the correct providing injector, and not a node injector that is connected to our path via
// a router outlet.
if (dep.flags.host) {
if (formattedDependency.flags.host) {
const firstInjector = resolutionPath[0];
const lookupFromFirstInjector =
firstInjector.get(dep.token as Type<unknown>, null, {...dep.flags, optional: true});
const lookupFromFirstInjector = firstInjector.get(
dep.token as Type<unknown>, null, {...formattedDependency.flags, optional: true});

if (lookupFromFirstInjector !== null) {
dep.providedIn = injectorToCheck;
formattedDependency.providedIn = injectorToCheck;
}

break;
}

dep.providedIn = injectorToCheck;
formattedDependency.providedIn = injectorToCheck;
break;
}

// if self is true we stop after the first injector
if (i === 0 && dep.flags.self) {
if (i === 0 && formattedDependency.flags.self) {
break;
}
}

// injectedIn contains private fields, so we omit it from the response
const formattedDependency: Omit<InjectedService, 'injectedIn'> = {
value: dep.value,
};

if (dep.token) formattedDependency.token = dep.token;
if (dep.flags) formattedDependency.flags = dep.flags;
if (dep.providedIn) formattedDependency.providedIn = dep.providedIn;

return formattedDependency;
});
Expand Down