Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions packages/runtime-vapor/__tests__/component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,22 @@ describe('component', () => {
'Vapor component setup() returned non-block value, and has no render function',
).toHaveBeenWarned()
})

it('warn non-existent property access', () => {
define({
setup() {
return {}
},
render(ctx: any) {
ctx.foo
return []
},
}).render()

expect(
'Property "foo" was accessed during render but is not defined on instance.',
).toHaveBeenWarned()
})
})

function getEffectsCount(scope: EffectScope): number {
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-vapor/__tests__/hmr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ describe('hot module replacement', () => {
},
render: compileToFunction(`
<teleport :to="target">
<div :style="style">
<div>
<slot/>
</div>
</teleport>
Expand Down
32 changes: 30 additions & 2 deletions packages/runtime-vapor/src/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ import {
onScopeDispose,
proxyRefs,
setActiveSub,
toRaw,
unref,
} from '@vue/reactivity'
import {
EMPTY_OBJ,
ShapeFlags,
hasOwn,
invokeArrayFns,
isArray,
isFunction,
Expand Down Expand Up @@ -381,9 +383,10 @@ export function setupComponent(
)
instance.block = []
} else {
instance.devtoolsRawSetupState = setupResult
// TODO make the proxy warn non-existent property access during dev
instance.setupState = proxyRefs(setupResult)
if (__DEV__) {
instance.setupState = createDevSetupStateProxy(instance)
}
devRender(instance)
}
} else {
Expand Down Expand Up @@ -449,6 +452,31 @@ export function applyFallthroughProps(
isApplyingFallthroughProps = false
}

/**
* dev only
*/
function createDevSetupStateProxy(
instance: VaporComponentInstance,
): Record<string, any> {
const { setupState } = instance
return new Proxy(setupState!, {
get(target, key: string | symbol, receiver) {
if (
isString(key) &&
!key.startsWith('__v') &&
!hasOwn(toRaw(setupState)!, key)
) {
warn(
`Property ${JSON.stringify(key)} was accessed during render ` +
`but is not defined on instance.`,
)
}

return Reflect.get(target, key, receiver)
},
})
}

/**
* dev only
*/
Expand Down
Loading