vuejs · pikax · Nov 14, 2023 · Nov 15, 2023 · Nov 16, 2023 · Nov 16, 2023
diff --git a/package.json b/package.json
@@ -119,6 +119,9 @@
         "react",
         "react-dom"
       ]
+    },
+    "patchedDependencies": {
+      "@vue/[email protected]": "patches/@[email protected]"
     }
   }
 }
diff --git a/patches/@[email protected] b/patches/@[email protected]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/baseWrapper.ts b/src/baseWrapper.ts
@@ -1,13 +1,20 @@
 import { textContent } from './utils'
 import type { TriggerOptions } from './createDomEvent'
 import {
+  DefineComponentOptions,
+  DefineComponentFromOptions,
+  ComponentInjectOptions,
+  ComponentInstance,
   ComponentInternalInstance,
   ComponentOptions,
+  ComponentOptionsMixin,
   ComponentPublicInstance,
   ComputedOptions,
   CreateComponentPublicInstance,
+  EmitsOptions,
   FunctionalComponent,
   MethodOptions,
+  SlotsType,
   nextTick
 } from 'vue'
 import { createDOMEvent } from './createDomEvent'
@@ -19,6 +26,7 @@ import {
   FindComponentSelector,
   NameSelector,
   RefSelector,
+  UnknownRenderedVue,
   VueNode
 } from './types'
 import WrapperLike from './interfaces/wrapperLike'
@@ -108,16 +116,57 @@ export default abstract class BaseWrapper<ElementType extends Node>
 
   // searching by string without specifying component results in WrapperLike object
   findComponent<T extends never>(selector: string): WrapperLike
+
   // Find Component Options aka plain object
   findComponent<
-    Props,
-    RawBindings = any,
-    D = any,
-    C extends ComputedOptions = ComputedOptions,
-    M extends MethodOptions = MethodOptions
+    Props = {},
+    RawBindings = {},
+    D = {},
+    C extends ComputedOptions = {},
+    M extends MethodOptions = {},
+    Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
+    Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
+    E extends EmitsOptions = {},
+    EE extends string = string,
+    I extends ComponentInjectOptions = {},
+    II extends string = string,
+    S extends SlotsType = {},
+    Options = {}
   >(
-    selector: ComponentOptions<Props, RawBindings, D, C, M>
-  ): VueWrapper<CreateComponentPublicInstance<Props, RawBindings, D, C, M>>
+    selector: DefineComponentOptions<
+      Props,
+      RawBindings,
+      D,
+      C,
+      M,
+      Mixin,
+      Extends,
+      E,
+      EE,
+      I,
+      II,
+      S,
+      Options
+    >
+  ): VueWrapper<
+    Props extends DefinedComponent
+      ? ComponentInstance<Props>
+      : DefineComponentFromOptions<
+          Props,
+          RawBindings,
+          D,
+          C,
+          M,
+          Mixin,
+          Extends,
+          E,
+          EE,
+          I,
+          II,
+          S,
+          Options
+        >
+  >
   findComponent<T extends ComponentOptions>(
     selector: string
   ): VueWrapper<
@@ -129,21 +178,23 @@ export default abstract class BaseWrapper<ElementType extends Node>
       infer M
     >
       ? CreateComponentPublicInstance<Props, RawBindings, D, C, M>
-      : VueWrapper<CreateComponentPublicInstance>
+      : CreateComponentPublicInstance
   >
-  // searching for component created via defineComponent results in VueWrapper of proper type
-  findComponent<T extends DefinedComponent>(
-    selector: T | Exclude<FindComponentSelector, FunctionalComponent>
-  ): VueWrapper<InstanceType<T>>
   // searching for functional component results in DOMWrapper
   findComponent<T extends FunctionalComponent>(selector: T): DOMWrapper<Node>
   findComponent<T extends FunctionalComponent>(
     selector: string
   ): DOMWrapper<Element>
+
   // searching by name or ref always results in VueWrapper
   findComponent<T extends never>(
     selector: NameSelector | RefSelector
-  ): VueWrapper
+  ): VueWrapper<UnknownRenderedVue>
+  // searching for component created via defineComponent results in VueWrapper of proper type
+  findComponent<T extends DefinedComponent>(
+    selector: T | Exclude<FindComponentSelector, FunctionalComponent>
+  ): VueWrapper<ComponentInstance<T>>
+
   findComponent<T extends ComponentPublicInstance>(
     selector: T | FindComponentSelector
   ): VueWrapper<T>
