tweak

Author: dummdidumm

packages/svelte/src/index.d.ts

@@ -30,10 +30,6 @@ type WithBindings<T> = {
 	[Key in keyof T]: Bindable<T[Key]>;
 };
 
-type StripBindable<Props extends Record<string, any>> = {
-	[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
-};
-
 /**
  * Utility type for ensuring backwards compatibility on a type level:
  * - If there's a default slot, add 'children' to the props
@@ -97,7 +93,7 @@ export class SvelteComponent<
 	 * Does not exist at runtime.
 	 * ### DO NOT USE!
 	 * */
-	$$prop_def: StripBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
+	$$prop_def: RemoveBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
 	/**
 	 * For type checking capabilities only.
 	 * Does not exist at runtime.

packages/svelte/src/internal/types.d.ts

@@ -1,10 +1,8 @@
-import type { Bindable, Binding } from '../index.js';
+import type { Bindable } from '../index.js';
 
 /** Anything except a function */
 export type NotFunction<T> = T extends Function ? never : T;
 
 export type RemoveBindable<Props extends Record<string, any>> = {
-	[Key in keyof Props as NonNullable<Props[Key]> extends Binding<unknown>
-		? never
-		: Key]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
+	[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
 };

packages/svelte/tests/types/component.ts

@@ -191,7 +191,6 @@ function binding<T>(value: T): Binding<T> {
 class Explicit extends SvelteComponent<{
 	foo: string;
 	bar: Bindable<boolean>;
-	baz?: Binding<string>;
 }> {
 	constructor(options: ComponentConstructorOptions<{ foo: string; bar: Bindable<boolean> }>) {
 		super(options);
@@ -211,18 +210,10 @@ mount(Explicit, { target: null as any, props: { foo: 'foo', bar: true } });
 mount(Explicit, {
 	target: null as any,
 	props: {
-		baz: '',
 		// @ts-expect-error
 		bar: binding(true)
 	}
 });
-mount(Explicit, {
-	target: null as any,
-	props: {
-		// @ts-expect-error
-		baz: ''
-	}
-});
 
 class Implicit extends SvelteComponent<{ foo: string; bar: boolean }> {}
 new Implicit({ target: null as any, props: { foo: 'foo', bar: true } });

packages/svelte/types/index.d.ts

@@ -26,10 +26,6 @@ declare module 'svelte' {
 		[Key in keyof T]: Bindable<T[Key]>;
 	};
 
-	type StripBindable<Props extends Record<string, any>> = {
-		[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
-	};
-
 	/**
 	 * Utility type for ensuring backwards compatibility on a type level:
 	 * - If there's a default slot, add 'children' to the props
@@ -93,7 +89,7 @@ declare module 'svelte' {
 		 * Does not exist at runtime.
 		 * ### DO NOT USE!
 		 * */
-		$$prop_def: StripBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
+		$$prop_def: RemoveBindable<Props>; // Without PropsWithChildren: unnecessary, causes type bugs
 		/**
 		 * For type checking capabilities only.
 		 * Does not exist at runtime.
@@ -247,9 +243,7 @@ declare module 'svelte' {
 	type NotFunction<T> = T extends Function ? never : T;
 
 	type RemoveBindable<Props extends Record<string, any>> = {
-		[Key in keyof Props as NonNullable<Props[Key]> extends Binding<unknown>
-			? never
-			: Key]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
+		[Key in keyof Props]: Props[Key] extends Bindable<infer Value> ? Value : Props[Key];
 	};
 	/**
 	 * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM.