diff --git a/packages/svelte2tsx/src/svelte2tsx.ts b/packages/svelte2tsx/src/svelte2tsx.ts
index 298b740ae..a9f3218c9 100644
--- a/packages/svelte2tsx/src/svelte2tsx.ts
+++ b/packages/svelte2tsx/src/svelte2tsx.ts
@@ -534,7 +534,7 @@ function processInstanceScriptContent(str: MagicString, script: Node): InstanceS
         if (
             (ts.isPrefixUnaryExpression(parent) || ts.isPostfixUnaryExpression(parent)) &&
             parent.operator !==
-            ts.SyntaxKind.ExclamationToken /* `!$store` does not need processing */
+                ts.SyntaxKind.ExclamationToken /* `!$store` does not need processing */
         ) {
             let simpleOperator: string;
             if (parent.operator === ts.SyntaxKind.PlusPlusToken) {
@@ -854,18 +854,17 @@ function addComponentExport(
         // the prop is optional
         strictMode && isTsFile
             ? uses$$propsOr$$restProps
-                ? '__sveltets_with_any(render().props)'
-                : 'render().props'
-            : `__sveltets_partial${uses$$propsOr$$restProps ? '_with_any' : ''}(render().props)`;
+                ? '__sveltets_with_any(render)'
+                : 'render'
+            : `__sveltets_partial${uses$$propsOr$$restProps ? '_with_any' : ''}(render)`;
 
     const doc = formatComponentDocumentation(componentDocumentation);
 
     const statement =
-        `\n\n${doc}export default class ${
-            className ? `${className} ` : ''
-        }{\n    $$prop_def = ${propDef}\n    $$slot_def = render().slots` +
+        `\n\n${doc}export default class${
+            className ? ` ${className}` : ''
+        } extends createSvelte2TsxComponent(${propDef}) {` +
         createClassGetters(getters) +
-        `\n    $on = __sveltets_eventDef(render().events)` +
         '\n}';
 
     str.append(statement);
@@ -949,7 +948,7 @@ function createRenderFunction({
 
     const returnString =
         `\nreturn { props: ${exportedNames.createPropsStr(
-            isTsFile
+            isTsFile,
         )}, slots: ${slotsAsDef}, getters: ${createRenderFunctionGetterStr(getters)}` +
         `, events: ${eventMapToString(events)} }}`;
 
@@ -1043,6 +1042,6 @@ export function svelte2tsx(
     return {
         code: str.toString(),
         map: str.generateMap({ hires: true, source: options?.filename }),
-        exportedNames
+        exportedNames,
     };
 }
diff --git a/packages/svelte2tsx/svelte-shims.d.ts b/packages/svelte2tsx/svelte-shims.d.ts
index b2cbdc54b..3f6537201 100644
--- a/packages/svelte2tsx/svelte-shims.d.ts
+++ b/packages/svelte2tsx/svelte-shims.d.ts
@@ -1,10 +1,62 @@
 declare module '*.svelte' {
-    export default class {
-        $$prop_def: any;
-        $$slot_def: any;
+    export default Svelte2TsxComponent
+}
 
-        $on(event: string, handler: (e: Event) => any): () => void
-    }
+declare class Svelte2TsxComponent<
+    Props extends {} = {},
+    Events extends {} = {},
+    Slots extends {} = {},
+    StrictEvents extends boolean = true
+> {
+    // svelte2tsx-specific
+    /**
+     * @internal This is for type checking capabilities only
+     * and does not exist at runtime. Don't use this property.
+     */
+    $$prop_def: Props;
+    /**
+     * @internal This is for type checking capabilities only
+     * and does not exist at runtime. Don't use this property.
+     */
+    $$slot_def: Slots;
+    // https://svelte.dev/docs#Client-side_component_API
+    constructor(options: {
+        /**
+         * An HTMLElement to render to. This option is required.
+         */
+        target: Element;
+        /**
+         * A child of `target` to render the component immediately before.
+         */
+        anchor?: Element;
+        /**
+         * An object of properties to supply to the component.
+         */
+        props?: Props;
+        hydrate?: boolean;
+        intro?: boolean;
+        $$inline?: boolean;
+    });
+    /**
+     * Causes the callback function to be called whenever the component dispatches an event.
+     * A function is returned that will remove the event listener when called.
+     */
+    $on<K extends keyof Events>(event: K, handler: (e: SvelteExtractEvent<Events[K]>) => any): void;
+    /**
+     * Causes the callback function to be called whenever the component dispatches an event.
+     * A function is returned that will remove the event listener when called.
+     */
+    $on(event: StrictEvents extends true ? never : string, handler: (e: CustomEvent) => any): void;
+    /**
+     * Removes a component from the DOM and triggers any `onDestroy` handlers.
+     */
+    $destroy(): void;
+    /**
+     * Programmatically sets props on an instance.
+     * `component.$set({ x: 1 })` is equivalent to `x = 1` inside the component's `<script>` block.
+     * Calling this method schedules an update for the next microtask — the DOM is __not__ updated synchronously.
+     */
+    $set(props: Partial<Props>): void;
 }
 
 type AConstructorTypeOf<T> = new (...args: any[]) => T;
@@ -35,7 +87,6 @@ type SvelteAnimation<U extends any[]> = (node: Element, move: { from: DOMRect, t
 type SvelteAllProps = { [index: string]: any }
 type SvelteRestProps = { [index: string]: any }
 type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) => any }
-type SvelteComponent = import('*.svelte').default
 type SvelteEventRecord = Record<string, Event | Event[]>
 type SvelteExtractEvent<T> = T extends any[] ? T[number] : T;
 type SvelteOnEvent<T, K extends keyof T> = (
@@ -59,13 +110,19 @@ declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {
 declare function __sveltets_instanceOf<T>(type: AConstructorTypeOf<T>): T;
 declare function __sveltets_allPropsType(): SvelteAllProps
 declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_partial<T>(obj: T): Partial<T>;
-declare function __sveltets_partial_with_any<T>(obj: T): Partial<T> & SvelteAllProps
-declare function __sveltets_with_any<T>(obj: T): T & SvelteAllProps
+declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+    render: () => {props?: Props, events?: Events, slots?: Slots }
+): () => {props?: Partial<Props>, events?: Events, slots?: Slots }
+declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+    render: () => {props?: Props, events?: Events, slots?: Slots }
+): () => {props?: Partial<Props> & SvelteAllProps, events?: Events, slots?: Slots }
+declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+    render: () => {props?: Props, events?: Events, slots?: Slots }
+): () => {props?: Props & SvelteAllProps, events?: Events, slots?: Slots }
 declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
 declare function __sveltets_any(dummy: any): any;
 declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<SvelteComponent>
+declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent>
 declare function __sveltets_invalidate<T>(getValue: () => T): T
 declare function __sveltets_eventDef<T extends SvelteEventRecord>(def: T): SvelteOnAllEvent<T>
 declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
@@ -107,3 +164,7 @@ declare function __sveltets_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
+
+declare function createSvelte2TsxComponent<Props, Events, Slots>(
+    render: () => {props?: Props, events?: Events, slots?: Slots }
+): AConstructorTypeOf<Svelte2TsxComponent<Props, Events, Slots, false>>;
diff --git a/packages/svelte2tsx/test/sourcemaps/event-binding.html b/packages/svelte2tsx/test/sourcemaps/event-binding.html
index 0288e3e14..ef0287097 100644
--- a/packages/svelte2tsx/test/sourcemaps/event-binding.html
+++ b/packages/svelte2tsx/test/sourcemaps/event-binding.html
@@ -5,10 +5,7 @@
                                       3====  4==================
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
 !Expected
 <Component on:click={$check ? method1 : method2} />
diff --git a/packages/svelte2tsx/test/sourcemaps/let.html b/packages/svelte2tsx/test/sourcemaps/let.html
index cdadec282..13c370423 100644
--- a/packages/svelte2tsx/test/sourcemaps/let.html
+++ b/packages/svelte2tsx/test/sourcemaps/let.html
@@ -6,10 +6,7 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
 !Expected
 <script>
diff --git a/packages/svelte2tsx/test/sourcemaps/repl.html b/packages/svelte2tsx/test/sourcemaps/repl.html
index 9c524405f..359ca1b62 100644
--- a/packages/svelte2tsx/test/sourcemaps/repl.html
+++ b/packages/svelte2tsx/test/sourcemaps/repl.html
@@ -179,10 +179,7 @@
 </>);
 return { props: {slug: slug , chapter: chapter}, slots: {}, getters: {}, events: {} }}
 
-export default class {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
 !Expected
 <script context="module">
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
index 8490d93e5..29e75243f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
@@ -4,8 +4,5 @@
 {someObject.$store}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
index da4136ecd..a3508b6b4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
index 1c33ef3d7..f919cf0f5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
@@ -3,8 +3,5 @@ __sveltets_store_get(var);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
index d44b6b182..ae9240350 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
@@ -3,8 +3,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
index 4da67c349..8e3c85001 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
@@ -14,8 +14,5 @@ function render() {
 </>})}}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
