From ec5fdada5be7ad4e948f0d4c3f500dcd96d9d85e Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Fri, 2 Jul 2021 21:47:09 +0900
Subject: [PATCH 1/2] Update `vue/require-prop-type-constructor` rule to
 support `<script setup>`

---
 lib/rules/require-prop-type-constructor.js    | 23 ++++++-
 lib/utils/index.js                            | 67 ++++++++++---------
 .../rules/require-prop-type-constructor.js    | 30 +++++++++
 3 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/lib/rules/require-prop-type-constructor.js b/lib/rules/require-prop-type-constructor.js
index 0f94f0f2c..f453bea85 100644
--- a/lib/rules/require-prop-type-constructor.js
+++ b/lib/rules/require-prop-type-constructor.js
@@ -7,6 +7,11 @@
 const utils = require('../utils')
 const { isDef } = require('../utils')
 
+/**
+ * @typedef {import('../utils').ComponentArrayProp} ComponentArrayProp
+ * @typedef {import('../utils').ComponentObjectProp} ComponentObjectProp
+ */
+
 // ------------------------------------------------------------------------------
 // Rule Definition
 // ------------------------------------------------------------------------------
@@ -76,8 +81,9 @@ module.exports = {
         )
     }
 
-    return utils.executeOnVueComponent(context, (obj) => {
-      for (const prop of utils.getComponentProps(obj)) {
+    /** @param {(ComponentArrayProp | ComponentObjectProp)[]} props */
+    function verifyProps(props) {
+      for (const prop of props) {
         if (!prop.value || prop.propName == null) {
           continue
         }
@@ -94,6 +100,17 @@ module.exports = {
           checkPropertyNode(prop.propName, typeProperty.value)
         }
       }
-    })
+    }
+
+    return utils.compositingVisitors(
+      utils.defineScriptSetupVisitor(context, {
+        onDefinePropsEnter(_node, props) {
+          verifyProps(props)
+        }
+      }),
+      utils.executeOnVueComponent(context, (obj) => {
+        verifyProps(utils.getComponentProps(obj))
+      })
+    )
   }
 }
diff --git a/lib/utils/index.js b/lib/utils/index.js
index 5ecda2868..484074035 100644
--- a/lib/utils/index.js
+++ b/lib/utils/index.js
@@ -1097,42 +1097,43 @@ module.exports = {
       return null
     }
 
-    const definePropsMap = new Map()
-    /**
-     * @param {CallExpression} node
-     */
-    scriptSetupVisitor.CallExpression = (node) => {
-      if (
-        inScriptSetup(node) &&
-        node.callee.type === 'Identifier' &&
-        node.callee.name === 'defineProps'
-      ) {
-        /** @type {(ComponentArrayProp | ComponentObjectProp | ComponentTypeProp)[]} */
-        let props = []
-        if (node.arguments.length >= 1) {
-          const defNode = getObjectOrArray(node.arguments[0])
-          if (defNode) {
-            props = getComponentPropsFromDefine(defNode)
-          }
-        } else if (
-          node.typeParameters &&
-          node.typeParameters.params.length >= 1
+    if (visitor.onDefinePropsEnter || visitor.onDefinePropsExit) {
+      const definePropsMap = new Map()
+      /**
+       * @param {CallExpression} node
+       */
+      scriptSetupVisitor.CallExpression = (node) => {
+        if (
+          inScriptSetup(node) &&
+          node.callee.type === 'Identifier' &&
+          node.callee.name === 'defineProps'
         ) {
-          props = getComponentPropsFromTypeDefine(
-            context,
-            node.typeParameters.params[0]
-          )
+          /** @type {(ComponentArrayProp | ComponentObjectProp | ComponentTypeProp)[]} */
+          let props = []
+          if (node.arguments.length >= 1) {
+            const defNode = getObjectOrArray(node.arguments[0])
+            if (defNode) {
+              props = getComponentPropsFromDefine(defNode)
+            }
+          } else if (
+            node.typeParameters &&
+            node.typeParameters.params.length >= 1
+          ) {
+            props = getComponentPropsFromTypeDefine(
+              context,
+              node.typeParameters.params[0]
+            )
+          }
+          callVisitor('onDefinePropsEnter', node, props)
         }
-        definePropsMap.set(node, props)
-        callVisitor('onDefinePropsEnter', node, props)
+        callVisitor('CallExpression', node)
       }
-      callVisitor('CallExpression', node)
-    }
-    scriptSetupVisitor['CallExpression:exit'] = (node) => {
-      callVisitor('CallExpression:exit', node)
-      if (definePropsMap.has(node)) {
-        callVisitor('onDefinePropsExit', node, definePropsMap.get(node))
-        definePropsMap.delete(node)
+      scriptSetupVisitor['CallExpression:exit'] = (node) => {
+        callVisitor('CallExpression:exit', node)
+        if (definePropsMap.has(node)) {
+          callVisitor('onDefinePropsExit', node, definePropsMap.get(node))
+          definePropsMap.delete(node)
+        }
       }
     }
 
diff --git a/tests/lib/rules/require-prop-type-constructor.js b/tests/lib/rules/require-prop-type-constructor.js
index 18ece4f55..452bb35aa 100644
--- a/tests/lib/rules/require-prop-type-constructor.js
+++ b/tests/lib/rules/require-prop-type-constructor.js
@@ -355,6 +355,36 @@ ruleTester.run('require-prop-type-constructor', rule, {
           line: 18
         }
       ]
+    },
+    {
+      filename: 'SomeComponent.vue',
+      code: `
+      <script setup>
+      defineProps({
+        a: {
+          type: 'String',
+          default: 'abc'
+        },
+      })
+      </script>
+      `,
+      output: `
+      <script setup>
+      defineProps({
+        a: {
+          type: String,
+          default: 'abc'
+        },
+      })
+      </script>
+      `,
+      parser: require.resolve('vue-eslint-parser'),
+      errors: [
+        {
+          message: 'The "a" property should be a constructor.',
+          line: 5
+        }
+      ]
     }
   ]
 })

From 844b3a76466927e5c3c40f672e7f354f9c16dd73 Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Sat, 3 Jul 2021 00:03:37 +0900
Subject: [PATCH 2/2] fix tsc error

---
 lib/rules/require-prop-type-constructor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/rules/require-prop-type-constructor.js b/lib/rules/require-prop-type-constructor.js
index f453bea85..f22da8118 100644
--- a/lib/rules/require-prop-type-constructor.js
+++ b/lib/rules/require-prop-type-constructor.js
@@ -10,6 +10,7 @@ const { isDef } = require('../utils')
 /**
  * @typedef {import('../utils').ComponentArrayProp} ComponentArrayProp
  * @typedef {import('../utils').ComponentObjectProp} ComponentObjectProp
+ * @typedef {import('../utils').ComponentTypeProp} ComponentTypeProp
  */
 
 // ------------------------------------------------------------------------------
@@ -81,7 +82,7 @@ module.exports = {
         )
     }
 
-    /** @param {(ComponentArrayProp | ComponentObjectProp)[]} props */
+    /** @param {(ComponentArrayProp | ComponentObjectProp | ComponentTypeProp)[]} props */
     function verifyProps(props) {
       for (const prop of props) {
         if (!prop.value || prop.propName == null) {