Merge branch 'master' into update-resources

ota-meshi · web-flow · commit 5ab2abc7f885 · 2023-05-25T09:19:19.000+09:00
diff --git a/docs/rules/multi-word-component-names.md b/docs/rules/multi-word-component-names.md
@@ -169,6 +169,10 @@ export default {
 
 </eslint-code-block>
 
+## :couple: Related Rules
+
+- [vue/no-reserved-component-names](./no-reserved-component-names.md)
+
 ## :books: Further Reading
 
 - [Style guide - Multi-word component names](https://vuejs.org/style-guide/rules-essential.html#use-multi-word-component-names)
diff --git a/docs/rules/no-reserved-component-names.md b/docs/rules/no-reserved-component-names.md
@@ -72,6 +72,10 @@ export default {
 
 </eslint-code-block>
 
+## :couple: Related Rules
+
+- [vue/multi-word-component-names](./multi-word-component-names.md)
+
 ## :books: Further Reading
 
 - [List of html elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element)
diff --git a/lib/rules/no-dupe-keys.js b/lib/rules/no-dupe-keys.js
@@ -4,10 +4,13 @@
  */
 'use strict'
 
+const { findVariable } = require('@eslint-community/eslint-utils')
 const utils = require('../utils')
 
 /**
  * @typedef {import('../utils').GroupName} GroupName
+ * @typedef {import('eslint').Scope.Variable} Variable
+ * @typedef {import('../utils').ComponentProp} ComponentProp
  */
 
 /** @type {GroupName[]} */
@@ -39,24 +42,43 @@ module.exports = {
     const options = context.options[0] || {}
     const groups = new Set([...GROUP_NAMES, ...(options.groups || [])])
 
-    return utils.executeOnVue(context, (obj) => {
-      /** @type {Set<string>} */
-      const usedNames = new Set()
-      const properties = utils.iterateProperties(obj, groups)
-
-      for (const o of properties) {
-        if (usedNames.has(o.name)) {
-          context.report({
-            node: o.node,
-            message: "Duplicated key '{{name}}'.",
-            data: {
-              name: o.name
-            }
-          })
+    return utils.compositingVisitors(
+      utils.executeOnVue(context, (obj) => {
+        const properties = utils.iterateProperties(obj, groups)
+        /** @type {Set<string>} */
+        const usedNames = new Set()
+        for (const o of properties) {
+          if (usedNames.has(o.name)) {
+            context.report({
+              node: o.node,
+              message: "Duplicated key '{{name}}'.",
+              data: {
+                name: o.name
+              }
+            })
+          }
+
+          usedNames.add(o.name)
         }
+      }),
+      utils.defineScriptSetupVisitor(context, {
+        onDefinePropsEnter(node, props) {
+          for (const prop of props) {
+            if (!prop.propName) continue
 
-        usedNames.add(o.name)
-      }
-    })
+            const variable = findVariable(context.getScope(), prop.propName)
+            if (!variable || variable.defs.length === 0) continue
+
+            context.report({
+              node: variable.defs[0].node,
+              message: "Duplicated key '{{name}}'.",
+              data: {
+                name: prop.propName
+              }
+            })
+          }
+        }
+      })
+    )
   }
 }
diff --git a/lib/rules/no-duplicate-attr-inheritance.js b/lib/rules/no-duplicate-attr-inheritance.js
@@ -26,12 +26,23 @@ module.exports = {
     /** @type {string | number | boolean | RegExp | BigInt | null} */
     let inheritsAttrs = true
 
-    return Object.assign(
-      utils.executeOnVue(context, (node) => {
-        const inheritAttrsProp = utils.findProperty(node, 'inheritAttrs')
+    /** @param {ObjectExpression} node */
+    function processOptions(node) {
+      const inheritAttrsProp = utils.findProperty(node, 'inheritAttrs')
 
-        if (inheritAttrsProp && inheritAttrsProp.value.type === 'Literal') {
-          inheritsAttrs = inheritAttrsProp.value.value
+      if (inheritAttrsProp && inheritAttrsProp.value.type === 'Literal') {
+        inheritsAttrs = inheritAttrsProp.value.value
+      }
+    }
+
+    return utils.compositingVisitors(
+      utils.executeOnVue(context, processOptions),
+      utils.defineScriptSetupVisitor(context, {
+        onDefineOptionsEnter(node) {
+          if (node.arguments.length === 0) return
+          const define = node.arguments[0]
+          if (define.type !== 'ObjectExpression') return
+          processOptions(define)
         }
       }),
       utils.defineTemplateBodyVisitor(context, {
diff --git a/lib/rules/no-undef-properties.js b/lib/rules/no-undef-properties.js
@@ -127,6 +127,8 @@ module.exports = {
 
         /** @type { Set<string | ASTNode> } */
         this.reported = new Set()
+
+        this.hasUnknownProperty = false
       }
       /**
        * Report
@@ -135,6 +137,7 @@ module.exports = {
        * @param {boolean} [options.props]
        */
       verifyReferences(references, options) {
+        if (this.hasUnknownProperty) return
         const report = this.report.bind(this)
         verifyUndefProperties(this.defineProperties, references, null)
 
@@ -206,6 +209,10 @@ module.exports = {
           }
         })
       }
+
+      markAsHasUnknownProperty() {
+        this.hasUnknownProperty = true
+      }
     }
 
     /** @type {Map<ASTNode, VueComponentContext>} */
@@ -280,6 +287,10 @@ module.exports = {
           const ctx = getVueComponentContext(programNode)
 
           for (const prop of props) {
+            if (prop.type === 'unknown') {
+              ctx.markAsHasUnknownProperty()
+              return
+            }
             if (!prop.propName) {
               continue
             }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "9.13.0",
+  "version": "9.14.0",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {
diff --git a/tests/lib/rules/no-dupe-keys.js b/tests/lib/rules/no-dupe-keys.js
@@ -390,6 +390,32 @@ ruleTester.run('no-dupe-keys', rule, {
           },
         }
       `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+        defineProps({
+          foo: String,
+        })
+        const bar = 0
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser')
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+        defineProps<{
+          foo: string;
+        }>();
+
+        const bar = 0
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser'),
+      parserOptions: { parser: require.resolve('@typescript-eslint/parser') }
     }
   ],
 
@@ -861,6 +887,85 @@ ruleTester.run('no-dupe-keys', rule, {
           line: 7
         }
       ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+        defineProps({
+          foo: String,
+        })
+        const foo = 0
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser'),
+      errors: [
+        {
+          message: "Duplicated key 'foo'.",
+          line: 6
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+        import { Foo } from './Foo.vue';
+        import baz from './baz';
+        
+        defineProps({
+          foo: String,
+          bar: String,
+          baz: String,
+        });
+
+        function foo() {
+          const baz = 'baz';
+        }
+        const bar = () => 'bar';
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser'),
+      errors: [
+        {
+          message: "Duplicated key 'baz'.",
+          line: 4
+        },
+        {
+          message: "Duplicated key 'foo'.",
+          line: 12
+        },
+        {
+          message: "Duplicated key 'bar'.",
+          line: 15
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+      defineProps<{
+        foo: string;
+        bar: string;
+      }>();
+
+      const foo = 'foo';
+      const bar = 'bar';
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser'),
+      parserOptions: { parser: require.resolve('@typescript-eslint/parser') },
+      errors: [
+        {
+          message: "Duplicated key 'foo'.",
+          line: 8
+        },
+        {
+          message: "Duplicated key 'bar'.",
+          line: 9
+        }
+      ]
     }
   ]
 })
diff --git a/tests/lib/rules/no-duplicate-attr-inheritance.js b/tests/lib/rules/no-duplicate-attr-inheritance.js
@@ -79,6 +79,26 @@ ruleTester.run('no-duplicate-attr-inheritance', rule, {
         export default {  }
         </script>
       `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script>
+      export default { inheritAttrs: false }
+      </script>
+      <script setup>
+      </script>
+      <template><div v-bind="$attrs" /></template>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+      defineOptions({ inheritAttrs: false })
+      </script>
+      <template><div v-bind="$attrs" /></template>
+      `
     }
   ],
 
@@ -99,6 +119,38 @@ ruleTester.run('no-duplicate-attr-inheritance', rule, {
         </script>
       `,
       errors: ['Set "inheritAttrs" to false.']
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script>
+      export default { inheritAttrs: true }
+      </script>
+      <script setup>
+      </script>
+      <template><div v-bind="$attrs" /></template>
+      `,
+      errors: [
+        {
+          message: 'Set "inheritAttrs" to false.',
+          line: 7
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+      defineOptions({ inheritAttrs: true })
+      </script>
+      <template><div v-bind="$attrs" /></template>
+      `,
+      errors: [
+        {
+          message: 'Set "inheritAttrs" to false.',
+          line: 5
+        }
+      ]
     }
   ]
 })
diff --git a/tests/lib/rules/no-undef-properties.js b/tests/lib/rules/no-undef-properties.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-vue",`
`3`		`- "version": "9.13.0",`
	`3`	`+ "version": "9.14.0",`
`4`	`4`	`"description": "Official ESLint plugin for Vue.js",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`