chore: refactor mount types (#1776)

Author: lmiller1990

src/mount.ts

@@ -45,8 +45,6 @@ import { trackInstance } from './utils/autoUnmount'
 import { createVueWrapper } from './wrapperFactory'
 
 // NOTE this should come from `vue`
-type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps
-
 const MOUNT_OPTIONS: Array<keyof MountingOptions<any>> = [
   'attachTo',
   'attrs',
@@ -57,24 +55,6 @@ const MOUNT_OPTIONS: Array<keyof MountingOptions<any>> = [
   'shallow'
 ]
 
-type ComponentMountingOptions<T> = T extends DefineComponent<
-  infer PropsOrPropOptions,
-  any,
-  infer D,
-  any,
-  any
->
-  ? MountingOptions<
-      Partial<ExtractDefaultPropTypes<PropsOrPropOptions>> &
-        Omit<
-          Readonly<ExtractPropTypes<PropsOrPropOptions>> & PublicProps,
-          keyof ExtractDefaultPropTypes<PropsOrPropOptions>
-        >,
-      D
-    > &
-      Record<string, any>
-  : MountingOptions<any>
-
 function getInstanceOptions(
   options: MountingOptions<any> & Record<string, any>
 ): Record<string, any> {
@@ -94,6 +74,26 @@ function getInstanceOptions(
   return resultOptions
 }
 
+type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps
+
+type ComponentMountingOptions<T> = T extends DefineComponent<
+  infer PropsOrPropOptions,
+  any,
+  infer D,
+  any,
+  any
+>
+  ? MountingOptions<
+      Partial<ExtractDefaultPropTypes<PropsOrPropOptions>> &
+        Omit<
+          Readonly<ExtractPropTypes<PropsOrPropOptions>> & PublicProps,
+          keyof ExtractDefaultPropTypes<PropsOrPropOptions>
+        >,
+      D
+    > &
+      Record<string, any>
+  : MountingOptions<any>
+
 // Class component (without vue-class-component) - no props
 export function mount<V extends {}>(
   originalComponent: {