From 01a4cac4fd121acb58e5a93d1ba93c1c00ed9477 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Thu, 2 Jun 2022 12:39:37 -0400
Subject: [PATCH 1/2] bug: must use the class type not the instance type

---
 types/index.d.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index a5373d7..8fbcbed 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -3,18 +3,22 @@
 // Definitions by: Rahim Alwer <https://github.com/mihar-22>
 
 import {queries, Queries, BoundFunction, EventType} from '@testing-library/dom'
-import { SvelteComponentTyped } from 'svelte/types/runtime'
+import { SvelteComponentDev } from 'svelte/internal'
+import { SvelteComponentTyped, SvelteComponent } from 'svelte/types/runtime'
 
 export * from '@testing-library/dom'
 
-export interface SvelteComponentOptions<P extends Record<string, any> = any>  {
+type SvelteComponentDevClass = typeof SvelteComponentDev;
+type SvelteComponentTypedClass<P,E,S> = typeof SvelteComponentTyped<P,E,S>;
+
+export interface SvelteComponentOptions<P extends Record<string, any> = any> {
   target?: HTMLElement
   anchor?: string
   props?: P
   context?: any
   hydrate?: boolean
   intro?: boolean
-}
+};
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
 
@@ -23,8 +27,7 @@ type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
  */
 export type RenderResult<Q extends Queries = typeof queries> = {
   container: Element
-  component: SvelteComponent
-  component: SvelteComponentTyped
+  component: SvelteComponentTypedClass<any,any,any>
   debug: (el?: Element | DocumentFragment) => void
   rerender: (options: SvelteComponentOptions) => void
   unmount: () => void
@@ -36,14 +39,14 @@ export interface RenderOptions<Q extends Queries = typeof queries> {
 }
 
 export function render(
-  component: SvelteComponentTyped,
-  componentOptions?: SvelteComponentOptions,
+  component: SvelteComponentTypedClass<any,any,any>,
+  componentOptions?: SvelteComponentOptions | Record<string,unknown>,
   renderOptions?: Omit<RenderOptions, 'queries'>
 ): RenderResult
 
 export function render<Q extends Queries>(
-  component: SvelteComponentTyped,
-  componentOptions?: SvelteComponentOptions,
+  component: SvelteComponentTyped<any,any,any>,
+  componentOptions?: SvelteComponentOptions | Record<string,unknown>,
   renderOptions?: RenderOptions<Q>,
 ): RenderResult<Q>
 
@@ -52,8 +55,8 @@ export function render<
   E extends Record<string, any> = any,
   S extends Record<string, any> = any
 >(
-  component: SvelteComponentTyped<P, E, S>,
-  componentOptions?: SvelteComponentOptions<P>,
+  component: SvelteComponentTypedClass<P, E, S>,
+  componentOptions?: SvelteComponentOptions<P> | Record<string,unknown>,
   renderOptions?: Omit<RenderOptions, "queries">
 ): RenderResult;
 

From 7aee02955a77bf2232144994f18c4a99690e2b84 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Thu, 2 Jun 2022 12:45:48 -0400
Subject: [PATCH 2/2] remove unused declarations

---
 types/index.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index 8fbcbed..e19c344 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -3,12 +3,10 @@
 // Definitions by: Rahim Alwer <https://github.com/mihar-22>
 
 import {queries, Queries, BoundFunction, EventType} from '@testing-library/dom'
-import { SvelteComponentDev } from 'svelte/internal'
-import { SvelteComponentTyped, SvelteComponent } from 'svelte/types/runtime'
+import { SvelteComponentTyped } from 'svelte/types/runtime'
 
 export * from '@testing-library/dom'
 
-type SvelteComponentDevClass = typeof SvelteComponentDev;
 type SvelteComponentTypedClass<P,E,S> = typeof SvelteComponentTyped<P,E,S>;
 
 export interface SvelteComponentOptions<P extends Record<string, any> = any> {