Skip to content

refactor(kit): processInject #1112

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

Open
skirtles-code wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(kit): processInject #1112

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
17 changes: 10 additions & 7 deletions packages/devtools-kit/src/core/component/state/process.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,16 @@ function processProvide(instance: VueAppInstance) {
}))
}

const hasOwnProperty = Object.prototype.hasOwnProperty
const hasOwn = (
val: object,
key: string | symbol,
): key is keyof typeof val => hasOwnProperty.call(val, key)

function processInject(instance: VueAppInstance, mergedType: Record<string, unknown>) {
if (!mergedType?.inject)
return []
let keys: any[] = []
let defaultValue
let keys: any[]
if (Array.isArray(mergedType.inject)) {
keys = mergedType.inject.map(key => ({
key,
Expand All @@ -250,8 +255,7 @@ function processInject(instance: VueAppInstance, mergedType: Record<string, unkn
originalKey = value
}
else {
originalKey = value.from
defaultValue = value.default
originalKey = value.from ?? key
}
return {
key,
Expand All @@ -261,9 +265,8 @@ function processInject(instance: VueAppInstance, mergedType: Record<string, unkn
}
return keys.map(({ key, originalKey }) => ({
type: 'injected',
key: originalKey && key !== originalKey ? `${originalKey.toString()} ➞ ${key.toString()}` : key.toString(),
// eslint-disable-next-line no-prototype-builtins
value: returnError(() => instance.ctx.hasOwnProperty(key) ? instance.ctx[key] : instance.provides.hasOwnProperty(originalKey) ? instance.provides[originalKey] : defaultValue),
key: key !== originalKey ? `${String(originalKey)} ➞ ${String(key)}` : String(key),
value: returnError(() => hasOwn(instance.ctx, key) ? instance.ctx[key] : undefined),
}))
}

Expand Down
Loading