Merge branch 'master' into feat-ref

Author: chouchouji

lib/rules/max-props.js

@@ -39,27 +39,41 @@ module.exports = {
 
     /**
      * @param {import('../utils').ComponentProp[]} props
+     * @param {CallExpression | Property} node
      */
-    function checkMaxNumberOfProps(props) {
-      if (props.length > option.maxProps && props[0].node) {
+    function checkMaxNumberOfProps(props, node) {
+      const uniqueProps = new Set(props.map((prop) => prop.propName))
+      const propCount = uniqueProps.size
+      if (propCount > option.maxProps && props[0].node) {
         context.report({
-          node: props[0].node.parent,
+          node,
           messageId: 'tooManyProps',
           data: {
-            propCount: props.length,
+            propCount,
             limit: option.maxProps
           }
         })
       }
     }
 
     return utils.compositingVisitors(
-      utils.executeOnVue(context, (obj) => {
-        checkMaxNumberOfProps(utils.getComponentPropsFromOptions(obj))
+      utils.executeOnVue(context, (node) => {
+        const propsNode = node.properties.find(
+          /** @returns {p is Property} */
+          (p) =>
+            p.type === 'Property' && utils.getStaticPropertyName(p) === 'props'
+        )
+
+        if (!propsNode) return
+
+        checkMaxNumberOfProps(
+          utils.getComponentPropsFromOptions(node),
+          propsNode
+        )
       }),
       utils.defineScriptSetupVisitor(context, {
-        onDefinePropsEnter(_, props) {
-          checkMaxNumberOfProps(props)
+        onDefinePropsEnter(node, props) {
+          checkMaxNumberOfProps(props, node)
         }
       })
     )

lib/rules/no-bare-strings-in-template.js

@@ -154,7 +154,10 @@ module.exports = {
     const directives = opts.directives || DEFAULT_DIRECTIVES
 
     const allowlistRe = new RegExp(
-      allowlist.map((w) => regexp.escape(w)).join('|'),
+      allowlist
+        .map((w) => regexp.escape(w))
+        .sort((a, b) => b.length - a.length)
+        .join('|'),
       'gu'
     )
 

tests/lib/rules/max-props.js

@@ -26,6 +26,15 @@ tester.run('max-props', rule, {
       `,
       options: [{ maxProps: 5 }]
     },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup>
+      defineProps(['prop1', 'prop2'])
+      </script>
+      `,
+      options: [{ maxProps: 5 }]
+    },
     {
       filename: 'test.vue',
       code: `
@@ -99,6 +108,20 @@ tester.run('max-props', rule, {
           parser: require.resolve('@typescript-eslint/parser')
         }
       }
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+      defineProps<{prop1: string, prop2: string} | {prop1: number}>()
+      </script>
+      `,
+      options: [{ maxProps: 2 }],
+      languageOptions: {
+        parserOptions: {
+          parser: require.resolve('@typescript-eslint/parser')
+        }
+      }
     }
   ],
   invalid: [
@@ -160,6 +183,56 @@ tester.run('max-props', rule, {
           endLine: 3
         }
       ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+      defineProps<{prop1: string, prop2: string} | {prop1: number, prop3: string}>()
+      </script>
+      `,
+      options: [{ maxProps: 2 }],
+      languageOptions: {
+        parserOptions: {
+          parser: require.resolve('@typescript-eslint/parser')
+        }
+      },
+      errors: [
+        {
+          message: 'Component has too many props (3). Maximum allowed is 2.',
+          line: 3,
+          endLine: 3
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+      defineProps<{
+        prop1: string
+      } & {
+        prop2?: true;
+        prop3?: never;
+      } | {
+        prop2?: false;
+        prop3?: boolean;
+      }>()
+      </script>
+      `,
+      options: [{ maxProps: 2 }],
+      languageOptions: {
+        parserOptions: {
+          parser: require.resolve('@typescript-eslint/parser')
+        }
+      },
+      errors: [
+        {
+          message: 'Component has too many props (3). Maximum allowed is 2.',
+          line: 3,
+          endLine: 11
+        }
+      ]
     }
   ]
 })

tests/lib/rules/no-bare-strings-in-template.js

@@ -114,7 +114,25 @@ tester.run('no-bare-strings-in-template', rule, {
         title="( ) , . & + - = * / # % ! ? : [ ] { } < > • —   | &lpar; &rpar; &comma; &period; &amp; &AMP; &plus; &minus; &equals; &ast; &midast; &sol; &num; &percnt; &excl; &quest; &colon; &lsqb; &lbrack; &rsqb; &rbrack; &lcub; &lbrace; &rcub; &rbrace; &lt; &LT; &gt; &GT; &bull; &bullet; &mdash; &ndash; &nbsp; &Tab; &NewLine; &verbar; &vert; &VerticalLine;"
       />
     </template>
-    `
+    `,
+    {
+      // https://github.com/vuejs/eslint-plugin-vue/issues/2681
+      code: `
+      <template>
+        <h1> foo </h1>
+        <h1> foo_bar </h1>
+      </template>
+      `,
+      options: [{ allowlist: ['foo', 'foo_bar'] }]
+    },
+    {
+      code: `
+      <template>
+        <h1>@@</h1>
+      </template>
+      `,
+      options: [{ allowlist: ['@@'] }]
+    }
   ],
   invalid: [
     {
@@ -227,6 +245,24 @@ tester.run('no-bare-strings-in-template', rule, {
         }
       ]
     },
+    {
+      code: `
+      <template>
+        <h1>foo</h1>
+        <h1>foo_bar</h1>
+      </template>
+      `,
+      options: [{ allowlist: ['foo'] }],
+      errors: [
+        {
+          messageId: 'unexpected',
+          line: 4,
+          column: 13,
+          endLine: 4,
+          endColumn: 20
+        }
+      ]
+    },
     {
       code: `
       <template>