Skip to content

Fix(types): inject() return type - use undefined as return type instead of void #295

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

Merged
LinusBorg merged 1 commit into from
Apr 24, 2020
Merged

Fix(types): inject() return type - use undefined as return type instead of void #295

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/apis/inject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ export function provide<T>(key: InjectionKey<T> | string, value: T): void {
vm._provided[key as string] = value;
}

export function inject<T>(key: InjectionKey<T> | string): T | void;
export function inject<T>(key: InjectionKey<T> | string): T | undefined;
export function inject<T>(key: InjectionKey<T> | string, defaultValue: T): T;
export function inject<T>(key: InjectionKey<T> | string, defaultValue?: T): T | void {
export function inject<T>(key: InjectionKey<T> | string, defaultValue?: T): T | undefined {
if (!key) {
return defaultValue;
}
Expand All @@ -43,9 +43,10 @@ export function inject<T>(key: InjectionKey<T> | string, defaultValue?: T): T |
const val = resolveInject(key as InjectionKey<T>, vm);
if (val !== NOT_FOUND) {
return val;
} else if (defaultValue !== undefined) {
} else {
if (defaultValue === undefined && process.env.NODE_ENV !== 'production') {
warn(`Injection "${String(key)}" not found`, vm);
}
return defaultValue;
} else if (process.env.NODE_ENV !== 'production') {
warn(`Injection "${String(key)}" not found`, vm);
}
}