index 79f48bff9..a5b936fbb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
@@ -2,8 +2,5 @@
 <><input id="dom-input" type="radio" {...__sveltets_empty(__sveltets_store_get(compile_options).generate)} value="dom"/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
index a5beec74a..b137205b7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
@@ -89,8 +89,5 @@
 </>}}}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
index f91edade6..c7e7e7f59 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
@@ -8,8 +8,5 @@
 </div></>);
 return { props: {}, slots: {default: {a:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
index 1e134a858..2035935b4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
@@ -11,8 +11,5 @@
 </div></>);
 return { props: {}, slots: {default: {a:b}, test: {c:d, e:e}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
index fbf88d9af..472851303 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
@@ -8,8 +8,5 @@
 </div></>);
 return { props: {}, slots: {default: {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
index aa5d7d4e3..326c426e3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
@@ -5,8 +5,5 @@
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
 /** This component does nothing at all */
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
index 4d95b5e95..8aeea8af7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
@@ -17,8 +17,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  *
  * The output should be indented properly!
  */
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
index e948dcaf5..ebcee4ebf 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
@@ -11,8 +11,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  * type Type = 'type'
  * ```
  */
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
index fb4322a65..f4e062ba2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
@@ -3,8 +3,5 @@
 <Radio ></Radio></>
 return { props: {}, slots: {}, getters: {}, events: {'click':[__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$on, 'click'),__sveltets_bubbleEventDef(__sveltets_instanceOf(Radio).$on, 'click')]} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
index 7dff7e03d..988a8f5ba 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
@@ -2,8 +2,5 @@
 <><Button ></Button></>
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$on, 'click')} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
index 42e83d67a..a1685a64a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
@@ -2,8 +2,5 @@
 <><button onclick={undefined}></button></>
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click')} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
index b628e9b9d..76bea3182 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
@@ -3,8 +3,5 @@
 <sveltewindow onresize={undefined}></sveltewindow></>
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapBodyEvent('click'), 'resize':__sveltets_mapWindowEvent('resize')} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
index 87a6af131..b6f3cd564 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
@@ -5,9 +5,6 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {Foo: Foo}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
     get Foo() { return render().getters.Foo }
-    $on = __sveltets_eventDef(render().events)
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
index 9c889fbf6..92efc8e82 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
index 815c0d1e7..326d40c53 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {name: name , name2: name2}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
index f66b68af2..3c18c5202 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
@@ -6,8 +6,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
index abb7cfc0b..bcef6d1d9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {name: name , world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
index 6e4c43221..354099e38 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
@@ -8,8 +8,5 @@ function render() {
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
index c0b37b8f5..a7007f0cf 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
@@ -12,8 +12,5 @@ function render() {
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
index 32bacec1c..21a9a7693 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
@@ -3,8 +3,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
index 32bacec1c..21a9a7693 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
@@ -3,8 +3,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
index fced9c237..633c596a6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
@@ -10,8 +10,5 @@
 <h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
index 5c831310b..7d99f1b7d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
@@ -10,8 +10,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
index 20e84515a..10318582a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
@@ -24,8 +24,5 @@ const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && __sveltets_store_get(top1)
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
index d083877c8..db64a91f2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
@@ -24,8 +24,5 @@
 }}>Hi</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
index 39edfc046..ce5e1aaa5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {rename: rename}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
index 116c4fd50..7e5d545d5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
@@ -8,8 +8,5 @@ let a: 1 | 2 = 1;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
index 5df5926c4..7f0689d14 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
@@ -6,8 +6,5 @@ let  b = __sveltets_invalidate(() => ({ a: 1 }));
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
index ec93b4a62..e287a8d2e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
@@ -9,8 +9,5 @@ $: a = __sveltets_invalidate(() => 5);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
index a3fe99f91..f2ac39bf7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
index 65c56c444..0a598cd2f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {name3: name , name4: name2}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
index 155bce1c2..f5095719f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
@@ -10,8 +10,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
index a15d7008c..4b4d3c494 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
@@ -14,8 +14,5 @@
 </sveltehead></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
index 1b0269497..1b275a1c4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
@@ -6,8 +6,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
index 2d2b5af8b..ba499b0e8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
@@ -10,8 +10,5 @@
 <Style /></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
index b3aa94de8..99aeafaf0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
@@ -9,8 +9,5 @@ let a = 'b';
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
index 9a229cfbd..03646a4a8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
@@ -2,8 +2,5 @@
 <><h1>hello</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
index dbba77e50..7ddeb398f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
index 459881875..43031051f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
@@ -2,8 +2,5 @@
 <><Me f={`${__sveltets_store_get(s)} `}/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
index f584cd670..b12cab27d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
@@ -5,8 +5,5 @@
 {true === true}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
index 635ef8d72..a154d7b91 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
@@ -2,8 +2,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
index 635ef8d72..a154d7b91 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
@@ -2,8 +2,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
index a933e964f..4932859f9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
@@ -8,8 +8,5 @@
 () => (<></>);
 return { props: {f: f} as {f?: typeof f}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
index 863669aad..85769872b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
@@ -6,11 +6,8 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {name: name, SOME: SOME, CONSTANT: CONSTANT}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
     get name() { return render().getters.name }
     get SOME() { return render().getters.SOME }
     get CONSTANT() { return render().getters.CONSTANT }
-    $on = __sveltets_eventDef(render().events)
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
index a2f66e0e8..5a6835f94 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {a: a} as {a?: typeof a}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
index 66fee1e23..93858a824 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {a: a , b: b} as {a: A, b?: A}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
index 1cff3abed..7fb19d6b7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
@@ -4,8 +4,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
index f2a963384..f63c861e1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
@@ -7,8 +7,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = render().props
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(render) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
index 395d2c557..93d9b5885 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
@@ -7,8 +7,5 @@
 <h1>{number1} + {number2} = {number1 + number2}</h1></>);
 return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
index 83ac0f53a..1eb14f8fa 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
@@ -5,8 +5,5 @@
 () => (<></>);
 return { props: {name: name} as {name?: string | number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx
index ba501cddd..6d7974784 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx
@@ -4,8 +4,5 @@
 <h1>{$$props['name']}</h1></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_with_any(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
index 6c8b028a4..af0eb2ffc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
@@ -6,8 +6,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial_with_any(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
index 3c37a4e71..40851a300 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
@@ -2,8 +2,5 @@
 <><h1>{$$props['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial_with_any(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
index 3ebc15c3a..de997862e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
@@ -6,8 +6,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial_with_any(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
index dccd1af8b..1de3b6a6f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
@@ -2,8 +2,5 @@
 <><h1>{$$restProps['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial_with_any(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
index b356e8c76..bf1a1a6ea 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
@@ -3,8 +3,5 @@
 <button onclick={__sveltets_store_get(check) ? method1 : method2} >Bla</button></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
index bbe53bb66..929069f83 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
@@ -34,8 +34,5 @@ function render() {
 <button onclick={() => count.set( __sveltets_store_get(count) | myvar)}>OR</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
index 7c5c47fed..d48d11756 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
@@ -11,8 +11,5 @@ function render() {
 <button onclick={() => !__sveltets_store_get(count)}>add</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
index a91be7603..45771f045 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
@@ -13,8 +13,5 @@ function render() {
 <button onclick={() => count.set( __sveltets_store_get(count) - 1)}>subtract</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
index cf7431d49..2efa2af51 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
@@ -4,8 +4,5 @@ b.set(__sveltets_store_get(b).concat(5));
 <h1 onclick={() => b.set(__sveltets_store_get(b).concat(5))}>{__sveltets_store_get(b)}</h1></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
index 69486dc1b..3a401ab7f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
@@ -13,8 +13,5 @@
 <svelteoptions /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ {
-    $$prop_def = __sveltets_partial(render().props)
-    $$slot_def = render().slots
-    $on = __sveltets_eventDef(render().events)
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }