improve

vuejs · May 11, 2023 · ae8bcdc · ae8bcdc
1 parent d99a1d4
commit ae8bcdc
Show file tree

Hide file tree

Showing 5 changed files with 375 additions and 103 deletions.
diff --git a/lib/utils/ts-utils/index.js b/lib/utils/ts-utils/index.js
@@ -1,10 +1,11 @@
 const {
   isTypeNode,
-  resolveQualifiedType,
   extractRuntimeProps,
   isTSTypeLiteral,
   isTSTypeLiteralOrTSFunctionType,
-  extractRuntimeEmits
+  extractRuntimeEmits,
+  flattenTypeNodes,
+  isTSInterfaceBody
 } = require('./ts-ast')
 const {
   getComponentPropsFromTypeDefineTypes,
@@ -36,15 +37,24 @@ module.exports = {
  * @return {(ComponentTypeProp|ComponentInferTypeProp|ComponentUnknownProp)[]} Array of component props
  */
 function getComponentPropsFromTypeDefine(context, propsNode) {
-  const defNode = resolveQualifiedType(
+  /** @type {(ComponentTypeProp|ComponentInferTypeProp|ComponentUnknownProp)[]} */
+  const result = []
+  for (const defNode of flattenTypeNodes(
     context,
-    /** @type {TSESTreeTypeNode} */ (propsNode),
-    isTSTypeLiteral
-  )
-  if (!defNode) {
-    return getComponentPropsFromTypeDefineTypes(context, propsNode)
+    /** @type {TSESTreeTypeNode} */ (propsNode)
+  )) {
+    if (isTSInterfaceBody(defNode) || isTSTypeLiteral(defNode)) {
+      result.push(...extractRuntimeProps(context, defNode))
+    } else {
+      result.push(
+        ...getComponentPropsFromTypeDefineTypes(
+          context,
+          /** @type {TypeNode} */ (defNode)
+        )
+      )
+    }
   }
-  return [...extractRuntimeProps(context, defNode)]
+  return result
 }
 
 /**
@@ -54,13 +64,25 @@ function getComponentPropsFromTypeDefine(context, propsNode) {
  * @return {(ComponentTypeEmit|ComponentInferTypeEmit|ComponentUnknownEmit)[]} Array of component emits
  */
 function getComponentEmitsFromTypeDefine(context, emitsNode) {
-  const defNode = resolveQualifiedType(
+  /** @type {(ComponentTypeEmit|ComponentInferTypeEmit|ComponentUnknownEmit)[]} */
+  const result = []
+  for (const defNode of flattenTypeNodes(
     context,
-    /** @type {TSESTreeTypeNode} */ (emitsNode),
-    isTSTypeLiteralOrTSFunctionType
-  )
-  if (!defNode) {
-    return getComponentEmitsFromTypeDefineTypes(context, emitsNode)
+    /** @type {TSESTreeTypeNode} */ (emitsNode)
+  )) {
+    if (
+      isTSInterfaceBody(defNode) ||
+      isTSTypeLiteralOrTSFunctionType(defNode)
+    ) {
+      result.push(...extractRuntimeEmits(defNode))
+    } else {
+      result.push(
+        ...getComponentEmitsFromTypeDefineTypes(
+          context,
+          /** @type {TypeNode} */ (defNode)
+        )
+      )
+    }
   }
-  return [...extractRuntimeEmits(defNode)]
+  return result
 }