Fix false positives for function args in vue/valid-define-emits and…

… `vue/valid-define-props` rules (#1652)
vuejs · Oct 6, 2021 · 83eab8d · 83eab8d
1 parent 1ece73e
commit 83eab8d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/lib/rules/valid-define-emits.js b/lib/rules/valid-define-emits.js
@@ -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.

diff --git a/lib/rules/valid-define-props.js b/lib/rules/valid-define-props.js
@@ -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.

diff --git a/tests/lib/rules/valid-define-emits.js b/tests/lib/rules/valid-define-emits.js
@@ -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: [

diff --git a/tests/lib/rules/valid-define-props.js b/tests/lib/rules/valid-define-props.js
@@ -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: [