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 false positives for vars inside functions in vue/valid-define-emits and vue/valid-define-props rules #1652

Merged
merged 1 commit into from Oct 6, 2021
Merged

Fix false positives for vars inside functions in vue/valid-define-emits and vue/valid-define-props rules #1652

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions lib/rules/valid-define-emits.js
View file
Open in desktop
Expand Up @@ -70,17 +70,19 @@ module.exports = {
}
},
Identifier(node) {
for (const def of emitsDefExpressions) {
if (utils.inRange(def.range, node)) {
for (const defineEmits of emitsDefExpressions) {
if (utils.inRange(defineEmits.range, node)) {
const variable = findVariable(context.getScope(), node)
if (
variable &&
variable.references.some((ref) => ref.identifier === node)
) {
if (
variable.defs.length &&
variable.defs.every((def) =>
utils.inRange(scriptSetup.range, def.name)
variable.defs.every(
(def) =>
utils.inRange(scriptSetup.range, def.name) &&
!utils.inRange(defineEmits.range, def.name)
)
) {
//`defineEmits` are referencing locally declared variables.
Expand Down
10 changes: 6 additions & 4 deletions lib/rules/valid-define-props.js
View file
Open in desktop
Expand Up @@ -71,17 +71,19 @@ module.exports = {
}
},
Identifier(node) {
for (const def of propsDefExpressions) {
if (utils.inRange(def.range, node)) {
for (const defineProps of propsDefExpressions) {
if (utils.inRange(defineProps.range, node)) {
const variable = findVariable(context.getScope(), node)
if (
variable &&
variable.references.some((ref) => ref.identifier === node)
) {
if (
variable.defs.length &&
variable.defs.every((def) =>
utils.inRange(scriptSetup.range, def.name)
variable.defs.every(
(def) =>
utils.inRange(scriptSetup.range, def.name) &&
!utils.inRange(defineProps.range, def.name)
)
) {
//`defineProps` are referencing locally declared variables.
Expand Down
12 changes: 12 additions & 0 deletions tests/lib/rules/valid-define-emits.js
View file
Open in desktop
Expand Up @@ -61,6 +61,18 @@ tester.run('valid-define-emits', rule, {
defineEmits(def)
</script>
`
},
{
filename: 'test.vue',
code: `
<script setup>
defineEmits({
notify (payload) {
return typeof payload === 'string'
}
})
</script>
`
}
],
invalid: [
Expand Down
15 changes: 15 additions & 0 deletions tests/lib/rules/valid-define-props.js
View file
Open in desktop
Expand Up @@ -61,6 +61,21 @@ tester.run('valid-define-props', rule, {
defineProps(def)
</script>
`
},
{
filename: 'test.vue',
code: `
<script setup>
defineProps({
addFunction: {
type: Function,
default (a, b) {
return a + b
}
}
})
</script>
`
}
],
invalid: [
Expand Down