Merge branch 'master' into nhtnhan/master

Author: FloEdelmann

lib/configs/flat/base.js

@@ -6,6 +6,7 @@
 const globals = require('globals')
 module.exports = [
   {
+    name: 'vue:base:setup',
     plugins: {
       get vue() {
         return require('../../index')
@@ -17,6 +18,7 @@ module.exports = [
     }
   },
   {
+    name: 'vue:base:setup-for-vue',
     files: ['*.vue', '**/*.vue'],
     plugins: {
       get vue() {

lib/configs/flat/vue2-essential.js

@@ -9,6 +9,7 @@ const config = require('./base.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-essential:rules',
     rules: {
       'vue/multi-word-component-names': 'error',
       'vue/no-arrow-functions-in-watch': 'error',

lib/configs/flat/vue2-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue2-strongly-recommended.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-recommended:rules',
     rules: {
       'vue/attributes-order': 'warn',
       'vue/component-tags-order': 'warn',

lib/configs/flat/vue2-strongly-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue2-essential.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-strongly-recommended:rules',
     rules: {
       'vue/attribute-hyphenation': 'warn',
       'vue/component-definition-name-casing': 'warn',

lib/configs/flat/vue3-essential.js

@@ -9,6 +9,7 @@ const config = require('./base.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:essential:rules',
     rules: {
       'vue/multi-word-component-names': 'error',
       'vue/no-arrow-functions-in-watch': 'error',

lib/configs/flat/vue3-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue3-strongly-recommended.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:recommended:rules',
     rules: {
       'vue/attributes-order': 'warn',
       'vue/component-tags-order': 'warn',

lib/configs/flat/vue3-strongly-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue3-essential.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:strongly-recommended:rules',
     rules: {
       'vue/attribute-hyphenation': 'warn',
       'vue/component-definition-name-casing': 'warn',

lib/rules/component-name-in-template-casing.js

@@ -122,9 +122,12 @@ module.exports = {
       }
 
       if (
-        (!utils.isHtmlElementNode(node) && !utils.isSvgElementNode(node)) ||
+        (!utils.isHtmlElementNode(node) &&
+          !utils.isSvgElementNode(node) &&
+          !utils.isMathElementNode(node)) ||
         utils.isHtmlWellKnownElementName(node.rawName) ||
         utils.isSvgWellKnownElementName(node.rawName) ||
+        utils.isMathWellKnownElementName(node.rawName) ||
         utils.isVueBuiltInElementName(node.rawName)
       ) {
         return false

lib/rules/html-self-closing.js

@@ -63,7 +63,7 @@ function getElementType(node) {
   if (utils.isSvgElementNode(node)) {
     return 'SVG'
   }
-  if (utils.isMathMLElementNode(node)) {
+  if (utils.isMathElementNode(node)) {
     return 'MATH'
   }
   return 'UNKNOWN'

lib/rules/no-deprecated-html-element-is.js

@@ -27,7 +27,8 @@ module.exports = {
     function isValidElement(node) {
       return (
         !utils.isHtmlWellKnownElementName(node.rawName) &&
-        !utils.isSvgWellKnownElementName(node.rawName)
+        !utils.isSvgWellKnownElementName(node.rawName) &&
+        !utils.isMathWellKnownElementName(node.rawName)
       )
     }
     return utils.defineTemplateBodyVisitor(context, {

lib/rules/no-undef-components.js

@@ -149,6 +149,7 @@ module.exports = {
       if (
         utils.isHtmlWellKnownElementName(rawName) ||
         utils.isSvgWellKnownElementName(rawName) ||
+        utils.isMathWellKnownElementName(rawName) ||
         utils.isBuiltInComponentName(kebabCaseName)
       ) {
         return false
@@ -177,7 +178,11 @@ module.exports = {
     /** @type {TemplateListener} */
     const templateBodyVisitor = {
       VElement(node) {
-        if (!utils.isHtmlElementNode(node) && !utils.isSvgElementNode(node)) {
+        if (
+          !utils.isHtmlElementNode(node) &&
+          !utils.isSvgElementNode(node) &&
+          !utils.isMathElementNode(node)
+        ) {
           return
         }
         verifyName(node.rawName, node.startTag)

lib/rules/no-unused-components.js

@@ -52,9 +52,12 @@ module.exports = {
         /** @param {VElement} node */
         VElement(node) {
           if (
-            (!utils.isHtmlElementNode(node) && !utils.isSvgElementNode(node)) ||
+            (!utils.isHtmlElementNode(node) &&
+              !utils.isSvgElementNode(node) &&
+              !utils.isMathElementNode(node)) ||
             utils.isHtmlWellKnownElementName(node.rawName) ||
-            utils.isSvgWellKnownElementName(node.rawName)
+            utils.isSvgWellKnownElementName(node.rawName) ||
+            utils.isMathWellKnownElementName(node.rawName)
           ) {
             return
           }

lib/rules/require-typed-ref.js

@@ -44,13 +44,23 @@ module.exports = {
       return {}
     }
 
-    const scriptSetup = utils.getScriptSetupElement(context)
-    if (
-      scriptSetup &&
-      !utils.hasAttribute(scriptSetup, 'lang', 'ts') &&
-      !utils.hasAttribute(scriptSetup, 'lang', 'typescript')
-    ) {
-      return {}
+    if (utils.isVueFile(filename)) {
+      const sourceCode = context.getSourceCode()
+      const documentFragment =
+        sourceCode.parserServices.getDocumentFragment &&
+        sourceCode.parserServices.getDocumentFragment()
+      if (!documentFragment) {
+        return {}
+      }
+      const scripts = documentFragment.children.filter(
+        /** @returns {element is VElement} */
+        (element) => utils.isVElement(element) && element.name === 'script'
+      )
+      if (
+        scripts.every((script) => !utils.hasAttribute(script, 'lang', 'ts'))
+      ) {
+        return {}
+      }
     }
 
     const defines = iterateDefineRefs(

lib/rules/script-setup-uses-vars.js

@@ -94,10 +94,13 @@ module.exports = {
         },
         VElement(node) {
           if (
-            (!utils.isHtmlElementNode(node) && !utils.isSvgElementNode(node)) ||
+            (!utils.isHtmlElementNode(node) &&
+              !utils.isSvgElementNode(node) &&
+              !utils.isMathElementNode(node)) ||
             (node.rawName === node.name &&
               (utils.isHtmlWellKnownElementName(node.rawName) ||
-                utils.isSvgWellKnownElementName(node.rawName))) ||
+                utils.isSvgWellKnownElementName(node.rawName) ||
+                utils.isMathWellKnownElementName(node.rawName))) ||
             utils.isBuiltInComponentName(node.rawName)
           ) {
             return

lib/utils/index.js

@@ -51,6 +51,7 @@ const { getScope } = require('./scope')
 
 const HTML_ELEMENT_NAMES = new Set(require('./html-elements.json'))
 const SVG_ELEMENT_NAMES = new Set(require('./svg-elements.json'))
+const MATH_ELEMENT_NAMES = new Set(require('./math-elements.json'))
 const VOID_ELEMENT_NAMES = new Set(require('./void-elements.json'))
 const VUE2_BUILTIN_COMPONENT_NAMES = new Set(
   require('./vue2-builtin-components')
@@ -948,6 +949,8 @@ module.exports = {
         !this.isHtmlWellKnownElementName(node.rawName)) ||
       (this.isSvgElementNode(node) &&
         !this.isSvgWellKnownElementName(node.rawName)) ||
+      (this.isMathElementNode(node) &&
+        !this.isMathWellKnownElementName(node.rawName)) ||
       hasAttribute(node, 'is') ||
       hasDirective(node, 'bind', 'is') ||
       hasDirective(node, 'is')
@@ -977,7 +980,7 @@ module.exports = {
    * @param {VElement} node The node to check.
    * @returns {boolean} `true` if the node is a MathML element.
    */
-  isMathMLElementNode(node) {
+  isMathElementNode(node) {
     return node.namespace === NS.MathML
   },
 
@@ -999,6 +1002,15 @@ module.exports = {
     return SVG_ELEMENT_NAMES.has(name)
   },
 
+  /**
+   * Check whether the given name is a well-known MathML element or not.
+   * @param {string} name The name to check.
+   * @returns {boolean} `true` if the name is a well-known MathML element name.
+   */
+  isMathWellKnownElementName(name) {
+    return MATH_ELEMENT_NAMES.has(name)
+  },
+
   /**
    * Check whether the given name is a void element name or not.
    * @param {string} name The name to check.
@@ -3121,7 +3133,7 @@ function getWithDefaultsProps(node) {
 
   for (const prop of param.properties) {
     if (prop.type !== 'Property') {
-      return {}
+      continue
     }
     const name = getStaticPropertyName(prop)
     if (name != null) {

lib/utils/math-elements.json

@@ -0,0 +1,34 @@
+[
+  "math",
+  "maction",
+  "annotation",
+  "annotation-xml",
+  "menclose",
+  "merror",
+  "mfenced",
+  "mfrac",
+  "mi",
+  "mmultiscripts",
+  "mn",
+  "mo",
+  "mover",
+  "mpadded",
+  "mphantom",
+  "mprescripts",
+  "mroot",
+  "mrow",
+  "ms",
+  "semantics",
+  "mspace",
+  "msqrt",
+  "mstyle",
+  "msub",
+  "msup",
+  "msubsup",
+  "mtable",
+  "mtd",
+  "mtext",
+  "mtr",
+  "munder",
+  "munderover"
+]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "9.25.0",
+  "version": "9.26.0",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {
@@ -73,8 +73,8 @@
     "@types/node": "^14.18.63",
     "@types/semver": "^7.5.7",
     "@types/xml-name-validator": "^4.0.3",
-    "@typescript-eslint/parser": "^7.0.1",
-    "@typescript-eslint/types": "^7.0.1",
+    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/types": "^7.13.1",
     "assert": "^2.1.0",
     "env-cmd": "^10.1.0",
     "esbuild": "^0.20.0",

tests/fixtures/script-indent/ts-declare-function-03.vue

@@ -1,6 +1,6 @@
 <!--{"languageOptions": {"parserOptions": {"parser":"@typescript-eslint/parser"}}}-->
 <script lang="ts">
-declare async function
+declare function
   foo
   (
     arg1: string,
@@ -9,4 +9,6 @@ declare async function
   :
   arg1 is
     string;
+async function
+  bar() {}
 </script>

tests/fixtures/script-indent/ts-declare-function-04.vue

@@ -1,7 +1,6 @@
 <!--{"languageOptions": {"parserOptions": {"parser":"@typescript-eslint/parser"}}}-->
 <script lang="ts">
 declare function
-  *
   foo
   (
     arg1: string,

tests/lib/rules/comment-directive.js

@@ -12,7 +12,7 @@ const { ESLint } = require('../../eslint-compat')
 const eslint = new ESLint({
   overrideConfigFile: true,
   overrideConfig: {
-    files: ['*'],
+    files: ['*.*'],
     languageOptions: {
       parser: require('vue-eslint-parser'),
       ecmaVersion: 2015

tests/lib/rules/no-sparse-arrays.js

@@ -3,7 +3,8 @@
  */
 'use strict'
 
-const RuleTester = require('../../eslint-compat').RuleTester
+const { RuleTester, ESLint } = require('../../eslint-compat')
+const semver = require('semver')
 const rule = require('../../../lib/rules/no-sparse-arrays')
 
 const tester = new RuleTester({
@@ -29,9 +30,10 @@ tester.run('no-sparse-arrays', rule, {
         {
           message: 'Unexpected comma in middle of array.',
           line: 3,
-          column: 22,
           endLine: 3,
-          endColumn: 38
+          ...(semver.gte(ESLint.version, '9.5.0')
+            ? { column: 23, endColumn: 24 }
+            : { column: 22, endColumn: 38 })
         }
       ]
     },
@@ -44,9 +46,10 @@ tester.run('no-sparse-arrays', rule, {
         {
           message: 'Unexpected comma in middle of array.',
           line: 3,
-          column: 22,
           endLine: 3,
-          endColumn: 30
+          ...(semver.gte(ESLint.version, '9.5.0')
+            ? { column: 23, endColumn: 24 }
+            : { column: 22, endColumn: 30 })
         }
       ]
     }