@@ -185,7 +236,7 @@ export default abstract class BaseWrapper<ElementType extends Node>
   findAllComponents<T extends never>(selector: string): WrapperLike[]
   findAllComponents<T extends DefinedComponent>(
     selector: T | Exclude<FindAllComponentsSelector, FunctionalComponent>
-  ): VueWrapper<InstanceType<T>>[]
+  ): VueWrapper<ComponentInstance<T>>[]
   findAllComponents<T extends FunctionalComponent>(
     selector: T
   ): DOMWrapper<Node>[]
@@ -290,17 +341,17 @@ export default abstract class BaseWrapper<ElementType extends Node>
   }
 
   getComponent<T extends never>(selector: string): Omit<WrapperLike, 'exists'>
+  // searching by name or ref always results in VueWrapper
+  getComponent<T extends never>(
+    selector: NameSelector | RefSelector
+  ): Omit<VueWrapper<UnknownRenderedVue>, 'exists'>
   getComponent<T extends DefinedComponent>(
     selector: T | Exclude<FindComponentSelector, FunctionalComponent>
-  ): Omit<VueWrapper<InstanceType<T>>, 'exists'>
+  ): Omit<VueWrapper<ComponentInstance<T>>, 'exists'>
   // searching for functional component results in DOMWrapper
   getComponent<T extends FunctionalComponent>(
     selector: T | string
   ): Omit<DOMWrapper<Element>, 'exists'>
-  // searching by name or ref always results in VueWrapper
-  getComponent<T extends never>(
-    selector: NameSelector | RefSelector
-  ): Omit<VueWrapper, 'exists'>
   getComponent<T extends ComponentPublicInstance>(
     selector: T | FindComponentSelector
   ): Omit<VueWrapper<T>, 'exists'>

diff --git a/src/interfaces/wrapperLike.ts b/src/interfaces/wrapperLike.ts
@@ -8,7 +8,11 @@ import {
   RefSelector
 } from '../types'
 import { VueWrapper } from '../vueWrapper'
