fix(macros): return VNode for generic defineComponent

close #21

Author: zhiyuanzmj

packages/macros/src/volar/transform.ts

@@ -75,17 +75,14 @@ export function transformJsxMacros(
           }
         }
 
+        const isDefineComponent =
+          macros.defineComponent?.expression.getText(ast) === 'defineComponent'
         codes.replaceRange(
           node.getStart(ast),
           node.expression.getStart(ast),
           'const ',
           [`__render`, node.getStart(ast) - 1, { verification: true }],
-          macros.defineComponent
-            ? macros.defineComponent?.expression.getText(ast) ===
-              'defineVaporComponent'
-              ? ''
-              : ': () => JSX.Element'
-            : '',
+          isDefineComponent ? ': () => JSX.Element' : '',
           ' = ',
         )
         codes.replaceRange(
@@ -101,7 +98,7 @@ return {} as {
     expose: (exposed: ${macros.defineExpose ?? 'Record<string, any>'}) => void,
     attrs: Record<string, any>
   },
-  render: typeof __render
+  render: ${isDefineComponent ? `ReturnType<` : ''}typeof __render${isDefineComponent ? '>' : ''}
 }`,
         )
       }

packages/macros/tests/fixtures/define-component.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, defineVaporComponent, nextTick, unref } from 'vue'
+import { defineComponent, defineVaporComponent, nextTick, unref, VaporComponentInstance, VNode } from 'vue'
 
 const $ = unref
 
@@ -62,4 +62,14 @@ defineVaporComponent(({
       {i}
     </>
   )
-})
+})
+
+// #21
+const Comp3 = defineComponent(<T,>()=>{
+  return () => <div>123</div>
+})
+;<Comp3 /> == ({} as VNode)
+const Comp4 = defineVaporComponent(<T,>() => {
+  return <div>123</div>
+})
+;<Comp4 /> == ({} as VaporComponentInstance)

packages/vue-jsx-vapor/src/volar/jsx-element.ts

@@ -59,7 +59,7 @@ type __InferJsxElement<T> = T extends keyof HTMLElementTagNameMap
     ? SVGElementTagNameMap[T]
     : T extends (props: infer Props, ctx: { slots: infer Slots, expose: (exposed: infer Exposed) => void, attrs: any, emit: any }) => infer TypeBlock
       // @ts-ignore
-      ? import('vue-jsx-vapor').VaporComponentInstance<Props, {}, Slots, Exposed, TypeBlock>
+      ? TypeBlock extends import('vue').VNode ? TypeBlock : import('vue-jsx-vapor').VaporComponentInstance<Props, {}, Slots, Exposed, TypeBlock>
       : T extends { new (...args: any[]): infer Instance }
         ? Instance extends { $: any }
           ? import('vue').VNode