minor refactor

Author: ota-meshi

lib/rules/require-valid-default-prop.js

@@ -70,59 +70,6 @@ function getTypes(targetNode) {
   return []
 }
 
-/**
- * Extracts default definitions using assignment patterns.
- * @param {CallExpression} node The node of defineProps
- * @returns { { [key: string]: Expression | undefined } }
- */
-function getDefaultsPropExpressionsForAssignmentPatterns(node) {
-  const left = getLeftOfDefineProps(node)
-  if (!left || left.type !== 'ObjectPattern') {
-    return {}
-  }
-  /** @type { { [key: string]: Expression | undefined } } */
-  const result = Object.create(null)
-  for (const prop of left.properties) {
-    if (prop.type !== 'Property') continue
-    const value = prop.value
-    if (value.type !== 'AssignmentPattern') continue
-    const defaultNode = value.right
-    const name = utils.getStaticPropertyName(prop)
-    if (name != null) {
-      result[name] = defaultNode
-    }
-  }
-  return result
-}
-
-/**
- * Gets the pattern of the left operand of defineProps.
- * @param {CallExpression} node The node of defineProps
- * @returns {Pattern | null} The pattern of the left operand of defineProps
- */
-function getLeftOfDefineProps(node) {
-  let target = node
-  if (
-    target.parent &&
-    target.parent.type === 'CallExpression' &&
-    target.parent.arguments[0] === target &&
-    target.parent.callee.type === 'Identifier' &&
-    target.parent.callee.name === 'withDefaults'
-  ) {
-    target = target.parent
-  }
-  if (!target.parent) {
-    return null
-  }
-  if (
-    target.parent.type === 'VariableDeclarator' &&
-    target.parent.init === target
-  ) {
-    return target.parent.id
-  }
-  return null
-}
-
 module.exports = {
   meta: {
     type: 'suggestion',
@@ -477,11 +424,11 @@ module.exports = {
           const defaultsByWithDefaults =
             utils.getWithDefaultsPropExpressions(node)
           const defaultsByAssignmentPatterns =
-            getDefaultsPropExpressionsForAssignmentPatterns(node)
+            utils.getDefaultPropExpressionsForPropsDestructure(node)
           const propContexts = processPropDefs(props, (propName) =>
             [
               defaultsByWithDefaults[propName],
-              defaultsByAssignmentPatterns[propName]
+              defaultsByAssignmentPatterns[propName]?.expression
             ].filter(utils.isDef)
           )
           scriptSetupPropsContexts.push({ node, props: propContexts })

lib/utils/index.js

@@ -1537,6 +1537,13 @@ module.exports = {
    * @returns { { [key: string]: Property | undefined } }
    */
   getWithDefaultsProps,
+  /**
+   * Gets the default definition nodes for defineProp
+   * using the props destructure with assignment pattern.
+   * @param {CallExpression} node The node of defineProps
+   * @returns { Record<string, {prop: AssignmentProperty , expression: Expression} | undefined> }
+   */
+  getDefaultPropExpressionsForPropsDestructure,
 
   getVueObjectType,
   /**
@@ -3144,6 +3151,53 @@ function getWithDefaultsProps(node) {
   return result
 }
 
+/**
+ * Gets the default definition nodes for defineProp
+ * using the props destructure with assignment pattern.
+ * @param {CallExpression} node The node of defineProps
+ * @returns { Record<string, {prop: AssignmentProperty , expression: Expression} | undefined> }
+ */
+function getDefaultPropExpressionsForPropsDestructure(node) {
+  const left = getLeftOfDefineProps(node)
+  if (!left || left.type !== 'ObjectPattern') {
+    return {}
+  }
+  /** @type {ReturnType<typeof getDefaultPropExpressionsForPropsDestructure>} */
+  const result = Object.create(null)
+  for (const prop of left.properties) {
+    if (prop.type !== 'Property') continue
+    const value = prop.value
+    if (value.type !== 'AssignmentPattern') continue
+    const name = getStaticPropertyName(prop)
+    if (name != null) {
+      result[name] = { prop, expression: value.right }
+    }
+  }
+  return result
+}
+
+/**
+ * Gets the pattern of the left operand of defineProps.
+ * @param {CallExpression} node The node of defineProps
+ * @returns {Pattern | null} The pattern of the left operand of defineProps
+ */
+function getLeftOfDefineProps(node) {
+  let target = node
+  if (hasWithDefaults(target)) {
+    target = target.parent
+  }
+  if (!target.parent) {
+    return null
+  }
+  if (
+    target.parent.type === 'VariableDeclarator' &&
+    target.parent.init === target
+  ) {
+    return target.parent.id
+  }
+  return null
+}
+
 /**
  * Get all props from component options object.
  * @param {ObjectExpression} componentObject Object with component definition