-import { ComponentPublicInstance, FunctionalComponent } from 'vue'
+import {
+  ComponentInstance,
+  ComponentPublicInstance,
+  FunctionalComponent
+} from 'vue'
 import type { DOMWrapper } from '../domWrapper'
 
 export default interface WrapperLike {
@@ -35,7 +39,7 @@ export default interface WrapperLike {
   findComponent<T extends never>(selector: string): WrapperLike
   findComponent<T extends DefinedComponent>(
     selector: T | Exclude<FindComponentSelector, FunctionalComponent>
-  ): VueWrapper<InstanceType<T>>
+  ): VueWrapper<ComponentInstance<T>>
   findComponent<T extends FunctionalComponent>(
     selector: T | string
   ): DOMWrapper<Element>
@@ -50,7 +54,7 @@ export default interface WrapperLike {
   findAllComponents<T extends never>(selector: string): WrapperLike[]
   findAllComponents<T extends DefinedComponent>(
     selector: T | Exclude<FindAllComponentsSelector, FunctionalComponent>
-  ): VueWrapper<InstanceType<T>>[]
+  ): VueWrapper<ComponentInstance<T>>[]
   findAllComponents<T extends FunctionalComponent>(
     selector: string
   ): DOMWrapper<Element>[]
@@ -79,7 +83,7 @@ export default interface WrapperLike {
   getComponent<T extends never>(selector: string): Omit<WrapperLike, 'exists'>
   getComponent<T extends DefinedComponent>(
     selector: T | Exclude<FindComponentSelector, FunctionalComponent>
-  ): Omit<VueWrapper<InstanceType<T>>, 'exists'>
+  ): Omit<VueWrapper<ComponentInstance<T>>, 'exists'>
   // searching for functional component results in DOMWrapper
   getComponent<T extends FunctionalComponent>(
     selector: T | string

diff --git a/src/mount.ts b/src/mount.ts
@@ -1,30 +1,28 @@
-import { ComponentPublicInstance, DefineComponent, VNode } from 'vue'
-import type {
-  ComponentExposed,
-  ComponentProps,
+import {
+  ComponentPublicInstance,
+  DefineComponent,
+  VNode,
+  ComponentInstance,
   ComponentSlots
-} from 'vue-component-type-helpers'
+} from 'vue'
 import { createInstance } from './createInstance'
 import { MountingOptions } from './types'
 import { trackInstance } from './utils/autoUnmount'
 import { VueWrapper } from './vueWrapper'
 import { createVueWrapper } from './wrapperFactory'
-
-type ShimSlotReturnType<T> = T extends (...args: infer P) => any
-  ? (...args: P) => any
-  : never
+import { ComponentPropsWithDefaultOptional } from 'vue'
 
 type WithArray<T> = T | T[]
 
 type ComponentData<T> = T extends { data?(...args: any): infer D } ? D : {}
 
-export type ComponentMountingOptions<
-  T,
-  P extends ComponentProps<T> = ComponentProps<T>
-> = Omit<MountingOptions<P, ComponentData<T>>, 'slots'> & {
+export type ComponentMountingOptions<T, P> = Omit<
+  MountingOptions<P, ComponentData<T>>,
+  'slots'
+> & {
   slots?: {
     [K in keyof ComponentSlots<T>]: WithArray<
-      | ShimSlotReturnType<ComponentSlots<T>[K]>
+      | ComponentSlots<T>[K]
       | string
       | VNode
       | (new () => any)
@@ -34,27 +32,11 @@ export type ComponentMountingOptions<
 } & Record<string, unknown>
 
 export function mount<
-  T,
-  C = T extends ((...args: any) => any) | (new (...args: any) => any)
-    ? T
-    : T extends { props?: infer Props }
-      ? DefineComponent<
-          Props extends Readonly<(infer PropNames)[]> | (infer PropNames)[]
-            ? { [key in PropNames extends string ? PropNames : string]?: any }
-            : Props
-        >
-      : DefineComponent,
-  P extends ComponentProps<C> = ComponentProps<C>
+  T extends DefineComponent<any, any, any, any, any, any, any, any, any, any>
 >(
   originalComponent: T,
-  options?: ComponentMountingOptions<C, P>
-): VueWrapper<
-  ComponentProps<C> & ComponentData<C> & ComponentExposed<C>,
-  ComponentPublicInstance<
-    ComponentProps<C>,
-    ComponentData<C> & ComponentExposed<C> & Omit<P, keyof ComponentProps<C>>
-  >
->
+  options?: ComponentMountingOptions<T, ComponentPropsWithDefaultOptional<T>>
+): VueWrapper<ComponentInstance<T>>
 
 // implementation
 export function mount(

diff --git a/src/renderToString.ts b/src/renderToString.ts
@@ -1,23 +1,44 @@
 import { renderToString as baseRenderToString } from '@vue/server-renderer'
-import { DefineComponent } from 'vue'
+import { ComponentProps, DefineComponent } from 'vue'
 import { createInstance } from './createInstance'
 import { ComponentMountingOptions } from './mount'
 import { RenderMountingOptions } from './types'
 
+// export function renderToString<
+//   T,
+//   C = T extends ((...args: any) => any) | (new (...args: any) => any)
+//     ? T
+//     : T extends { props?: infer Props }
+//     ? DefineComponent<
+//         Props extends Readonly<(infer PropNames)[]> | (infer PropNames)[]
+//           ? { [key in PropNames extends string ? PropNames : string]?: any }
+//           : Props
+//       >
+//     : DefineComponent
+// >(
+//   originalComponent: T,
+//   options?: ComponentMountingOptions<C> &
+//     Pick<RenderMountingOptions<any>, 'attachTo'>
+// ): Promise<string>
+
+// defineComponent
 export function renderToString<
-  T,
-  C = T extends ((...args: any) => any) | (new (...args: any) => any)
-    ? T
-    : T extends { props?: infer Props }
-      ? DefineComponent<
-          Props extends Readonly<(infer PropNames)[]> | (infer PropNames)[]
-            ? { [key in PropNames extends string ? PropNames : string]?: any }
-            : Props
-        >
-      : DefineComponent
+  T extends DefineComponent<
+    PropsOrOptions,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any
+  >,
+  PropsOrOptions
 >(
   originalComponent: T,
-  options?: ComponentMountingOptions<C> &
+  options?: ComponentMountingOptions<T, ComponentProps<T>> &
     Pick<RenderMountingOptions<any>, 'attachTo'>
 ): Promise<string>
 

diff --git a/src/types.ts b/src/types.ts
@@ -166,4 +166,9 @@ export type VueNode<T extends Node = Node> = T & {
 
 export type VueElement = VueNode<Element>
 
-export type DefinedComponent = new (...args: any[]) => any
+export type DefinedComponent = Component
+
+export type UnknownRenderedVue = {
+  $props: Record<string, any>
+  $data: Record<string, any>
+}