fix(svelte5): ensure typings are actually included in the module (#402)

testing-library · Oct 2, 2024 · f4b1508 · f4b1508
1 parent f215ad8
commit f4b1508
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "types": "svelte-check",
     "types:legacy": "svelte-check --tsconfig tsconfig.legacy.json",
     "validate": "npm-run-all test:vitest:* test:jest types build",
-    "build": "tsc -p tsconfig.build.json",
+    "build": "tsc -p tsconfig.build.json && cp src/component-types.d.ts types",
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate",
     "preview-release": "./scripts/preview-release"

diff --git a/src/component-types.d.ts b/src/component-types.d.ts
@@ -1,11 +1,14 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type * as Svelte from 'svelte'
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type IS_MODERN_SVELTE = any extends Svelte.Component ? false : true
 
 /** A compiled, imported Svelte component. */
-export type Component<P> = IS_MODERN_SVELTE extends true
-  ? Svelte.Component<P> | Svelte.SvelteComponent<P>
+export type Component<
+  P extends Record<string, any>,
+  E extends Record<string, any>,
+> = IS_MODERN_SVELTE extends true
+  ? Svelte.Component<P, E> | Svelte.SvelteComponent<P>
   : Svelte.SvelteComponent<P>
 
 /**
@@ -19,7 +22,7 @@ export type ComponentType<C> = C extends Svelte.SvelteComponent
   : C
 
 /** The props of a component. */
-export type Props<C> = Svelte.ComponentProps<C>
+export type Props<C extends Component<any, any>> = Svelte.ComponentProps<C>
 
 /**
  * The exported fields of a component.
@@ -29,7 +32,7 @@ export type Props<C> = Svelte.ComponentProps<C>
  */
 export type Exports<C> = C extends Svelte.SvelteComponent
   ? C
-  : C extends Svelte.Component<unknown, infer E>
+  : C extends Svelte.Component<any, infer E>
     ? E
     : never
 
@@ -38,6 +41,7 @@ export type Exports<C> = C extends Svelte.SvelteComponent
  *
  * In Svelte 4, these are the options passed to the component constructor.
  */
-export type MountOptions<C> = IS_MODERN_SVELTE extends true
-  ? Parameters<typeof Svelte.mount<Props<C>, Exports<C>>>[1]
-  : Svelte.ComponentConstructorOptions<Props<C>>
+export type MountOptions<C extends Component<any, any>> =
+  IS_MODERN_SVELTE extends true
+    ? Parameters<typeof Svelte.mount<Props<C>, Exports<C>>>[1]
+    : Svelte.ComponentConstructorOptions<Props<C>>