From 12375197ae2ee6650f3a5a84258758a314cbb490 Mon Sep 17 00:00:00 2001
From: Michael Cousins <michael.cousins@viam.com>
Date: Tue, 11 Feb 2025 12:54:38 -0500
Subject: [PATCH] fix(types): fix types when using legacy components in Svelte
 5

---
 src/__tests__/fixtures/Typed.svelte  |  5 +++++
 src/__tests__/render-runes.test-d.ts | 32 +++++++++++++++++++++++++++-
 src/component-types.d.ts             | 14 ++++++------
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/__tests__/fixtures/Typed.svelte b/src/__tests__/fixtures/Typed.svelte
index 44960ab..383214f 100644
--- a/src/__tests__/fixtures/Typed.svelte
+++ b/src/__tests__/fixtures/Typed.svelte
@@ -1,9 +1,14 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+
   export let name: string
   export let count: number
 
   export const hello: string = 'hello'
+
+  const dispatch = createEventDispatcher<{ greeting: string }>()
 </script>
 
 <h1>hello {name}</h1>
 <p>count: {count}</p>
+<button on:click={() => dispatch('greeting', 'hello')}>greet</button>
diff --git a/src/__tests__/render-runes.test-d.ts b/src/__tests__/render-runes.test-d.ts
index 2d0c69f..48d9d27 100644
--- a/src/__tests__/render-runes.test-d.ts
+++ b/src/__tests__/render-runes.test-d.ts
@@ -1,7 +1,8 @@
 import { expectTypeOf } from 'expect-type'
-import { describe, test } from 'vitest'
+import { describe, test, vi } from 'vitest'
 
 import * as subject from '../index.js'
+import LegacyComponent from './fixtures/Typed.svelte'
 import Component from './fixtures/TypedRunes.svelte'
 
 describe('types', () => {
@@ -37,3 +38,32 @@ describe('types', () => {
     }>()
   })
 })
+
+describe('legacy component types', () => {
+  test('render accepts events', () => {
+    const onGreeting = vi.fn()
+    subject.render(LegacyComponent, {
+      props: { name: 'Alice', count: 42 },
+      events: { greeting: onGreeting },
+    })
+  })
+
+  test('component $set and $on are not allowed', () => {
+    const onGreeting = vi.fn()
+    const { component } = subject.render(LegacyComponent, {
+      name: 'Alice',
+      count: 42,
+    })
+
+    expectTypeOf(component).toMatchTypeOf<{ hello: string }>()
+
+    // @ts-expect-error: Svelte 5 mount does not return `$set`
+    component.$on('greeting', onGreeting)
+
+    // @ts-expect-error: Svelte 5 mount does not return `$set`
+    component.$set({ name: 'Bob' })
+
+    // @ts-expect-error: Svelte 5 mount does not return `$destroy`
+    component.$destroy()
+  })
+})
diff --git a/src/component-types.d.ts b/src/component-types.d.ts
index 9f707c2..8300243 100644
--- a/src/component-types.d.ts
+++ b/src/component-types.d.ts
@@ -45,17 +45,17 @@ export type Props<C extends Component> = ComponentProps<C>
  * In Svelte 5, this is the set of variables marked as `export`'d.
  * In Svelte 4, this is simply the instance of the component class.
  */
-export type Exports<C> = C extends LegacyComponent
-  ? C
-  : C extends ModernComponent<any, infer E>
+export type Exports<C> = IS_MODERN_SVELTE extends true
+  ? C extends ModernComponent<any, infer E>
     ? E
-    : never
+    : C & { $set: never; $on: never; $destroy: never }
+  : C
 
 /**
  * Options that may be passed to `mount` when rendering the component.
  *
  * In Svelte 4, these are the options passed to the component constructor.
  */
-export type MountOptions<C extends Component> = C extends LegacyComponent
-  ? LegacyConstructorOptions<Props<C>>
-  : Parameters<typeof mount<Props<C>, Exports<C>>>[1]
+export type MountOptions<C extends Component> = IS_MODERN_SVELTE extends true
+  ? Parameters<typeof mount<Props<C>, Exports<C>>>[1]
+  : LegacyConstructorOptions<Props<C>>